main/gcc: boehm-gc/musl fixes, fix ecj pax flags

update java-gcj-compat together with gcc as they are integrally
bound together.

3 files changed, 57 insertions, 5 deletions

diff --git a/main/gcc/APKBUILD b/main/gcc/APKBUILD
index 684c40ebb5..47e068000b 100644
--- a/main/gcc/APKBUILD
+++ b/main/gcc/APKBUILD
@@ -13,7 +13,7 @@ _cross=""
 	&& _cross="-$CTARGET"
 
 pkgname="$pkgname$_cross"
-pkgrel=3
+pkgrel=4
 pkgdesc="The GNU Compiler Collection"
 url="http://gcc.gnu.org"
 arch="all"
@@ -674,7 +674,7 @@ ab83248e10b2bf4b3d9240de0fefb52b  pt_gnu_eh_frame.patch
 6e5c32243a86ff35b7b47d18c95b31bd  gcc-4.8-musl-fix-iteratephdr.patch
 0d0a41c02802b85c8f1b78ce28544f92  gcc-4.8-musl-libssp.patch
 2c6cb49bb9bfd8b6e690222e66ccc901  boehm-gc-uclibc.patch
-ea2749b1337a5d850a8f463071cc4747  boehm-gc-musl.patch
+0ea0f556d4ef9c260d1353b7fd33970c  boehm-gc-musl.patch
 2e2b787bb988d9007c9f7ce42178dfe6  gcc-pure64.patch
 762a7134017fe1056aaa6388b9b3a2d5  pr49423.patch
 fb28fd941c110627b7b9ca523d66b8d6  pr57748.patch
@@ -718,7 +718,7 @@ fffdcf25b71526be739685f927ab0d66c72afff34ec54dc147ba62b262935007  gcc-4.8-musl.p
 151c11c3303233e6ff06e27aa6dc889140bc46a7b5e4870587c40e37d36ede2c  gcc-4.8-musl-fix-iteratephdr.patch
 80b76ca30dcaf07481ab102869d741f044c7e5235f462182bc27467baacda9a4  gcc-4.8-musl-libssp.patch
 02751ccf223dcfc898c0ce2214cd0859d275e90b742f1a66e38db5c50f94b38c  boehm-gc-uclibc.patch
-6adcddbc9d52b4e39878155bc7ff0114c322e0f05c0c82dff8c06c7278313f73  boehm-gc-musl.patch
+6ccca88695ef84c0d038cd315cad5ae5b799672ecb009fdaab34e68ba60b733c  boehm-gc-musl.patch
 f5473c6aea96d5137defd68898ba31042944a3f3ed26c05b964a40bd876c6f47  gcc-pure64.patch
 d68d6680b3ab996b4b8dde2ddc351cecb46b560dc743d112e682c596696b67bb  pr49423.patch
 999fdf60b3a51435e7485a57e12c1110a2af3965e14528f77d5dd0917115011d  pr57748.patch
@@ -762,7 +762,7 @@ db84b6582950378116723116be4f277881f7bdd05add216c58c2b86c0fb3a70abeb7798507a74a64
 b5b0210dfaccfe0b06f0a9090666b1fae2a3faa4140b7930146b29531f0da9beb1f2c1f7e7bc2bd29179f9fe05dc30e246e96220b8ff75a90f75e8350c9058a1  gcc-4.8-musl-fix-iteratephdr.patch
 e6d9b103c128e5d4eca515b1496d78b05708de770597c883daddd95ea41e77b5ef1be613b989357cc870a7efd9e43b011022c2d302e7056cff7b69e764906ff2  gcc-4.8-musl-libssp.patch
 e1d6a450dfb40b134ad7f759c4c10174d2490b0093fe47cb33479245f26a3a8c54ebcf6255943c0ccfcb5095600d1c05e530baeed35609c8ffe75caac8e57c49  boehm-gc-uclibc.patch
-7db904f83546edb4f7e54d3eaa0a8ab3235bca69e03a35000f083d26626bff92713f73150935c89f51e47c952bf29c36ec7d2fc8fedcde38048975e3e590faf9  boehm-gc-musl.patch
+bda845a6aa1854d2c883910b115f79ccfa93dfc2b5eac69a3a236d83eb34cadc140731d616ffc24698c7abc8878dd15f231bcc5119f1860e575a120b311706c7  boehm-gc-musl.patch
 4a5aeff0399782c752e6e3f2f48d984b2056dfb5d229b23a24eee1562d241339989b2203f139821cfc03c9b25c9bd7da6ccbbdc7a09d242e4de7f0d606c6f63c  gcc-pure64.patch
 b01ec5b2718e74048102d4a8e0a851f63524c9b9a70631ec93467b2e6080e8db2c500040572f64dce8161ef2c955bc1a7abd77d0e7970143967f9c8e0e3de948  pr49423.patch
 018a9f2b7b490066a02671be38e1a4f18caeff98210027e68a1d4bd3d78ff810aa45a5cca163f4c46ee0d120715541a95a6e2487e17f4bb923459dec8edf8f8f  pr57748.patch
diff --git a/main/gcc/boehm-gc-musl.patch b/main/gcc/boehm-gc-musl.patch
index 83fcc285c6..2f106cba14 100644
--- a/main/gcc/boehm-gc-musl.patch
+++ b/main/gcc/boehm-gc-musl.patch
@@ -9,3 +9,54 @@
        /* Kernels prior to 2.1.1 defined struct sigcontext_struct instead of */
        /* struct sigcontext.  libc6 (glibc2) uses "struct sigcontext" in     */
        /* prototypes, so we have to include the top-level sigcontext.h to    */
+--- gcc-4.8.2/boehm-gc/dyn_load.c.orig	2014-02-17 14:13:09.519850231 +0200
++++ gcc-4.8.2/boehm-gc/dyn_load.c	2014-02-17 14:14:27.906093514 +0200
+@@ -459,9 +459,7 @@
+ /* For glibc 2.2.4+.  Unfortunately, it doesn't work for older	*/
+ /* versions.  Thanks to Jakub Jelinek for most of the code.	*/
+ 
+-# if (defined(LINUX) || defined (__GLIBC__)) /* Are others OK here, too? */ \
+-     && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \
+-         || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG))) 
++# if (defined(LINUX) || defined (__GLIBC__))
+ 
+ /* We have the header files for a glibc that includes dl_iterate_phdr.	*/
+ /* It may still not be available in the library on the target system.   */
+--- gcc-4.8.2/boehm-gc/include/private/gcconfig.h.orig	2014-02-17 14:14:36.026049422 +0200
++++ gcc-4.8.2/boehm-gc/include/private/gcconfig.h	2014-02-17 14:17:11.345207887 +0200
+@@ -684,7 +684,7 @@
+ #       ifdef __ELF__
+ #            define DYNAMIC_LOADING
+ #	     include <features.h>
+-#	     if defined(__GLIBC__)&& __GLIBC__>=2
++#	     if 1
+ #              define SEARCH_FOR_DATA_START
+ #	     else /* !GLIBC2 */
+                extern char **__environ;
+@@ -1147,7 +1147,7 @@
+ #              define DATASTART ((ptr_t)((((word) (_etext)) + 0xfff) & ~0xfff))
+ #	     endif
+ #	     include <features.h>
+-#	     if defined(__GLIBC__) && __GLIBC__ >= 2
++#	     if 1
+ #		 define SEARCH_FOR_DATA_START
+ #	     else
+      	         extern char **__environ;
+@@ -1367,7 +1367,7 @@
+ #       define HBLKSIZE 4096
+ #     endif
+ #     define USE_GENERIC_PUSH_REGS
+-#     if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 2 || __GLIBC__ > 2
++#     if 1
+ #        define LINUX_STACKBOTTOM
+ #     else
+ #        define STACKBOTTOM 0x80000000
+@@ -1858,7 +1858,7 @@
+ #       ifdef __ELF__
+ #            define DYNAMIC_LOADING
+ #	     include <features.h>
+-#	     if defined(__GLIBC__) && __GLIBC__ >= 2
++#	     if 1
+ #		 define SEARCH_FOR_DATA_START
+ #	     else
+      	         extern char **__environ;
diff --git a/main/java-gcj-compat/APKBUILD b/main/java-gcj-compat/APKBUILD
index 48d663da5f..432a165855 100644
--- a/main/java-gcj-compat/APKBUILD
+++ b/main/java-gcj-compat/APKBUILD
@@ -13,7 +13,7 @@ url="http://git.alpinelinux.org/aports.git"
 arch="all"
 license="GPL"
 depends="fastjar gcc-java=$gccver-r$gccpkgrel java-common"
-makedepends="gcc-java=$gccver-r$gccpkgrel zlib-dev"
+makedepends="gcc-java=$gccver-r$gccpkgrel zlib-dev paxctl"
 install=""
 subpackages=""
 source=""
@@ -26,6 +26,7 @@ build() {
 	gcj -Wl,-Bsymbolic -findirect-dispatch -o ecj \
 		--main=org.eclipse.jdt.internal.compiler.batch.Main \
 		/usr/share/java/ecj.jar -lgcj
+	paxctl -c -msp ecj
 }
 
 package() {