From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: Richard Henderson <richard.henderson@linaro.org>, qemu-devel@nongnu.org
Cc: i@maskray.me, berrange@redhat.com
Subject: Re: [PATCH 6/7] configure: Override the os default with --disable-pie
Date: Wed, 18 Dec 2019 18:57:58 +0100 [thread overview]
Message-ID: <2cdc6931-2a97-a3ed-84f2-607e34cd4271@redhat.com> (raw)
In-Reply-To: <20191218031920.6414-7-richard.henderson@linaro.org>
On 12/18/19 4:19 AM, Richard Henderson wrote:
> Some distributions, e.g. Ubuntu 19.10, enable PIE by default.
> If for some reason one wishes to build a non-pie binary, we
> must provide additional options to override.
>
> At the same time, reorg the code to an elif chain.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> configure | 25 ++++++++++++-------------
> 1 file changed, 12 insertions(+), 13 deletions(-)
>
> diff --git a/configure b/configure
> index f8981eec15..1645a58b3a 100755
> --- a/configure
> +++ b/configure
> @@ -2029,19 +2029,18 @@ if compile_prog "-Werror -fno-pie" "-no-pie"; then
> LDFLAGS_NOPIE="-no-pie"
> fi
>
> -if test "$pie" != "no" ; then
> - if compile_prog "-fPIE -DPIE" "-pie"; then
> - QEMU_CFLAGS="-fPIE -DPIE $QEMU_CFLAGS"
> - LDFLAGS="-pie $LDFLAGS"
> - pie="yes"
> - else
> - if test "$pie" = "yes"; then
> - error_exit "PIE not available due to missing toolchain support"
> - else
> - echo "Disabling PIE due to missing toolchain support"
> - pie="no"
> - fi
> - fi
> +if test "$pie" = "no"; then
> + QEMU_CFLAGS="$CFLAGS_NOPIE $QEMU_CFLAGS"
> + LDFLAGS="$LDFLAGS_NOPIE $LDFLAGS"
> +elif compile_prog "-fPIE -DPIE" "-pie"; then
> + QEMU_CFLAGS="-fPIE -DPIE $QEMU_CFLAGS"
> + LDFLAGS="-pie $LDFLAGS"
> + pie="yes"
> +elif test "$pie" = "yes"; then
> + error_exit "PIE not available due to missing toolchain support"
> +else
> + echo "Disabling PIE due to missing toolchain support"
> + pie="no"
> fi
>
> # Detect support for DT_BIND_NOW.
>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
next prev parent reply other threads:[~2019-12-18 17:59 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-18 3:19 [PATCH 0/7] configure: Improve PIE and other linkage Richard Henderson
2019-12-18 3:19 ` [PATCH 1/7] configure: Drop adjustment of textseg Richard Henderson
2019-12-18 6:59 ` Thomas Huth
2019-12-18 17:22 ` Richard Henderson
2019-12-18 3:19 ` [PATCH 2/7] tcg: Remove softmmu code_gen_buffer fixed address Richard Henderson
2019-12-18 7:01 ` Thomas Huth
2019-12-18 3:19 ` [PATCH 3/7] configure: Do not force pie=no for non-x86 Richard Henderson
2019-12-18 7:05 ` Thomas Huth
2019-12-18 19:23 ` Richard Henderson
2019-12-18 3:19 ` [PATCH 4/7] configure: Always detect -no-pie toolchain support Richard Henderson
2019-12-18 8:04 ` Thomas Huth
2019-12-18 17:55 ` Philippe Mathieu-Daudé
2019-12-18 3:19 ` [PATCH 5/7] configure: Unnest detection of -z,relro and -z,now Richard Henderson
2019-12-18 8:11 ` Thomas Huth
2019-12-18 16:58 ` Richard Henderson
2019-12-18 18:31 ` Thomas Huth
2019-12-18 3:19 ` [PATCH 6/7] configure: Override the os default with --disable-pie Richard Henderson
2019-12-18 8:13 ` Thomas Huth
2019-12-18 17:57 ` Philippe Mathieu-Daudé [this message]
2019-12-18 3:19 ` [PATCH 7/7] configure: Support -static-pie if requested Richard Henderson
2019-12-18 8:15 ` Thomas Huth
2019-12-18 7:28 ` [PATCH 0/7] configure: Improve PIE and other linkage Fangrui Song
2019-12-18 22:32 ` Richard Henderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2cdc6931-2a97-a3ed-84f2-607e34cd4271@redhat.com \
--to=philmd@redhat.com \
--cc=berrange@redhat.com \
--cc=i@maskray.me \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).