aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDrew DeVault <sir@cmpwn.com>2020-12-03 12:01:35 +0000
committerAriadne Conill <ariadne@dereferenced.org>2021-03-02 14:22:33 +0000
commit90677266a5823cf6935fd8e4fbd75cb4f05a4e2b (patch)
treeebaab6aeb6ab8173cc6e9e3b4c0dd381492c479c
parent662ccc1ac8d16e4e4066eec0118d0660d7843340 (diff)
downloadaports-90677266a5823cf6935fd8e4fbd75cb4f05a4e2b.tar.gz
aports-90677266a5823cf6935fd8e4fbd75cb4f05a4e2b.tar.bz2
aports-90677266a5823cf6935fd8e4fbd75cb4f05a4e2b.tar.xz
main/musl: add riscv64 support
-rw-r--r--main/musl/0001-riscv64-define-ELF_NFPREG.patch24
-rw-r--r--main/musl/APKBUILD5
2 files changed, 28 insertions, 1 deletions
diff --git a/main/musl/0001-riscv64-define-ELF_NFPREG.patch b/main/musl/0001-riscv64-define-ELF_NFPREG.patch
new file mode 100644
index 0000000000..b2f0a0f338
--- /dev/null
+++ b/main/musl/0001-riscv64-define-ELF_NFPREG.patch
@@ -0,0 +1,24 @@
+From e5d2823631bbfebacf48e1a34ed28f28d7cb2570 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 11 Jan 2021 09:40:33 -0800
+Subject: [PATCH] riscv64: define ELF_NFPREG
+
+ELF_NFPREG is used by some userspace applications like gdb
+---
+ arch/riscv64/bits/user.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/arch/riscv64/bits/user.h b/arch/riscv64/bits/user.h
+index 2da743ea..0d37de0b 100644
+--- a/arch/riscv64/bits/user.h
++++ b/arch/riscv64/bits/user.h
+@@ -1,5 +1,6 @@
+ #include <signal.h>
+
+ #define ELF_NGREG 32
++#define ELF_NFPREG 33
+ typedef unsigned long elf_greg_t, elf_gregset_t[ELF_NGREG];
+ typedef union __riscv_mc_fp_state elf_fpregset_t;
+--
+2.30.1
+
diff --git a/main/musl/APKBUILD b/main/musl/APKBUILD
index 0ed00bc24e..a3dc9a7dc2 100644
--- a/main/musl/APKBUILD
+++ b/main/musl/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Timo Teräs <timo.teras@iki.fi>
pkgname=musl
pkgver=1.2.2
-pkgrel=1
+pkgrel=2
pkgdesc="the musl c library (libc) implementation"
url="https://musl.libc.org/"
arch="all"
@@ -20,6 +20,7 @@ nolibc) ;;
esac
commit="v1.2.2"
source="musl-$commit.tar.gz::https://git.musl-libc.org/cgit/musl/snapshot/$commit.tar.gz
+ 0001-riscv64-define-ELF_NFPREG.patch
handle-aux-at_base.patch
ldconfig
@@ -83,6 +84,7 @@ package() {
s390*) ARCH="s390x" ;;
mips64*) ARCH="mips64" ;;
mips*) ARCH="mips" ;;
+ riscv64) ARCH="riscv64" ;;
esac
if [ "$BOOTSTRAP" = "nocc" ]; then
@@ -165,6 +167,7 @@ compat() {
}
sha512sums="7240550ab45cb6b410d65013c92f1f1de0f274322e7ba10e3cf9ce0464a1a833337c2fde39d2fc8c25af1d60599a5bb0ec0d9fb3723c098df3a72e82251bb3eb musl-v1.2.2.tar.gz
+f036317426d54efb4df41c08664c8513d3991408b20f4c74220c8b0324d2e96a97094851ea225e363dd593828c2280e77422b0f4b924dbd106df45504723a00e 0001-riscv64-define-ELF_NFPREG.patch
a76f79b801497ad994746cf82bb6eaf86f9e1ae646e6819fbae8532a7f4eee53a96ac1d4e789ec8f66aea2a68027b0597f7a579b3369e01258da8accfce41370 handle-aux-at_base.patch
8d3a2d5315fc56fee7da9abb8b89bb38c6046c33d154c10d168fb35bfde6b0cf9f13042a3bceee34daf091bc409d699223735dcf19f382eeee1f6be34154f26f ldconfig
062bb49fa54839010acd4af113e20f7263dde1c8a2ca359b5fb2661ef9ed9d84a0f7c3bc10c25dcfa10bb3c5a4874588dff636ac43d5dbb3d748d75400756d0b __stack_chk_fail_local.c