Re: [PATCH 5/5] configure, meson: move linker flag detection to meson

[Marc-André Lureau]

On Tue, Sep 27, 2022 at 1:59 PM Paolo Bonzini <pbonzini@redhat.com> wrote:
>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>


> ---
>  configure   | 16 ----------------
>  meson.build | 13 +++++++++++++
>  2 files changed, 13 insertions(+), 16 deletions(-)
>
> diff --git a/configure b/configure
> index 0a6f57c371..e5f1eb6213 100755
> --- a/configure
> +++ b/configure
> @@ -1342,12 +1342,10 @@ EOF
>  if test "$static" = "yes"; then
>    if test "$pie" != "no" && compile_prog "-Werror -fPIE -DPIE" 
> "-static-pie"; then
>      CONFIGURE_CFLAGS="-fPIE -DPIE $CONFIGURE_CFLAGS"
> -    QEMU_LDFLAGS="-static-pie $QEMU_LDFLAGS"
>      pie="yes"
>    elif test "$pie" = "yes"; then
>      error_exit "-static-pie not available due to missing toolchain support"
>    else
> -    QEMU_LDFLAGS="-static $QEMU_LDFLAGS"
>      pie="no"
>    fi
>  elif test "$pie" = "no"; then
> @@ -1369,12 +1367,6 @@ else
>    pie="no"
>  fi
>
> -# Detect support for PT_GNU_RELRO + DT_BIND_NOW.
> -# The combination is known as "full relro", because .got.plt is read-only 
> too.
> -if compile_prog "" "-Wl,-z,relro -Wl,-z,now" ; then
> -  QEMU_LDFLAGS="-Wl,-z,relro -Wl,-z,now $QEMU_LDFLAGS"
> -fi
> -
>  ##########################################
>  # __sync_fetch_and_and requires at least -march=i486. Many toolchains
>  # use i686 as default anyway, but for those that don't, an explicit
> @@ -2247,14 +2239,6 @@ if test "$have_ubsan" = "yes"; then
>  fi
>
>  ##########################################
> -
> -# Exclude --warn-common with TSan to suppress warnings from the TSan 
> libraries.
> -if test "$solaris" = "no" && test "$tsan" = "no"; then
> -    if $ld --version 2>/dev/null | grep "GNU ld" >/dev/null 2>/dev/null ; 
> then
> -        QEMU_LDFLAGS="-Wl,--warn-common $QEMU_LDFLAGS"
> -    fi
> -fi
> -
>  # Guest agent Windows MSI package
>
>  if test "$QEMU_GA_MANUFACTURER" = ""; then
> diff --git a/meson.build b/meson.build
> index f57a60ac4c..f8c80a5b00 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -183,6 +183,14 @@ qemu_cflags = config_host['QEMU_CFLAGS'].split()
>  qemu_objcflags = config_host['QEMU_OBJCFLAGS'].split()
>  qemu_ldflags = config_host['QEMU_LDFLAGS'].split()
>
> +if enable_static
> +  qemu_ldflags += get_option('b_pie') ? '-static-pie' : '-static'
> +endif
> +
> +# Detect support for PT_GNU_RELRO + DT_BIND_NOW.
> +# The combination is known as "full relro", because .got.plt is read-only 
> too.
> +qemu_ldflags += cc.get_supported_link_arguments('-Wl,-z,relro', '-Wl,-z,now')
> +
>  if targetos == 'windows'
>    qemu_ldflags += cc.get_supported_link_arguments('-Wl,--no-seh', 
> '-Wl,--nxcompat')
>    # Disable ASLR for debug builds to allow debugging with gdb
> @@ -265,6 +273,11 @@ if add_languages('cpp', required: false, native: false)
>    endif
>  endif
>
> +# Exclude --warn-common with TSan to suppress warnings from the TSan 
> libraries.
> +if targetos != 'sunos' and not config_host.has_key('CONFIG_TSAN')
> +  qemu_ldflags += linker.get_supported_link_arguments('-Wl,--warn-common')
> +endif
> +
>  add_global_link_arguments(qemu_ldflags, native: false, language: ['c', 
> 'cpp', 'objc'])
>
>  if targetos == 'linux'
> --
> 2.37.3
>