diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2019-12-17 14:00:39 -1000 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2020-03-28 14:09:45 -0700 |
| commit | e6cbd75158ea274ab98c13c9b73d2bc1d90aa50d (patch) | |
| tree | d86e27bda4f0867c4ad3ebdd1b248cef2ed7b32d /configure | |
| parent | b26341241bbfe9cc126479a0dbed5d40d547f242 (diff) | |
| download | qemu-e6cbd75158ea274ab98c13c9b73d2bc1d90aa50d.zip qemu-e6cbd75158ea274ab98c13c9b73d2bc1d90aa50d.tar.gz qemu-e6cbd75158ea274ab98c13c9b73d2bc1d90aa50d.tar.bz2 | |
configure: Unnest detection of -z,relro and -z,now
There is nothing about these options that is related to PIE.
Use them unconditionally.
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Fangrui Song <i@maskray.me>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
v2: Do not split into two tests.
v3: Update to QEMU_LDFLAGS.
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -2129,9 +2129,6 @@ if test "$pie" != "no" ; then QEMU_CFLAGS="-fPIE -DPIE $QEMU_CFLAGS" QEMU_LDFLAGS="-pie $QEMU_LDFLAGS" pie="yes" - if compile_prog "" "-Wl,-z,relro -Wl,-z,now" ; then - QEMU_LDFLAGS="-Wl,-z,relro -Wl,-z,now $QEMU_LDFLAGS" - fi else if test "$pie" = "yes"; then error_exit "PIE not available due to missing toolchain support" @@ -2142,6 +2139,12 @@ if test "$pie" != "no" ; then fi 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 |