From: "Alex Bennée" <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Cc: berrange@redhat.com, i@maskray.me, philmd@redhat.com
Subject: Re: [PATCH v2 7/7] configure: Support -static-pie if requested
Date: Tue, 07 Jan 2020 13:45:43 +0000 [thread overview]
Message-ID: <87ftgr4by0.fsf@linaro.org> (raw)
In-Reply-To: <20191218223441.23852-8-richard.henderson@linaro.org>
Richard Henderson <richard.henderson@linaro.org> writes:
> Recent toolchains support static and pie at the same time.
>
> As with normal dynamic builds, allow --static to default to PIE
> if supported by the toolchain. Allow --enable/--disable-pie to
> override the default.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
> ---
> v2: Fix --disable-pie --static
> ---
> configure | 19 ++++++++++++-------
> 1 file changed, 12 insertions(+), 7 deletions(-)
>
> diff --git a/configure b/configure
> index f6ff079fab..55586c5498 100755
> --- a/configure
> +++ b/configure
> @@ -1024,7 +1024,6 @@ for opt do
> ;;
> --static)
> static="yes"
> - LDFLAGS="-static $LDFLAGS"
> QEMU_PKG_CONFIG_FLAGS="--static $QEMU_PKG_CONFIG_FLAGS"
> ;;
> --mandir=*) mandir="$optarg"
> @@ -2000,11 +1999,6 @@ if test "$static" = "yes" ; then
> if test "$modules" = "yes" ; then
> error_exit "static and modules are mutually incompatible"
> fi
> - if test "$pie" = "yes" ; then
> - error_exit "static and pie are mutually incompatible"
> - else
> - pie="no"
> - fi
> fi
>
> # Unconditional check for compiler __thread support
> @@ -2035,7 +2029,18 @@ if compile_prog "-Werror -fno-pie" "-no-pie"; then
> LDFLAGS_NOPIE="-no-pie"
> fi
>
> -if test "$pie" = "no"; then
> +if test "$static" = "yes"; then
> + if test "$pie" != "no" && compile_prog "-fPIE -DPIE" "-static-pie"; then
> + QEMU_CFLAGS="-fPIE -DPIE $QEMU_CFLAGS"
> + LDFLAGS="-static-pie $LDFLAGS"
> + pie="yes"
> + elif test "$pie" = "yes"; then
> + error_exit "-static-pie not available due to missing toolchain support"
> + else
> + LDFLAGS="-static $LDFLAGS"
> + pie="no"
> + fi
> +elif test "$pie" = "no"; then
> QEMU_CFLAGS="$CFLAGS_NOPIE $QEMU_CFLAGS"
> LDFLAGS="$LDFLAGS_NOPIE $LDFLAGS"
> elif compile_prog "-fPIE -DPIE" "-pie"; then
--
Alex Bennée
next prev parent reply other threads:[~2020-01-07 14:52 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-18 22:34 [PATCH v2 0/7] configure: Improve PIE and other linkage Richard Henderson
2019-12-18 22:34 ` [PATCH v2 1/7] configure: Drop adjustment of textseg Richard Henderson
2020-01-07 11:34 ` Alex Bennée
2019-12-18 22:34 ` [PATCH v2 2/7] tcg: Remove softmmu code_gen_buffer fixed address Richard Henderson
2020-01-07 11:35 ` Alex Bennée
2019-12-18 22:34 ` [PATCH v2 3/7] configure: Do not force pie=no for non-x86 Richard Henderson
2020-01-07 11:37 ` Philippe Mathieu-Daudé
2020-01-07 12:58 ` Alex Bennée
2019-12-18 22:34 ` [PATCH v2 4/7] configure: Always detect -no-pie toolchain support Richard Henderson
2020-01-07 13:16 ` Alex Bennée
2020-01-08 0:45 ` Richard Henderson
2019-12-18 22:34 ` [PATCH v2 5/7] configure: Unnest detection of -z,relro and -z,now Richard Henderson
2019-12-18 22:46 ` [PATCH v2 5/7] configure: Unnest detection of -z, relro and -z, now Philippe Mathieu-Daudé
2019-12-19 7:11 ` Fangrui Song
2020-01-07 13:18 ` Alex Bennée
2019-12-18 22:34 ` [PATCH v2 6/7] configure: Override the os default with --disable-pie Richard Henderson
2020-01-07 13:24 ` Alex Bennée
2019-12-18 22:34 ` [PATCH v2 7/7] configure: Support -static-pie if requested Richard Henderson
2020-01-07 13:45 ` Alex Bennée [this message]
2020-01-06 2:57 ` [PATCH v2 0/7] configure: Improve PIE and other linkage 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=87ftgr4by0.fsf@linaro.org \
--to=alex.bennee@linaro.org \
--cc=berrange@redhat.com \
--cc=i@maskray.me \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.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).