main/musl: add s390x support

2 files changed, 30 insertions, 25 deletions

diff --git a/main/musl/0007-add-s390x-dlsym.patch b/main/musl/0007-add-s390x-dlsym.patch
new file mode 100644
index 0000000000..ed88df7fd0
--- /dev/null
+++ b/main/musl/0007-add-s390x-dlsym.patch
@@ -0,0 +1,26 @@
+From 9201c3afce0ff53a9b1c5da5285ff84c11dee9d4 Mon Sep 17 00:00:00 2001
+From: Bobby Bingham <koorogi@koorogi.info>
+Date: Sun, 5 Feb 2017 21:29:52 -0600
+Subject: s390x: implement dlsym
+
+This was missed when writing the port initially.
+---
+ src/ldso/s390x/dlsym.s | 6 ++++++
+ 1 file changed, 6 insertions(+)
+ create mode 100644 src/ldso/s390x/dlsym.s
+
+diff --git a/src/ldso/s390x/dlsym.s b/src/ldso/s390x/dlsym.s
+new file mode 100644
+index 0000000..2e9fa8f
+--- /dev/null
++++ b/src/ldso/s390x/dlsym.s
+@@ -0,0 +1,6 @@
++	.global dlsym
++	.hidden __dlsym
++	.type   dlsym,@function
++dlsym:
++	lgr %r4, %r14
++	jg __dlsym
+-- 
+cgit v0.11.2
+
diff --git a/main/musl/APKBUILD b/main/musl/APKBUILD
index 81d951ba12..255c4fb75c 100644
--- a/main/musl/APKBUILD
+++ b/main/musl/APKBUILD
@@ -24,6 +24,7 @@ source="http://www.musl-libc.org/releases/musl-$pkgver.tar.gz
 	0004-fix-getopt-_long-clobbering-of-optopt-on-success.patch
 	0005-treat-base-1-as-an-error-in-strtol-family-functions.patch
 	0006-fix-crash-from-corrupted-tls-module-list-after-faile.patch
+	0007-add-s390x-dlsym.patch
 
 	ldconfig
 	__stack_chk_fail_local.c
@@ -80,6 +81,7 @@ package() {
 		x86_64)		ARCH="x86_64" ;;
 		ppc)		ARCH="powerpc" ;;
 		ppc64*)		ARCH="powerpc64" ;;
+		s390*)		ARCH="s390x" ;;
 		mips*)		ARCH="mips" ;;
 		esac
 
@@ -133,7 +135,7 @@ compat() {
 		# so we add a symlink
 		ln -s lib "$subpkgdir"/lib64
 		;;
-	mips*) _ld="ld.so.1" ;;
+	mips* | s390*) _ld="ld.so.1" ;;
 	esac
 	ln -sf "/lib/libc.musl-${CARCH}.so.1" "$subpkgdir/lib/$_ld"
 
@@ -142,30 +144,6 @@ compat() {
 	done
 }
 
-md5sums="ac52ccaec6b06ab0f289d37e8436859b  musl-1.1.16.tar.gz
-d9da36992a9ccd200242b38b67823b95  0001-fix-strftime-y-for-negative-years.patch
-93a7dfa98dff324f2242d10f7c2d68f8  0002-make-globfree-safe-after-failed-glob-from-over-lengt.patch
-3002db70e8282b7fb7c53052c5661275  0003-reduce-impact-of-REG_-namespace-pollution-in-x86-_64.patch
-d83f0cf762aa4cb276138ee8a1a1f2f4  0004-fix-getopt-_long-clobbering-of-optopt-on-success.patch
-1f525f2c2cf7da24c5c5ca327f791d3b  0005-treat-base-1-as-an-error-in-strtol-family-functions.patch
-83f8f9baf934c4cb7d69c3799b0ca1dd  0006-fix-crash-from-corrupted-tls-module-list-after-faile.patch
-830d01f7821b978df770b06db3790921  ldconfig
-0df687757221bbb0fc1aa67f1bd646f9  __stack_chk_fail_local.c
-57ef2c63b9ec6a2041694ace97d4ffa2  getconf.c
-eadc8794eadb79dbc383b2b91a32084d  getent.c
-45f92f8d59cf84d765de698a9578dbf4  iconv.c"
-sha256sums="937185a5e5d721050306cf106507a006c3f1f86d86cd550024ea7be909071011  musl-1.1.16.tar.gz
-ec5209fe48aa54a859cc034557b7cca8307adaf345b3f7c061e0b284eee00ccc  0001-fix-strftime-y-for-negative-years.patch
-b8c92e4c6c60b67fde4eab3465041c12a942a319501710babaf3b6ead381bd95  0002-make-globfree-safe-after-failed-glob-from-over-lengt.patch
-521f02391536e2879359469a78afe10165b2ebd2467d841c65222d53f7e2a8e0  0003-reduce-impact-of-REG_-namespace-pollution-in-x86-_64.patch
-2594a34dd18eab6130b8486e58bf3a5fd16e67692134edde3690ba35f2801db3  0004-fix-getopt-_long-clobbering-of-optopt-on-success.patch
-0b9b5a37902dee6d53110e61f8fbada8673094dbcc5c43b5dc050652f10e558a  0005-treat-base-1-as-an-error-in-strtol-family-functions.patch
-93b3a03017cf01439b88c7555d468898e2ea372bd2a9e1e3fd91f8f7f061f3d2  0006-fix-crash-from-corrupted-tls-module-list-after-faile.patch
-b4a2c06db38742e8c42c3c9838b285a7d8cdac6c091ff3df5ff9a15f1e41b9c7  ldconfig
-299a7d75a09de3e2e11e7fb4acc3182e4a14e868093d2f30938fce9bfcff13da  __stack_chk_fail_local.c
-d87d0cbb3690ae2c5d8cc218349fd8278b93855dd625deaf7ae50e320aad247c  getconf.c
-b323f20c9bf560a13c877eb05428bc4a203383697bac763e7b12865db5c5922c  getent.c
-f79a2930a2e5bb0624321589edf8b889d1e9b603e01e6b7ae214616605b3fdd7  iconv.c"
 sha512sums="47c00e50b7605102fb4aebe1f9ba9db94d26fac64805f6d744c9c557a05b8a58dff7f9558ff7c8d66b5d7c43740cdc2dd79448bacac47f1414e6ada99c210140  musl-1.1.16.tar.gz
 74e95ab3a74513e7a0513e004c376d4055eca0e21162e717dfcab249302a9060d3ac3eb88b562dea14b71b475b4dd2f703e355e2f5050b58891a848c5093c5f6  0001-fix-strftime-y-for-negative-years.patch
 04805970e7dc11f84a86df49688f3b7670933860192e99637e189494c261e49b3cce1d80019d69341452062df03d5a349450015076c947296ac4a0d40e5789f4  0002-make-globfree-safe-after-failed-glob-from-over-lengt.patch
@@ -173,6 +151,7 @@ sha512sums="47c00e50b7605102fb4aebe1f9ba9db94d26fac64805f6d744c9c557a05b8a58dff7
 ea103de2721926111510116dedb10e2320715fd20563a342c1dd30f3d1e68049990924b2cf4d03fd9d481ae9488f0e49da5373a79bcec4a8d8c357c64a24751b  0004-fix-getopt-_long-clobbering-of-optopt-on-success.patch
 df96c4bd5ff9c197c8aa599948b69716587837de0f298d3adec56077b073e71a49a3c3345e0508cf8a4ed636e3171495bbbdc35435bd8e343c546436f6348359  0005-treat-base-1-as-an-error-in-strtol-family-functions.patch
 4dc5cdcab11dee6b62fcb81401a816341e1d802a99e46b072c51575a2c25933354540fe22ae06dcdc85eb9a3cbf7256e7c43aab0e75843846551f9e18bfc39c2  0006-fix-crash-from-corrupted-tls-module-list-after-faile.patch
+39eaf56fe30c7098c75c09567a0d990b90c1017c1c2c160017b2d5f41e6503a23d21c7b20bad0186cf3e6fec9fa28ab4f7d655a8382140186c96302f262379fe  0007-add-s390x-dlsym.patch
 8d3a2d5315fc56fee7da9abb8b89bb38c6046c33d154c10d168fb35bfde6b0cf9f13042a3bceee34daf091bc409d699223735dcf19f382eeee1f6be34154f26f  ldconfig
 062bb49fa54839010acd4af113e20f7263dde1c8a2ca359b5fb2661ef9ed9d84a0f7c3bc10c25dcfa10bb3c5a4874588dff636ac43d5dbb3d748d75400756d0b  __stack_chk_fail_local.c
 0d80f37b34a35e3d14b012257c50862dfeb9d2c81139ea2dfa101d981d093b009b9fa450ba27a708ac59377a48626971dfc58e20a3799084a65777a0c32cbc7d  getconf.c