From 003fc14b5b74ab203d693e2a4f30c25bd280daf8 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Sun, 18 Nov 2018 20:52:10 +1030 Subject: [PATCH] Delete !HAVE_LD_PIE variants of startfile/endfile specs 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. * config/gnu-user.h (GNU_USER_TARGET_STARTFILE_SPEC): Delete !HAVE_LD_PIE variant. (GNU_USER_TARGET_ENDFILE_SPEC): Likewise. From-SVN: r266249 --- gcc/ChangeLog | 12 +++++++++--- gcc/config/gnu-user.h | 35 ++++------------------------------- 2 files changed, 13 insertions(+), 34 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index d0e10f524f4..6539253f8b7 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,8 +1,14 @@ +2018-11-18 Alan Modra + + * config/gnu-user.h (GNU_USER_TARGET_STARTFILE_SPEC): Delete + !HAVE_LD_PIE variant. + (GNU_USER_TARGET_ENDFILE_SPEC): Likewise. + 2018-11-17 Nick Clifton Sandra Loosemore PR driver/31357 - * doc/invoke.texi (Overall Options): Document that --help and + * doc/invoke.texi (Overall Options): Document that --help and --help= options cannot be combined. 2018-11-17 Jim Wilson @@ -1626,7 +1632,7 @@ OMP_CLAUSE_{TASK,IN}_REDUCTION. Diagnose invalid conditional lastprivate. (gimplify_adjust_omp_clauses_1): Ignore GOVD_NONTEMPORAL. Handle - GOVD_MAP_ALLOC_ONLY and GOVD_MAP_FROM_ONLY. + GOVD_MAP_ALLOC_ONLY and GOVD_MAP_FROM_ONLY. (gimplify_adjust_omp_clauses): Handle OMP_CLAUSE_NONTEMPORAL. Handle OMP_CLAUSE_{TASK,IN}_REDUCTION. (gimplify_omp_task): Handle taskwait with depend clauses. @@ -4816,7 +4822,7 @@ the REF_REVERSE_STORAGE_ORDER flag on the value. (gimple_simplify) : For BIT_FIELD_REF, propagate the REF_REVERSE_STORAGE_ORDER flag and avoid simplifying if it is set. - + 2018-10-08 Richard Sandiford PR middle-end/63155 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 -- 2.30.2