From patchwork Wed Dec 18 03:19:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 181967 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp89625ile; Tue, 17 Dec 2019 19:24:09 -0800 (PST) X-Google-Smtp-Source: APXvYqwm81fs55JErzQms4N1AHZCCY7AT2spNN0jiB0iKp2VbWgab8dWZXD07PYuSk5g7ddBDKCo X-Received: by 2002:a0c:b2c7:: with SMTP id d7mr340046qvf.111.1576639449272; Tue, 17 Dec 2019 19:24:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576639449; cv=none; d=google.com; s=arc-20160816; b=Lrlz8NH3t6g4xZex4o5yDZei7Jq6amfYj/bBra9YLeJhS2T3fF1g1t7zo5MnRjkpb8 0cqwFEAkFGvMdGrX3oeSHwq4EgKHsRypf4xpsjZ//LSxa52OFmNQWMluXMbOwpViGADr pNP1gg2/Q1olvJymnqBbJnRSBMASpXZAizAyC5oqwlkW2kCqqhJM3EG97dzwWHdi9xto XfBl/xh2QVccjKnDXtuNbBRgNz3Hj9N06tdM0GXrKsElsU42Jx8x+/BgrBfsFSDRJU14 6NEfUDCDWtqwBX6ISWXCnMUD/XpKGJnhRXDYdQrnWgGDdW+3LxZCh8U1jFhUSEOG2szp cl6A== 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=+Toe6+kf85085QGBznhMe/ZC3IHb6MH8qdiKw5XlMFI=; b=PjNRC0k3H361lZni/0NY2Q0ZqVSHMO2/FKQ0ZD3m9rO1p9fSx/4/Nn2h4eizxYVtdc iLNmppIfzPyuTHynSHowjENGJQQBMfjjrr9S0ZJVD4j9ROw+egtr3BvWGpbt174jqCB2 va8BHj5TsvI/2onylfM9ZWbvcieXxHblRXMQau9VNSMHCLqpW6ZlTo38aNxYeuK2VTPG /yeflz3BA61CcJds2RP5H5hn7z8020CHKUiV2RE4DTnGApQfflEkbW/eLJD5oPyncJRM cLnO+7kMK17dfI30RJ//kNUT6QJHizbH+b8XB8AbLaMElv+0RHasxKCjVyl7+z3diY9Z fJzg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ffmarJqS; 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 i11si556874qvt.120.2019.12.17.19.24.09 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 17 Dec 2019 19:24:09 -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=ffmarJqS; 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]:49002 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihPwW-0001WL-PX for patch@linaro.org; Tue, 17 Dec 2019 22:24:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43923) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihPrz-00042w-QA for qemu-devel@nongnu.org; Tue, 17 Dec 2019 22:19:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihPry-0002dn-Ld for qemu-devel@nongnu.org; Tue, 17 Dec 2019 22:19:27 -0500 Received: from mail-pg1-x542.google.com ([2607:f8b0:4864:20::542]:43048) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ihPry-0002cz-Fv for qemu-devel@nongnu.org; Tue, 17 Dec 2019 22:19:26 -0500 Received: by mail-pg1-x542.google.com with SMTP id k197so435061pga.10 for ; Tue, 17 Dec 2019 19:19:26 -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=+Toe6+kf85085QGBznhMe/ZC3IHb6MH8qdiKw5XlMFI=; b=ffmarJqSOoWRRJ5Qixi6fN4Y6Fx0Lh9cOfGrdDRa0B2w/drHIBmGHpPU018P36NEx+ LJDfFwiMk+GWmrjheD59oPdZ7/Erer1TPxuWR4SUtHwiiJX/ATSccpifVIOucGMQSeTz 1m+BH7kq5AT33MXSEah3M+lnQu7ib6TFHb0SiAB5pahjKVTmKdLBkldDqX5dRNsBeJFl GBo2qZMSXttsKjpGixXbKYvkGvhkPtS2d9oLhIxeblfP+Xs/i8bOIBvzsgXGr1Od/Y7A jBS5cKBvJT10/ObOuCPMfF1XKAb4YalkR5BoFejcrq1JYLejccn1gQxGry3Gq65GnOpu D9fw== 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=+Toe6+kf85085QGBznhMe/ZC3IHb6MH8qdiKw5XlMFI=; b=adJ4oZE66NZ8XdKgNporQim6QVnvzuG6VjHnpdZmynOY0NyCbdTjUEimRFzQW5RJRi r21qAs/mRK9AiDfu2sJ7u8s1NW5x/Hrb3LLjFRPW2tSdgZCtVugjxh824yDt2v5UK8pi tbj/lH0BdjozTcA3eTO+dOoR7hwSt543NFEc8wsJGXyxKFwDI2B37L8RJp1uHPqIoTny RjIlJ/M2sIfQPjK6ZrhOd84+H0SVZYMJ6sf9qHdMXIXTNWSK5BPD30BVIashXNZtJtjr U70RR1x56daqGay2vYBzkM3WSIfD1aYtL86+PmD23bS89yMRWJYWlJWXuMp+d2fegMvl Z2WA== X-Gm-Message-State: APjAAAW7UmhhQx7mgBMdgfrvF0NoNKkKPRI0WBA/De45n2T1js6xaIq4 Cfisc4mZl+/76/Pp1fM7wuk8Fvpt8hg= X-Received: by 2002:a63:4d5e:: with SMTP id n30mr288667pgl.275.1576639165011; Tue, 17 Dec 2019 19:19:25 -0800 (PST) Received: from localhost.localdomain ([2605:e000:c74f:dc00:6838:d2b2:17e2:8445]) by smtp.gmail.com with ESMTPSA id k27sm404870pfp.66.2019.12.17.19.19.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Dec 2019 19:19:24 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 1/7] configure: Drop adjustment of textseg Date: Tue, 17 Dec 2019 17:19:14 -1000 Message-Id: <20191218031920.6414-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191218031920.6414-1-richard.henderson@linaro.org> References: <20191218031920.6414-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::542 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, 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. Signed-off-by: Richard Henderson --- configure | 47 ----------------------------------------------- 1 file changed, 47 deletions(-) -- 2.20.1 Reviewed-by: Thomas Huth 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 </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