Re: [Qemu-devel] [PATCH] configure: fix -enable-debug with newer toolchains

[Peter Maydell]

On 6 June 2012 10:03, Avi Kivity <address@hidden> wrote:
> Fedora 17's toolchain wants optimization enabled for _FORTIFY_SOURCE;
> so disable _FORTIFY_SOURCE when debugging.

Well, that sucks, but it seems to be a deliberate change in
upstream glibc to make it warn now :-(  I guess everybody
in the world will have to fix their makefiles...

> Signed-off-by: Avi Kivity <address@hidden>
> ---
>  configure |    3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/configure b/configure
> index 1f338f8..88d9c5b 100755
> --- a/configure
> +++ b/configure
> @@ -255,7 +255,6 @@ QEMU_CFLAGS="-fno-strict-aliasing $QEMU_CFLAGS"
>  QEMU_CFLAGS="-Wall -Wundef -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="-D_FORTIFY_SOURCE=2 $QEMU_CFLAGS"
>  QEMU_INCLUDES="-I. -I\$(SRC_PATH) -I\$(SRC_PATH)/fpu"
>  if test "$debug_info" = "yes"; then
>     CFLAGS="-g $CFLAGS"
> @@ -2851,7 +2850,7 @@ fi
>  # After here, no more $cc or $ld runs
>
>  if test "$debug" = "no" ; then
> -  CFLAGS="-O2 $CFLAGS"
> +  CFLAGS="-O2 -D_FORTIFY_SOURCE=2 $CFLAGS"
>  fi

It feels a bit odd to have the FORTIFY_SOURCE define in CFLAGS rather
than QEMU_CFLAGS, but I think it should behave correctly so I think
it's right.

-- PMM