gcc8: Fix gcc/target/87221 better.

Link PIE executables with crtbeginS/crtendS on NetBSD.

Bump PKGREVISION

4 files changed, 38 insertions, 21 deletions

diff --git a/lang/gcc8/Makefile b/lang/gcc8/Makefile
index d212f74e44a..cd5b0806642 100644
--- a/lang/gcc8/Makefile
+++ b/lang/gcc8/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.6 2018/10/28 22:21:04 abs Exp $
+# $NetBSD: Makefile,v 1.7 2018/11/07 04:32:32 maya Exp $
 
 GCC_PKGNAME=		gcc8
 .include		"version.mk"
 
 DISTNAME=	gcc-${GCC8_DIST_VERSION}
 PKGNAME=	${GCC_PKGNAME}-${GCC8_DIST_VERSION}
-PKGREVISION=	1
+PKGREVISION=	2
 ## When bumping the PKGREVISION of this package the PKGREVISION of
 ## lang/gcc8-libs needs to be bump to be at least 1 more than the
 ## PKGREVISION of this package!
diff --git a/lang/gcc8/distinfo b/lang/gcc8/distinfo
index a0ce8e9c3bb..2b946b652e9 100644
--- a/lang/gcc8/distinfo
+++ b/lang/gcc8/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2018/10/28 22:21:04 abs Exp $
+$NetBSD: distinfo,v 1.5 2018/11/07 04:32:32 maya Exp $
 
 SHA1 (gcc-8.2.0.tar.xz) = 19926bdb6c4b58891015929853d41aeff019d400
 RMD160 (gcc-8.2.0.tar.xz) = 4fba19867980d04bed1e62d46d4787c99f4fd13d
@@ -12,6 +12,7 @@ SHA1 (patch-contrib_download__prerequisites) = 86c6c16e0e3e3a0bcb38579a8b4004f60
 SHA1 (patch-gcc_Makefile.in) = c0f97c75ba1d37eae894141edd58bb36b734f651
 SHA1 (patch-gcc_config.gcc) = c57c3668688a96950a706cb9643b40e5631545f9
 SHA1 (patch-gcc_config_arm_arm.h) = aba0bab2489cb7224d45eca0977156fe4f7a74a8
+SHA1 (patch-gcc_config_netbsd-elf.h) = 0fcfadfe0734f9583fdec7817112a42fb7be0eb3
 SHA1 (patch-gcc_config_netbsd-protos.h) = 6d28864b4ccc8c1a63fe28e43601b84b63a00633
 SHA1 (patch-gcc_config_t-netbsd) = 802ad5706aa7ca9629f8e237f08fbb1569d28846
 SHA1 (patch-gcc_config_x-netbsd) = 6dc3d78e26df62054ea29f98ca51592858e671e3
@@ -22,7 +23,6 @@ SHA1 (patch-gcc_targhooks.c) = b28d8a9696d07bbfb00b7d8c55193ba99447ff1d
 SHA1 (patch-isl_configure) = 36b37778ee13c0b364fb24d5864d6a9e65b29b7d
 SHA1 (patch-libffi_configure) = bcfbfe8abddc378e2de4a39ad0669583b37e0292
 SHA1 (patch-libffi_testsuite_libffi.call_float2.c) = 6321dde308579448c27c2b6e1e30633699dd145f
-SHA1 (patch-libgcc_Makefile.in) = 0fc931e41c86b3d402eb3f3a569284195f4ce025
 SHA1 (patch-libgcc_config.host) = bdd4cd27249c8b62793204428d95c977d58f06fb
 SHA1 (patch-libgcc_crtstuff.c) = e3a3b02a26229992851f195b5701cb1b86c29efe
 SHA1 (patch-libgfortran_io_io.h) = d44676239a7f45e42054d24bd5224f43c20055c0
diff --git a/lang/gcc8/patches/patch-gcc_config_netbsd-elf.h b/lang/gcc8/patches/patch-gcc_config_netbsd-elf.h
new file mode 100644
index 00000000000..dab5762cc56
--- /dev/null
+++ b/lang/gcc8/patches/patch-gcc_config_netbsd-elf.h
@@ -0,0 +1,34 @@
+$NetBSD: patch-gcc_config_netbsd-elf.h,v 1.1 2018/11/07 04:32:32 maya Exp $
+
+Link PIE executables with crtbeginS/crtendS on NetBSD.
+https://gcc.gnu.org/bugzilla/show_bug.cgi?id=87221
+
+
+--- gcc/config/netbsd-elf.h.orig	2018-01-03 10:03:58.000000000 +0000
++++ gcc/config/netbsd-elf.h
+@@ -40,8 +40,11 @@ along with GCC; see the file COPYING3.  
+        %{!p:crt0%O%s}}}		\
+    %:if-exists(crti%O%s)	\
+    %{static:%:if-exists-else(crtbeginT%O%s crtbegin%O%s)} \
+-   %{!static: \
+-     %{!shared:crtbegin%O%s} %{shared:crtbeginS%O%s}}"
++   %{!static:                   \
++     %{!shared:                 \
++       %{!pie:crtbegin%O%s}     \
++       %{pie:crtbeginS%O%s}}    \
++     %{shared:crtbeginS%O%s}}"
+ 
+ #undef STARTFILE_SPEC
+ #define STARTFILE_SPEC NETBSD_STARTFILE_SPEC
+@@ -52,7 +55,10 @@ along with GCC; see the file COPYING3.  
+    C++ file-scope static objects deconstructed after exiting "main".  */
+ 
+ #define NETBSD_ENDFILE_SPEC	\
+-  "%{!shared:crtend%O%s} %{shared:crtendS%O%s} \
++  "%{!shared:                   \
++    %{!pie:crtend%O%s}          \
++    %{pie:crtendS%O%s}}         \
++   %{shared:crtendS%O%s}        \
+    %:if-exists(crtn%O%s)"
+ 
+ #undef ENDFILE_SPEC
diff --git a/lang/gcc8/patches/patch-libgcc_Makefile.in b/lang/gcc8/patches/patch-libgcc_Makefile.in
deleted file mode 100644
index b01a7d551bc..00000000000
--- a/lang/gcc8/patches/patch-libgcc_Makefile.in
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-libgcc_Makefile.in,v 1.1 2018/10/28 22:21:04 abs Exp $
-
-Add -fPIC to CRTSTUFF_CFLAGS
-
-https://gcc.gnu.org/bugzilla/show_bug.cgi?id=87221
-
---- libgcc/Makefile.in.orig	2018-01-03 10:03:58.000000000 +0000
-+++ libgcc/Makefile.in
-@@ -296,7 +296,7 @@ INTERNAL_CFLAGS = $(CFLAGS) $(LIBGCC2_CF
- CRTSTUFF_CFLAGS = -O2 $(GCC_CFLAGS) $(INCLUDES) $(MULTILIB_CFLAGS) -g0 \
-   $(NO_PIE_CFLAGS) -finhibit-size-directive -fno-inline -fno-exceptions \
-   -fno-zero-initialized-in-bss -fno-toplevel-reorder -fno-tree-vectorize \
--  -fbuilding-libgcc -fno-stack-protector $(FORCE_EXPLICIT_EH_REGISTRY) \
-+  -fbuilding-libgcc -fPIC -fno-stack-protector $(FORCE_EXPLICIT_EH_REGISTRY) \
-   $(INHIBIT_LIBC_CFLAGS)
- 
- # Extra flags to use when compiling crt{begin,end}.o.