From patchwork Tue Mar 31 03:54:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 185073 Delivered-To: patch@linaro.org Received: by 2002:a92:de47:0:0:0:0:0 with SMTP id e7csp3242048ilr; Mon, 30 Mar 2020 20:55:19 -0700 (PDT) X-Google-Smtp-Source: ADFU+vskxPBJeFy/c+ludUkAXPcNnNCAoF+LnFYI6tezuppVrpuPf9oWBKHopxO5qTh5lin1UGHS X-Received: by 2002:a37:453:: with SMTP id 80mr3083537qke.325.1585626919019; Mon, 30 Mar 2020 20:55:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585626919; cv=none; d=google.com; s=arc-20160816; b=Z79KAOLxLtCTgcnCuvkyU4kzkVC3iwojwO01li2L7pqb+0kUkPJxzoThY7BZL0ihm/ OsJunrpG3/1B3oTJ/fAJn2fdopjF5SzaNj1l3SeObdstJjb69NzTBw4ayWRL/kRSF5N4 rGaPukgbAEWSFbxeQWe4xcB/SDqRMr1pCAYIouRocxz/gum+RkKXgKI90kyh/07IQxpX ZkXfq+/iWCUHIJFnO3/rh5ctOZR94P5Uoz7t35FFNovRE1Jpw5Rm4GWX35/TZ0jgOnpL XVrbhqXs0KsCBmWN3PwaWFeAbj0le+6knrBoCUwtKOLyr31yPKgzxWJPQzL3OH5l8rKh oulw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=dr2iLz/DtlBYqPaC0YalK4V7LwrO76HcMZE10x4F5dI=; b=iZ8M3bKDXOftZ5n7rqeCgXdu/C6oxLM9bwUjpg8CF86xr+fF1tsLb6gcnh+Yp0S4Sj LWXBVevWd//wMfZqskkLHrZ5Txkds1KFozfuqttgFoT7AJOzGr3mdcM9oUvq8xp4TJhM BU5SNFN1O0GdhCpsXbgL41wfk2sv+/FXltVQjbLWLbKEbHKY1TV3oTDWgZ424OtOfENz OgMKQErm+3dl6lImbHDnXFz5Q46cq5EVW6ZuME+R0DoP4XvPSZNU8bOWIA0vT1jTFELb 7FTLqTZ5N948DvRuqKFJBL2A6Fm7L75XBUcinRJdjoyF694O7s0zpNZKXQoFww1d/Y/Z lQgQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="kthMz/fq"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id q75si8776010qvq.150.2020.03.30.20.55.17 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 30 Mar 2020 20:55:19 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="kthMz/fq"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:59890 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jJ7zg-0004Yl-Hf for patch@linaro.org; Mon, 30 Mar 2020 23:55:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60780) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jJ7zT-0004YM-4h for qemu-devel@nongnu.org; Mon, 30 Mar 2020 23:55:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jJ7zR-000896-Td for qemu-devel@nongnu.org; Mon, 30 Mar 2020 23:55:03 -0400 Received: from mail-pg1-x543.google.com ([2607:f8b0:4864:20::543]:46434) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jJ7zR-000860-Nt for qemu-devel@nongnu.org; Mon, 30 Mar 2020 23:55:01 -0400 Received: by mail-pg1-x543.google.com with SMTP id k191so9713139pgc.13 for ; Mon, 30 Mar 2020 20:55:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dr2iLz/DtlBYqPaC0YalK4V7LwrO76HcMZE10x4F5dI=; b=kthMz/fqkPX/41l3miN7kY3K18r3EHAERK2EYudCL5vwlWzYoltJd+FJOMe8FRJvje W2SHG7/5QZBfzBJ6HpkWQjIhHMSSDHm/iuqjRJrFHqbSBLgQdmfOICuRgWTOxHPe6C2S YDrMEMCMTARm6IxP1VvgNG5GnsRtP0VTpK982cWYseMpk2ff6jvwU1X69rM5V+f08eML K/q6ggg6B1+bhCtlRbU98fWJLWhzJu2sSLhwgFiv/Mjyatpt6f+Offp/PhLOZGmigiGE a2ASROq541E7158RuJHEvTcnGwgXQNeD7MOSPyLKjmqmGhHWjUZ44/VBGdlBU6ZJCRL9 SdAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=dr2iLz/DtlBYqPaC0YalK4V7LwrO76HcMZE10x4F5dI=; b=ACA8DykhcsPTXTtdUpWwupGt82aH6uYpiy7bAqznkoT6kjIuuXKAypn4sVGrqivx3R Tj29PBDpsizcwEnDwtXxsU68QxXW5nUY5AGgG8AiVWqZxPEUaD8BKAgL9YdjRN00mnUy mZHiFAT1JxxN/dKKIfsiXqUgWNDycdvBuOeBolVnPDZy6qRqIAl2X88XIVHDGQ2pZ/Do pwktxyrsyjI4T+vYfgtjtVY+chMbut3s6pCmrJ2zm20IAd4p9C6gvlozeOc/ZKU4lrzJ U6N890LO1QUvbJ4L+zLYio+4i9M/5eb6cSxVTds2tBkxjw0DYY3xSj5AEaCM/Ie+dAU6 70bA== X-Gm-Message-State: AGi0PuZjGhvpaoQImUOOhdpKqK7ngGPwsyMLww7iBwD434PZtDeebcsD jcUg0ZBdUUyy8pvikmnrwh2zgTHIZHs= X-Received: by 2002:a65:6412:: with SMTP id a18mr10062990pgv.322.1585626900182; Mon, 30 Mar 2020 20:55:00 -0700 (PDT) Received: from localhost.localdomain (174-21-149-226.tukw.qwest.net. [174.21.149.226]) by smtp.gmail.com with ESMTPSA id h11sm11386174pfq.56.2020.03.30.20.54.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Mar 2020 20:54:59 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL for-5.0 01/10] configure: Drop adjustment of textseg Date: Mon, 30 Mar 2020 20:54:46 -0700 Message-Id: <20200331035456.6494-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200331035456.6494-1-richard.henderson@linaro.org> References: <20200331035456.6494-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::543 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, Thomas Huth , =?utf-8?q?Al?= =?utf-8?q?ex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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. Reviewed-by: Alex Bennée Reviewed-by: Thomas Huth Signed-off-by: Richard Henderson --- v2: Remove mention of config-host.ld from make distclean --- configure | 47 ----------------------------------------------- Makefile | 2 +- 2 files changed, 1 insertion(+), 48 deletions(-) -- 2.20.1 diff --git a/configure b/configure index e225a1e3ff..e3ccb8daf0 100755 --- a/configure +++ b/configure @@ -6498,49 +6498,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 </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 @@ -8175,10 +8132,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 diff --git a/Makefile b/Makefile index fc2808fb4b..84ef881600 100644 --- a/Makefile +++ b/Makefile @@ -795,7 +795,7 @@ rm -f $(MANUAL_BUILDDIR)/$1/objects.inv $(MANUAL_BUILDDIR)/$1/searchindex.js $(M endef distclean: clean - rm -f config-host.mak config-host.h* config-host.ld $(DOCS) + rm -f config-host.mak config-host.h* $(DOCS) rm -f tests/tcg/config-*.mak rm -f config-all-devices.mak config-all-disas.mak config.status rm -f $(SUBDIR_DEVICES_MAK)