Sync STARTFILE_SPEC, fixes egcc -static producing crashing programs

I don't expect any fallout from this (builtin spec file change only)

OK?

Index: Makefile
===================================================================
RCS file: /home/vcs/cvs/openbsd/ports/lang/gcc/4.6/Makefile,v
retrieving revision 1.89
diff -u -p -r1.89 Makefile
--- Makefile    29 Jun 2016 16:14:41 -0000      1.89
+++ Makefile    9 Jul 2016 21:40:57 -0000
@@ -30,9 +30,7 @@ PKGNAME-ada =   gnat-${FULL_PKGVERSION}
 PKGNAME-go =   gccgo-${FULL_PKGVERSION}
 PKGSPEC-main = gcc->=4.6,<4.7
 
-REVISION = 17
-REVISION-java = 18
-REVISION-go = 18
+REVISION = 18
 
 SHARED_LIBS =  estdc++         14.0 \
                gfortran        3.0 \
Index: patches/patch-gcc_config_alpha_openbsd_h
===================================================================
RCS file: 
/home/vcs/cvs/openbsd/ports/lang/gcc/4.6/patches/patch-gcc_config_alpha_openbsd_h,v
retrieving revision 1.2
diff -u -p -r1.2 patch-gcc_config_alpha_openbsd_h
--- patches/patch-gcc_config_alpha_openbsd_h    31 Mar 2012 20:02:03 -0000      
1.2
+++ patches/patch-gcc_config_alpha_openbsd_h    9 Jul 2016 21:40:57 -0000
@@ -1,6 +1,6 @@
 $OpenBSD: patch-gcc_config_alpha_openbsd_h,v 1.2 2012/03/31 20:02:03 pascal 
Exp $
 --- gcc/config/alpha/openbsd.h.orig    Sun Sep 27 15:20:23 2009
-+++ gcc/config/alpha/openbsd.h Sun Mar 11 19:52:18 2012
++++ gcc/config/alpha/openbsd.h Sat Jul  9 22:46:36 2016
 @@ -19,6 +19,28 @@ along with GCC; see the file COPYING3.  If not see
  
  /* Controlling the compilation driver.  */
@@ -21,11 +21,11 @@ $OpenBSD: patch-gcc_config_alpha_openbsd
 +/* As an elf system, we need crtbegin/crtend stuff.  */
 +#undef STARTFILE_SPEC
 +#define STARTFILE_SPEC "\
-+      %{!shared: %{pg:gcrt0%O%s} %{!pg:%{p:gcrt0%O%s} %{!p:crt0%O%s}} \
-+      crtbegin%O%s} %{shared:crtbeginS%O%s}"
++      %{!shared: %{pg:gcrt0%O%s} %{!pg:%{p:gcrt0%O%s} \
++      %{!p:%{!static:crt0%O%s} %{static:%{nopie:crt0%O%s} \
++      %{!nopie:rcrt0%O%s}}}} crtbegin%O%s} %{shared:crtbeginS%O%s}"
 +#undef ENDFILE_SPEC
 +#define ENDFILE_SPEC "%{!shared:crtend%O%s} %{shared:crtendS%O%s}"
-+
 +
  /* run-time target specifications */
  #define TARGET_OS_CPP_BUILTINS()              \

Reply via email to