qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: philmd@redhat.com, i@maskray.me, berrange@redhat.com
Subject: [PATCH 1/7] configure: Drop adjustment of textseg
Date: Tue, 17 Dec 2019 17:19:14 -1000	[thread overview]
Message-ID: <20191218031920.6414-2-richard.henderson@linaro.org> (raw)
In-Reply-To: <20191218031920.6414-1-richard.henderson@linaro.org>

This adjustment was random and unnecessary.  The user mode
startup code in probe_guest_base() will choose a value for
guest_base that allows the host qemu binary to not conflict
with the guest binary.

With modern distributions, this isn't even used, as the default
is PIE, which does the same job in a more portable way.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 configure | 47 -----------------------------------------------
 1 file changed, 47 deletions(-)

diff --git a/configure b/configure
index 84b413dbfc..255ac432af 100755
--- a/configure
+++ b/configure
@@ -6292,49 +6292,6 @@ if test "$cpu" = "s390x" ; then
   fi
 fi
 
-# Probe for the need for relocating the user-only binary.
-if ( [ "$linux_user" = yes ] || [ "$bsd_user" = yes ] ) && [ "$pie" = no ]; then
-  textseg_addr=
-  case "$cpu" in
-    arm | i386 | ppc* | s390* | sparc* | x86_64 | x32)
-      # ??? Rationale for choosing this address
-      textseg_addr=0x60000000
-      ;;
-    mips)
-      # A 256M aligned address, high in the address space, with enough
-      # room for the code_gen_buffer above it before the stack.
-      textseg_addr=0x60000000
-      ;;
-  esac
-  if [ -n "$textseg_addr" ]; then
-    cat > $TMPC <<EOF
-    int main(void) { return 0; }
-EOF
-    textseg_ldflags="-Wl,-Ttext-segment=$textseg_addr"
-    if ! compile_prog "" "$textseg_ldflags"; then
-      # In case ld does not support -Ttext-segment, edit the default linker
-      # script via sed to set the .text start addr.  This is needed on FreeBSD
-      # at least.
-      if ! $ld --verbose >/dev/null 2>&1; then
-        error_exit \
-            "We need to link the QEMU user mode binaries at a" \
-            "specific text address. Unfortunately your linker" \
-            "doesn't support either the -Ttext-segment option or" \
-            "printing the default linker script with --verbose." \
-            "If you don't want the user mode binaries, pass the" \
-            "--disable-user option to configure."
-      fi
-
-      $ld --verbose | sed \
-        -e '1,/==================================================/d' \
-        -e '/==================================================/,$d' \
-        -e "s/[.] = [0-9a-fx]* [+] SIZEOF_HEADERS/. = $textseg_addr + SIZEOF_HEADERS/" \
-        -e "s/__executable_start = [0-9a-fx]*/__executable_start = $textseg_addr/" > config-host.ld
-      textseg_ldflags="-Wl,-T../config-host.ld"
-    fi
-  fi
-fi
-
 # Check that the C++ compiler exists and works with the C compiler.
 # All the QEMU_CXXFLAGS are based on QEMU_CFLAGS. Keep this at the end to don't miss any other that could be added.
 if has $cxx; then
@@ -7897,10 +7854,6 @@ if test "$gprof" = "yes" ; then
   fi
 fi
 
-if test "$target_linux_user" = "yes" || test "$target_bsd_user" = "yes" ; then
-  ldflags="$ldflags $textseg_ldflags"
-fi
-
 # Newer kernels on s390 check for an S390_PGSTE program header and
 # enable the pgste page table extensions in that case. This makes
 # the vm.allocate_pgste sysctl unnecessary. We enable this program
-- 
2.20.1



  reply	other threads:[~2019-12-18  3:23 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 ` Richard Henderson [this message]
2019-12-18  6:59   ` [PATCH 1/7] configure: Drop adjustment of textseg 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é
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=20191218031920.6414-2-richard.henderson@linaro.org \
    --to=richard.henderson@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).