aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/config/gnu-user.h4
2 files changed, 8 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5739f22..573c779 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2019-08-13 Caroline Tice <cmtice@google.com>
+
+ PR other/91396
+ * config/gnu-user.h (GNU_USER_TARGET_ENDFILE_SPEC): Only add the
+ vtv_end.o or vtv_end_preinit.o files if !static.
+
2019-08-13 Olivier Hainque <hainque@adacore.com>
* rtl.h (tablejump_casesi_pattern): Move declaration to proper spot.
diff --git a/gcc/config/gnu-user.h b/gcc/config/gnu-user.h
index 055a4f0..95a3c29 100644
--- a/gcc/config/gnu-user.h
+++ b/gcc/config/gnu-user.h
@@ -73,9 +73,9 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
GNU userspace "finalizer" file, `crtn.o'. */
#define GNU_USER_TARGET_ENDFILE_SPEC \
- "%{fvtable-verify=none:%s; \
+ "%{!static:%{fvtable-verify=none:%s; \
fvtable-verify=preinit:vtv_end_preinit.o%s; \
- fvtable-verify=std:vtv_end.o%s} \
+ fvtable-verify=std:vtv_end.o%s}} \
%{static:crtend.o%s; \
shared|static-pie|" PIE_SPEC ":crtendS.o%s; \
:crtend.o%s} " \