From patchwork Mon Nov 12 11:29:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Modra X-Patchwork-Id: 996355 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-489715-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="IlF67Jup"; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="N0oUgMj4"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42tpSj32d1z9s1x for ; Mon, 12 Nov 2018 22:29:40 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:subject:message-id:mime-version:content-type; q=dns; s= default; b=tb5SQg5qFwnV5KNJ4uFyIMHMoid1NnxcZjGo/QeFPk6g68t1s4Ji4 VwgAaguxlNKMBL/uMCE1OygYjvU5zISe1MbIehPqIWESIySsI+BTDQNX1/NTc7YU OmQAlnslf4Ek9lZ3N4lNR83sNUevKuBjWHkD+Q9FE3PHrXTE/KiEY4= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:subject:message-id:mime-version:content-type; s= default; bh=AgU3HM34+H3gcCSIlPRxLikXPiQ=; b=IlF67JupgdeDBYiuGWyl k33F28kk5UAEJtbq5H8sy2Xvo+4T+0DThhYOjsswggEwD3EUqII+Ku5rIwRKVtjN aK3+5vFcgwevodNq+WhbiRxxXnJ9vZCvYfs3SxibgohFDsqgPaCLwHoUjg8XVSRW h3DCfN87KrU61Rvl7sRxtm4= Received: (qmail 50821 invoked by alias); 12 Nov 2018 11:29:33 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 50803 invoked by uid 89); 12 Nov 2018 11:29:33 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-25.7 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy=constructed, Hx-spam-relays-external:209.85.215.196, H*RU:209.85.215.196, HX-HELO:sk:mail-pg X-HELO: mail-pg1-f196.google.com Received: from mail-pg1-f196.google.com (HELO mail-pg1-f196.google.com) (209.85.215.196) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 12 Nov 2018 11:29:31 +0000 Received: by mail-pg1-f196.google.com with SMTP id y4so3939725pgc.12 for ; Mon, 12 Nov 2018 03:29:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:subject:message-id:mime-version:content-disposition :user-agent; bh=SAKvO/iW6oilLTud5FX2BCSg8NXIMt5pKclyiuNhV/o=; b=N0oUgMj4xfdYgGlgaL72MuhtpxQaxVzErjr1++Tzo9BjkpjJHH+5Hj6ZnVoQ85lwmF ozbb80J3acWUmGYF+OhoUCa0NvHbFkFTGDLgiO2L6tIJ41osrMMS11h+yxkXkyfRxNcl 4OcvgHKP7TiVT0qxU1FB1+I86ehhO9w1ztyPxbo5f2AZY3MNls621rRlEFzam0ILRkBP xYYZUuulb8DldAxujlcU8NhZkqBkKaEpjBumckkH/RhUTdH5ToaQCIA69KGQtWCjSylD 4orKUo4dYi4ZacSd2wfe9rE/rr+GxXh3qRoynS8AZxl55YrugqPp0tQ3pnmRGiIhPza8 IcPQ== Received: from bubble.grove.modra.org ([58.175.241.133]) by smtp.gmail.com with ESMTPSA id m3sm22904718pgl.69.2018.11.12.03.29.28 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 Nov 2018 03:29:29 -0800 (PST) Received: by bubble.grove.modra.org (Postfix, from userid 1000) id 9167D80388; Mon, 12 Nov 2018 21:59:25 +1030 (ACDT) Date: Mon, 12 Nov 2018 21:59:25 +1030 From: Alan Modra To: gcc-patches@gcc.gnu.org Subject: Delete !HAVE_LD_PIE variants of startfile/endfile specs Message-ID: <20181112112925.GC22752@bubble.grove.modra.org> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.9.4 (2018-02-28) X-IsSubscribed: yes This patch is a small cleanup. The HAVE_LD_PIE variant doesn't contain anything that will break linking when !HAVE_LD_PIE that isn't already broken if you choose to build PIEs with a linker that doesn't support PIE. All this HAVE_LD_PIE protects is the choice of different crt files, which is more about libc capability than linker capability. Bootstrapped etc. powerpc64le-linux and x86_64-linux. OK? * config/gnu-user.h (GNU_USER_TARGET_STARTFILE_SPEC): Delete !HAVE_LD_PIE variant. (GNU_USER_TARGET_ENDFILE_SPEC): Likewise. diff --git a/gcc/config/gnu-user.h b/gcc/config/gnu-user.h index 5b48fb21514..75f6a6f0a7d 100644 --- a/gcc/config/gnu-user.h +++ b/gcc/config/gnu-user.h @@ -45,7 +45,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see provides part of the support for getting C++ file-scope static object constructed before entering `main'. */ -#if defined HAVE_LD_PIE #define GNU_USER_TARGET_STARTFILE_SPEC \ "%{shared:; \ pg|p|profile:%{static-pie:grcrt1.o%s;:gcrt1.o%s}; \ @@ -59,22 +58,8 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see :crtbegin.o%s} \ %{fvtable-verify=none:%s; \ fvtable-verify=preinit:vtv_start_preinit.o%s; \ - fvtable-verify=std:vtv_start.o%s} \ - " CRTOFFLOADBEGIN -#else -#define GNU_USER_TARGET_STARTFILE_SPEC \ - "%{shared:; \ - pg|p|profile:gcrt1.o%s; \ - :crt1.o%s} \ - crti.o%s \ - %{static:crtbeginT.o%s; \ - shared|pie|static-pie:crtbeginS.o%s; \ - :crtbegin.o%s} \ - %{fvtable-verify=none:%s; \ - fvtable-verify=preinit:vtv_start_preinit.o%s; \ - fvtable-verify=std:vtv_start.o%s} \ - " CRTOFFLOADBEGIN -#endif + fvtable-verify=std:vtv_start.o%s} " \ + CRTOFFLOADBEGIN #undef STARTFILE_SPEC #define STARTFILE_SPEC GNU_USER_TARGET_STARTFILE_SPEC @@ -84,7 +69,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see object constructed before entering `main', followed by a normal GNU userspace "finalizer" file, `crtn.o'. */ -#if defined HAVE_LD_PIE #define GNU_USER_TARGET_ENDFILE_SPEC \ "%{fvtable-verify=none:%s; \ fvtable-verify=preinit:vtv_end_preinit.o%s; \ @@ -92,19 +76,8 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see %{static:crtend.o%s; \ shared|static-pie|" PIE_SPEC ":crtendS.o%s; \ :crtend.o%s} \ - crtn.o%s \ - " CRTOFFLOADEND -#else -#define GNU_USER_TARGET_ENDFILE_SPEC \ - "%{fvtable-verify=none:%s; \ - fvtable-verify=preinit:vtv_end_preinit.o%s; \ - fvtable-verify=std:vtv_end.o%s} \ - %{static:crtend.o%s; \ - shared|pie|static-pie:crtendS.o%s; \ - :crtend.o%s} \ - crtn.o%s \ - " CRTOFFLOADEND -#endif + crtn.o%s " \ + CRTOFFLOADEND #undef ENDFILE_SPEC #define ENDFILE_SPEC GNU_USER_TARGET_ENDFILE_SPEC