From patchwork Wed Dec 18 22:34:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 182035 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp1282526ile; Wed, 18 Dec 2019 14:37:07 -0800 (PST) X-Google-Smtp-Source: APXvYqxcli2jb6bpdoTroGGfOJrmwrTGTsOOdgbaPajjS3f4IL+F28njEgJbeKK9HXcTyPRlkOCE X-Received: by 2002:a05:620a:143b:: with SMTP id k27mr5054084qkj.262.1576708627472; Wed, 18 Dec 2019 14:37:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576708627; cv=none; d=google.com; s=arc-20160816; b=m5pPAgL750wQQsEMIVfTzakN/C9OrzegqwBlojSY7GP+pAjnJ7MslKhNQKzNkw1l3k Naabkm4gdyCpxa4za0l42E5WQmLtOVBeEI1ZwVO/qOo69ciQET9UAH5HtalaCxYzF3rA tzxJR1VkWn2JlJ+pHkLg9I9FIyYz7yj8WwUIcmvJUASPwMajVhVlLfyL9Bj3PShscisu RWpVEjHi1CjQe2l5qgnnFBDRH+kCZnVNzos775zzAA+teWDpyrCVbSc9nUOMZIBfII6q 5KmTkNop0Qj1RhKpV3457nrCqFmRWSZSB7olB941KkIYgOAf13dYwWL8SyYM/L3jVi0i FCuA== 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=3CCNiOkBdotcPLlflc1t8sogIYTztDmOMbypR3M+57k=; b=Rsl70InUT+Y6f+z4YIbrEdk7Q2/6bBAk9U/LGHP+8E0ocZidxOHWek66a8kEy/aD5P eHMsNU/x7jkbioyxlNOLrQ0sOggMpf4ycnP1mCiYpr8lBDaIvdHGoe4ENhb74CGK+MTs 7FxZw893CJV6u9/HL0lvM+7CM0Q5Xn08Vp85juuGvhtrxMR81zK6fuDeu2kILxf+xXhQ hTy9/crWAyvID+WrfcQJPCLBAnNhth6jx51mZkSSZDkoYEjUP7k3FH/p31cADN8+cI8/ znQmsRCHfDcmSfj0MkBLna6hoChT9RTfFRa+4g9HfqeNINsopDuam3yON9AAmzbGARvD At4g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=hauNGhrJ; 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 j2si2554039qkl.71.2019.12.18.14.37.07 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 18 Dec 2019 14:37:07 -0800 (PST) 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=hauNGhrJ; 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]:33454 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihhwI-0004C9-VH for patch@linaro.org; Wed, 18 Dec 2019 17:37:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:54290) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihhu7-0001TG-3T for qemu-devel@nongnu.org; Wed, 18 Dec 2019 17:34:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihhu5-0003uP-9m for qemu-devel@nongnu.org; Wed, 18 Dec 2019 17:34:51 -0500 Received: from mail-pg1-x543.google.com ([2607:f8b0:4864:20::543]:41704) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ihhu3-0003tP-Kw for qemu-devel@nongnu.org; Wed, 18 Dec 2019 17:34:49 -0500 Received: by mail-pg1-x543.google.com with SMTP id x8so2020726pgk.8 for ; Wed, 18 Dec 2019 14:34:47 -0800 (PST) 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=3CCNiOkBdotcPLlflc1t8sogIYTztDmOMbypR3M+57k=; b=hauNGhrJnf8EflRroccGva02uhxQK4nlyYK3/WZhLfdvOlUcO2wcF8qCNd3nDP/lJu eOVZk7maOwFKw8BRBLCfI/YQ8GmPVZI952/1Uvc8vGFMkVJb19tpo5nXHE5Q/kilYmsI X3U+hrOUlnCyxPLFoua5Bu54JJxF1z22+58WEruv9itdVSrlQ3otlf/t4mgzG13AyRHU 6Sa2TVf5LV3NhyLcjJt9pqt7lkseyPmXmZyxSlt6lnaQa8ZU9azwnF8ekEtJemK7xr6S vNXf0uR4Esl4T/fTfHWYi8caFdf5x47Emh0CDMr0O5PRPeff9VPAlsajGfeTIvIvx6kz mNbQ== 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=3CCNiOkBdotcPLlflc1t8sogIYTztDmOMbypR3M+57k=; b=X2jpK1H1JvmtalQeYESPvoYZ5C14CpOt0yE2hV1iUH7GwC65p8O8l7n04iwqZdjhqe dxrDDt1P5nFvWbAVbYYE6JPR++0woBN4KuScNwwU8UoNcpINpWM3jOuhjDbLxIPtxKmo vJ9lz0TGGowzcnj1KiFhvHkW+AQNRFE9tz6t5vRqjKQPPIMUr0sxKs9DheV2ZnvkyG1k E2Qhq4W39y/bMbifvEVxlSlbYU2k0USEb+tGMxxq6s6Cv1hDSVyyX2C28OiblTTMV1+o xCpu1anzb+NSa/Hi7dSPxuKXQavruZ0IHmtGmXVroBaePbCAV5tYXSSRzDV2+PvTEC6a p6+w== X-Gm-Message-State: APjAAAUfOExxcmsHD4cH9SrnRGJlNYUYOoRoEX19WaMgfAzu9Ls9gEvs cS7DH4pYthWIuk2aUk9eBSCrCQm8rgs= X-Received: by 2002:a65:4d0b:: with SMTP id i11mr5891442pgt.340.1576708486236; Wed, 18 Dec 2019 14:34:46 -0800 (PST) Received: from localhost.localdomain ([2605:e000:c74f:dc00:6838:d2b2:17e2:8445]) by smtp.gmail.com with ESMTPSA id j1sm4627779pff.107.2019.12.18.14.34.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Dec 2019 14:34:45 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 1/7] configure: Drop adjustment of textseg Date: Wed, 18 Dec 2019 12:34:35 -1000 Message-Id: <20191218223441.23852-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191218223441.23852-1-richard.henderson@linaro.org> References: <20191218223441.23852-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: philmd@redhat.com, Thomas Huth , i@maskray.me, berrange@redhat.com 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: Thomas Huth Signed-off-by: Richard Henderson --- v2: Remove mention of config-host.ld from make distclean --- Makefile | 2 +- configure | 47 ----------------------------------------------- 2 files changed, 1 insertion(+), 48 deletions(-) -- 2.20.1 diff --git a/Makefile b/Makefile index 1361def144..adf83f75a1 100644 --- a/Makefile +++ b/Makefile @@ -735,7 +735,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) qemu-options.texi qemu-img-cmds.texi qemu-monitor.texi qemu-monitor-info.texi + rm -f config-host.mak config-host.h* $(DOCS) qemu-options.texi qemu-img-cmds.texi qemu-monitor.texi qemu-monitor-info.texi rm -f tests/tcg/config-*.mak rm -f config-all-devices.mak config-all-disas.mak config.status rm -f $(SUBDIR_DEVICES_MAK) diff --git a/configure b/configure index e0c66ee9b6..30e3875c6b 100755 --- a/configure +++ b/configure @@ -6298,49 +6298,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 @@ -7903,10 +7860,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