Revert "main/opennhrp: update to 0.11.3"

This reverts commit 3e4c7262b32a0723ab9a10842e6f531976b9e286.

2 files changed, 89 insertions, 2 deletions

diff --git a/main/gcc/APKBUILD b/main/gcc/APKBUILD
index 615d6219e..8c432b0ad 100644
--- a/main/gcc/APKBUILD
+++ b/main/gcc/APKBUILD
@@ -3,7 +3,7 @@ pkgname=gcc
 pkgver=4.4.1
 _specsver=0.1.4
 _espfver=0.3.1
-pkgrel=10
+pkgrel=3
 pkgdesc="The GNU Compiler Collection"
 url="http://gcc.gnu.org"
 license="GPL LGPL"
@@ -15,6 +15,7 @@ source="ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-core-$pkgver.tar.bz2
 	http://weaver.gentooenterprise.com/hardened/patches/gcc-$pkgver-espf-$_espfver.tar.bz2
 	http://weaver.gentooenterprise.com/hardened/patches/gcc-$pkgver-specs-$_specsver.tar.bz2
 	gcc-spec-env.patch
+	gcc4-stack-protector-uclibc-no_tls.patch
 	pt_gnu_eh_frame.patch
 	uclibc-getipinfo.patch
 	"
@@ -46,12 +47,13 @@ build ()
 		--build=${CHOST:-i486-alpine-linux-uclibc} \
 		--disable-altivec \
 		--disable-checking \
-		--disable-threads \
 		--disable-fixed-point \
 		--disable-libssp \
 		--disable-libstdcxx-pch \
 		--disable-multilib \
 		--disable-nls \
+		--disable-threads \
+		--disable-tls \
 		--disable-werror \
 		--enable-__cxa_atexit \
 		--enable-cld \
@@ -120,5 +122,6 @@ d449047b5761348ceec23739f5553e0b  gcc-g++-4.4.1.tar.bz2
 43d0bbd676bbb2acd67ddabd0ea1bc2b  gcc-4.4.1-espf-0.3.1.tar.bz2
 da8d9165e828bbb9809ef86f1c72886f  gcc-4.4.1-specs-0.1.4.tar.bz2
 c4045bfa85d8be780affd465be9d8ca8  gcc-spec-env.patch
+15e77082db0e1a131af98debd3016290  gcc4-stack-protector-uclibc-no_tls.patch
 2db1e3482c5dd59dab70f701afa2ca80  pt_gnu_eh_frame.patch
 6cc2385c5bbd6d0da6eaedd53c8bf547  uclibc-getipinfo.patch"
diff --git a/main/gcc/gcc4-stack-protector-uclibc-no_tls.patch b/main/gcc/gcc4-stack-protector-uclibc-no_tls.patch
new file mode 100644
index 000000000..c9b54adbe
--- /dev/null
+++ b/main/gcc/gcc4-stack-protector-uclibc-no_tls.patch
@@ -0,0 +1,84 @@
+diff -u gcc/config/i386/linux.h gcc/config/i386/linux.h
+--- a/gcc/config/i386/linux.h	2 Jul 2005 08:52:20 -0000	1.60
++++ b/gcc/config/i386/linux.h	2 Jul 2005 08:52:20 -0000	1.60
+@@ -186,7 +186,7 @@
+ /* This macro may be overridden in i386/k*bsd-gnu.h.  */
+ #define REG_NAME(reg) reg
+ 
+-#ifdef TARGET_LIBC_PROVIDES_SSP
++#if defined TARGET_LIBC_PROVIDES_SSP && !defined __UCLIBC__
+ /* i386 glibc provides __stack_chk_guard in %gs:0x14.  */
+ #define TARGET_THREAD_SSP_OFFSET	0x14
+ #endif
+diff -u gcc/config/i386/linux64.h gcc/config/i386/linux64.h
+--- a/gcc/config/i386/linux64.h	2 Jul 2005 08:52:20 -0000	1.33
++++ b/gcc/config/i386/linux64.h	2 Jul 2005 08:52:20 -0000	1.33
+@@ -74,7 +74,7 @@
+ /* This macro may be overridden in i386/k*bsd-gnu.h.  */
+ #define REG_NAME(reg) reg
+ 
+-#ifdef TARGET_LIBC_PROVIDES_SSP
++#if defined TARGET_LIBC_PROVIDES_SSP && !defined __UCLIBC__
+ /* i386 glibc provides __stack_chk_guard in %gs:0x14,
+    x86_64 glibc provides it in %fs:0x28.  */
+ #define TARGET_THREAD_SSP_OFFSET	(TARGET_64BIT ? 0x28 : 0x14)
+diff -u gcc/config/rs6000/linux.h gcc/config/rs6000/linux.h
+--- a/gcc/config/rs6000/linux.h	2 Jul 2005 08:52:11 -0000	1.53
++++ b/gcc/config/rs6000/linux.h	2 Jul 2005 08:52:11 -0000	1.53
+@@ -114,7 +114,7 @@
+ 
+ #define MD_UNWIND_SUPPORT "config/rs6000/linux-unwind.h"
+ 
+-#ifdef TARGET_LIBC_PROVIDES_SSP
++#if defined TARGET_LIBC_PROVIDES_SSP && !defined __UCLIBC__
+ /* ppc32 glibc provides __stack_chk_guard in -0x7008(2).  */
+ #define TARGET_THREAD_SSP_OFFSET	-0x7008
+ #endif
+diff -u gcc/config/rs6000/linux64.h gcc/config/rs6000/linux64.h
+--- a/gcc/config/rs6000/linux64.h	2 Jul 2005 08:52:15 -0000	1.81
++++ b/gcc/config/rs6000/linux64.h	2 Jul 2005 08:52:15 -0000	1.81
+@@ -548,7 +548,7 @@
+ 
+ #define MD_UNWIND_SUPPORT "config/rs6000/linux-unwind.h"
+ 
+-#ifdef TARGET_LIBC_PROVIDES_SSP
++#if defined TARGET_LIBC_PROVIDES_SSP && !defined __UCLIBC__
+ /* ppc32 glibc provides __stack_chk_guard in -0x7008(2),
+    ppc64 glibc provides it at -0x7010(13).  */
+ #define TARGET_THREAD_SSP_OFFSET	(TARGET_64BIT ? -0x7010 : -0x7008)
+diff -u gcc/config/s390/linux.h gcc/config/s390/linux.h
+--- a/gcc/config/s390/linux.h	2005-08-22 15:53:01.000000000 +0200	1.40
++++ b/gcc/config/s390/linux.h	2005-08-22 15:53:01.000000000 +0200	1.40
+@@ -94,7 +94,7 @@
+ 
+ #define MD_UNWIND_SUPPORT "config/s390/linux-unwind.h"
+ 
+-#ifdef TARGET_LIBC_PROVIDES_SSP
++#if defined TARGET_LIBC_PROVIDES_SSP && !defined __UCLIBC__
+ /* s390 glibc provides __stack_chk_guard in 0x14(tp),
+    s390x glibc provides it at 0x28(tp).  */
+ #define TARGET_THREAD_SSP_OFFSET        (TARGET_64BIT ? 0x28 : 0x14)
+diff -u gcc/config/sparc/linux.h gcc/config/sparc/linux.h
+--- a/gcc/config/sparc/linux.h	6 Jul 2005 07:48:57 -0000	1.72
++++ b/gcc/config/sparc/linux.h	6 Jul 2005 07:48:57 -0000	1.72
+@@ -230,7 +230,7 @@
+ #undef NEED_INDICATE_EXEC_STACK
+ #define NEED_INDICATE_EXEC_STACK 1
+ 
+-#ifdef TARGET_LIBC_PROVIDES_SSP
++#if defined TARGET_LIBC_PROVIDES_SSP && !defined __UCLIBC__
+ /* sparc glibc provides __stack_chk_guard in [%g7 + 0x14].  */
+ #define TARGET_THREAD_SSP_OFFSET	0x14
+ #endif
+diff -u gcc/config/sparc/linux64.h gcc/config/sparc/linux64.h
+--- a/gcc/config/sparc/linux64.h	6 Jul 2005 07:48:57 -0000	1.95
++++ b/gcc/config/sparc/linux64.h	6 Jul 2005 07:48:57 -0000	1.95
+@@ -364,7 +364,7 @@
+ #undef NEED_INDICATE_EXEC_STACK
+ #define NEED_INDICATE_EXEC_STACK 1
+ 
+-#ifdef TARGET_LIBC_PROVIDES_SSP
++#if defined TARGET_LIBC_PROVIDES_SSP && !defined __UCLIBC__
+ /* sparc glibc provides __stack_chk_guard in [%g7 + 0x14],
+    sparc64 glibc provides it at [%g7 + 0x28].  */
+ #define TARGET_THREAD_SSP_OFFSET	(TARGET_ARCH64 ? 0x28 : 0x14)