summaryrefslogtreecommitdiff
path: root/system/gcc
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2019-03-05 03:49:21 +0000
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2019-03-05 03:49:21 +0000
commitd9b28767785c07ec37d1f7ad880b5a1df2932042 (patch)
tree8e1a61e6ed68ea07b2135f8162dd3652dd842701 /system/gcc
parentca1238c16d9009387066123f02f8dc0e8b4624d2 (diff)
downloadpackages-d9b28767785c07ec37d1f7ad880b5a1df2932042.tar.gz
packages-d9b28767785c07ec37d1f7ad880b5a1df2932042.tar.bz2
packages-d9b28767785c07ec37d1f7ad880b5a1df2932042.tar.xz
packages-d9b28767785c07ec37d1f7ad880b5a1df2932042.zip
system/gcc: fix 32-bit PowerPC issue
Diffstat (limited to 'system/gcc')
-rw-r--r--system/gcc/APKBUILD2
-rw-r--r--system/gcc/disable-multiarch-ppc32.patch15
2 files changed, 17 insertions, 0 deletions
diff --git a/system/gcc/APKBUILD b/system/gcc/APKBUILD
index fdac8dbf6..a8ac557b5 100644
--- a/system/gcc/APKBUILD
+++ b/system/gcc/APKBUILD
@@ -175,6 +175,7 @@ source="https://ftp.gnu.org/gnu/gcc/gcc-$pkgver/gcc-$pkgver.tar.xz
337-gccgo-signal-sig34.patch
add-classic_table-support.patch
+ disable-multiarch-ppc32.patch
gcc-5.4.0-locale.patch
"
@@ -560,4 +561,5 @@ e755072a3c71ada6cde354dd258fae029919e1116048068368d38411ca28a6ad8856702498d6667b
de0cc0f9356c9ee5ea7b0f954441b59115f4a8f8f63573d0c17b6537e6f37641cf137531b496fc192d38035c2c4ba8175d36cbd7da15cbfcf8dc18c049c0f111 336-gccgo-mmap64.patch
c2916948b028e1e990e1953875b884561c0f8dd105c1ec03073795df9a47ec2c627cbc95ca0ec98ab9177bf2b7c8458bf3fd09f780fa6c301995846f6317e366 337-gccgo-signal-sig34.patch
1860593584f629d24d5b6db14b0a3412e9f93449b663aaa4981301a0923db0159314905e694f27366fbfef72dce06636ab6df86862b7e9e9564847e03bee82c1 add-classic_table-support.patch
+db8c4ab3eae7c01943a61e9e3e20af45d4f6d196184eee5b94068b212900ccdeecaf4fb4145983226954f64e7c989fcd13e0b506176d2b3e781c2e9dc8b5a5a8 disable-multiarch-ppc32.patch
67a75a94fdba69de96b98dbc2978a50cb197857c464b81f7c956176da7066b3be937e40cb15e0870fc1e7382d662c5101bcd18cf457fc4112de41802042b51c4 gcc-5.4.0-locale.patch"
diff --git a/system/gcc/disable-multiarch-ppc32.patch b/system/gcc/disable-multiarch-ppc32.patch
new file mode 100644
index 000000000..5ca9a1d0d
--- /dev/null
+++ b/system/gcc/disable-multiarch-ppc32.patch
@@ -0,0 +1,15 @@
+--- gcc-8.3.0/gcc/config/rs6000/t-linux.old 2019-03-04 07:18:12.770000000 +0000
++++ gcc-8.3.0/gcc/config/rs6000/t-linux 2019-03-05 03:22:15.030000000 +0000
+@@ -5,10 +5,10 @@
+ MULTILIB_OSDIRNAMES := m64=../lib
+ MULTILIB_OSDIRNAMES += m32=../lib32
+ else
+-MULTIARCH_DIRNAME := powerpc-linux-gnu
++MULTIARCH_DIRNAME = $(call if_multiarch,powerpc-linux-gnu)
+ endif
+ ifneq (,$(findstring powerpcle,$(target)))
+-MULTIARCH_DIRNAME := $(subst -linux,le-linux,$(MULTIARCH_DIRNAME))
++MULTIARCH_DIRNAME := $(call if_multiarch,$(subst -linux,le-linux,$(MULTIARCH_DIRNAME)))
+ endif
+ ifneq (,$(findstring powerpc64le,$(target)))
+ MULTILIB_OSDIRNAMES := m64=../lib