diff options
author | 2009-12-07 10:46:09 +0200 | |
---|---|---|
committer | 2009-12-07 10:46:09 +0200 | |
commit | 989e2cd2f9db2edcd347c380dddfeb5b64327b76 (patch) | |
tree | f803f84b6d6393b6869b36c07bbe3760e7676fe5 /configure | |
parent | Fix mismerge in cpu_post_load (diff) | |
parent | monitor: QError support (diff) | |
download | qemu-kvm-989e2cd2f9db2edcd347c380dddfeb5b64327b76.tar.gz qemu-kvm-989e2cd2f9db2edcd347c380dddfeb5b64327b76.tar.bz2 qemu-kvm-989e2cd2f9db2edcd347c380dddfeb5b64327b76.zip |
Merge commit '8204a9180c5f456d30cbd29fddf734e97f7c74fa' into upstream-merge
* commit '8204a9180c5f456d30cbd29fddf734e97f7c74fa': (22 commits)
monitor: QError support
Introduce QError
utests: Add qstring_from_substr() unit-test
utests: Add qstring_append_chr() unit-test
QString: Introduce qstring_from_substr()
QString: Introduce qstring_append_int()
QString: Introduce qstring_append_chr()
QJSON: Introduce qobject_from_jsonv()
fix I2C slave addressing
Fix qdev property type definition for isa serial/parallel devices
Fix qemu_malloc/qemu_free use in rtl8139.c
Fix free use in xen_backend.c
Fix qemu_free use in scsi-generic.c
Fix qemu_free use in nseries.c
Fix qemu_free use in bt-l2cap.c
Fix qemu_free use in nand.c
Fix qemu_free use in baum.c
Fix qemu_free use in acpi.c
pci: move apb specific stuff to apb_pci.c
configure: use correct cflags in compiler checks
...
Conflicts:
monitor.c
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 41 |
1 files changed, 21 insertions, 20 deletions
@@ -91,6 +91,26 @@ ar="${cross_prefix}${ar}" objcopy="${cross_prefix}${objcopy}" ld="${cross_prefix}${ld}" +# default flags for all hosts +QEMU_CFLAGS="-fno-strict-aliasing $QEMU_CFLAGS" +CFLAGS="-g $CFLAGS" +QEMU_CFLAGS="-Wall -Wundef -Wendif-labels -Wwrite-strings -Wmissing-prototypes $QEMU_CFLAGS" +QEMU_CFLAGS="-Wstrict-prototypes -Wredundant-decls $QEMU_CFLAGS" +QEMU_CFLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $QEMU_CFLAGS" +QEMU_CFLAGS="-U_FORTIFY_SOURCE $QEMU_CFLAGS" +QEMU_CFLAGS="-I. -I\$(SRC_PATH) $QEMU_CFLAGS" +LDFLAGS="-g $LDFLAGS" + +gcc_flags="-Wold-style-declaration -Wold-style-definition" +cat > $TMPC << EOF +int main(void) { } +EOF +for flag in $gcc_flags; do + if compile_prog "$QEMU_CFLAGS" "$flag" ; then + QEMU_CFLAGS="$flag $QEMU_CFLAGS" + fi +done + # check that the C compiler works. cat > $TMPC <<EOF int main(void) {} @@ -1734,7 +1754,7 @@ int main(void) return 0; } EOF -if compile_prog "" "" ; then +if compile_prog "$ARCH_CFLAGS" "" ; then fallocate=yes fi @@ -1882,28 +1902,9 @@ fi # End of CC checks # After here, no more $cc or $ld runs -# default flags for all hosts -QEMU_CFLAGS="-fno-strict-aliasing $QEMU_CFLAGS" -CFLAGS="-g $CFLAGS" if test "$debug" = "no" ; then CFLAGS="-O2 $CFLAGS" fi -QEMU_CFLAGS="-Wall -Wundef -Wendif-labels -Wwrite-strings -Wmissing-prototypes $QEMU_CFLAGS" -QEMU_CFLAGS="-Wstrict-prototypes -Wredundant-decls $QEMU_CFLAGS" -QEMU_CFLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $QEMU_CFLAGS" -QEMU_CFLAGS="-U_FORTIFY_SOURCE $QEMU_CFLAGS" -QEMU_CFLAGS="-I. -I\$(SRC_PATH) $QEMU_CFLAGS" -LDFLAGS="-g $LDFLAGS" - -gcc_flags="-Wold-style-declaration -Wold-style-definition" -cat > $TMPC << EOF -int main(void) { } -EOF -for flag in $gcc_flags; do - if compile_prog "$QEMU_CFLAGS" "$flag" ; then - QEMU_CFLAGS="$flag $QEMU_CFLAGS" - fi -done # Consult white-list to determine whether to enable werror # by default. Only enable by default for git builds |