aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2021-05-07 10:06:24 +0200
committerNatanael Copa <ncopa@alpinelinux.org>2021-05-07 10:07:14 +0200
commit7e9832f91b8f2ad36afc5f7d44700fd8e066960c (patch)
treec5fc64fd0908f5f8c9858f96527beed0c42ccf3d
parent2a3333e8fe352fa40f51e28a7b903722904e1b74 (diff)
downloadaports-7e9832f91b8f2ad36afc5f7d44700fd8e066960c.tar.gz
aports-7e9832f91b8f2ad36afc5f7d44700fd8e066960c.tar.bz2
aports-7e9832f91b8f2ad36afc5f7d44700fd8e066960c.tar.xz
community/qemu: re-add build fix for mips64
the patch was removed in commit 0ed4cab8ff25 (community/qemu: upgrade to 6.0.0) but is needed for mips64
-rw-r--r--community/qemu/APKBUILD2
-rw-r--r--community/qemu/mips-softfloat.patch35
2 files changed, 37 insertions, 0 deletions
diff --git a/community/qemu/APKBUILD b/community/qemu/APKBUILD
index a2c202fee6..758d294745 100644
--- a/community/qemu/APKBUILD
+++ b/community/qemu/APKBUILD
@@ -173,6 +173,7 @@ source="https://wiki.qemu-project.org/download/qemu-$pkgver.tar.xz
MAP_SYNC-fix.patch
fix-sockios-header.patch
guest-agent-shutdown.patch
+ mips-softfloat.patch
0001-virtio-host-input-use-safe-64-bit-time-accessors-for.patch
0002-virtio-user-input-use-safe-64-bit-time-accessors-for.patch
@@ -413,6 +414,7 @@ d8933df9484158c2b4888254e62117d78f8ed7c18527b249419f39c2b2ab1afa148010884b40661f
d7de79ea74e36702cac4a59e472564a55f0a663be7e63c3755e32b4b5dfbc04b390ee79f09f43f6ae706ee2aec9e005eade3c0fd4a202db60d11f436874a17d7 MAP_SYNC-fix.patch
39590476a4ebd7c1e79a4f0451b24c75b1817a2a83abaa1f71bb60b225d772152f0af8f3e51ff65645e378c536ffa6ff551dade52884d03a14b7c6a19c5c97d4 fix-sockios-header.patch
d6b81846cefd46b8fd1fb04450d4898f97dc77d11e049fb1bc8e2553bbb88c8325151d0e4bec70cc6820a5863c1d1749b99100b4747d91182856c3ca1946cb28 guest-agent-shutdown.patch
+e3acdab38c17eccb87bce1dfec22ce9474dae281474b886860848ae206006b071378882b855023916bb00a86cfbe55216c3fa4336b4e402399df2a9937b8c21c mips-softfloat.patch
9541a94685cfe411120c4073e6714fd3e307d8a4954e7a760532224b3b018fc8948ee03f2338edbb6626b20b751263249c731ac1de83333048d80982371e1874 0001-virtio-host-input-use-safe-64-bit-time-accessors-for.patch
be84d316ebe4ec883e4d02a05721be5b5d478aaa5897bb8cf25431a893397b6834e46253f139b7b94d0f4186c0c90bba78968deb47a82fc06865097f8f4d7a1a 0002-virtio-user-input-use-safe-64-bit-time-accessors-for.patch
e9389a6e3b2c3b59f66ea13eb7a3515e87341a68ca14afeb1ddd0084717bf4a13f5f58dc41dadbf0f2faf8fe1ae94ba7d1469c41539c79e45fa1624c6081e904 CVE-2021-20255.patch
diff --git a/community/qemu/mips-softfloat.patch b/community/qemu/mips-softfloat.patch
new file mode 100644
index 0000000000..28c264a5d9
--- /dev/null
+++ b/community/qemu/mips-softfloat.patch
@@ -0,0 +1,35 @@
+This patch is needed due to our mips64 build uses softfloat. Qemu will not
+build without this patch.
+
+diff --git a/tests/fp/fp-bench.c b/tests/fp/fp-bench.c
+index 4ba5e1d..313256c 100644
+--- a/tests/fp/fp-bench.c
++++ b/tests/fp/fp-bench.c
+@@ -479,6 +479,7 @@ static void QEMU_NORETURN die_host_rounding(enum rounding rounding)
+ exit(EXIT_FAILURE);
+ }
+
++#ifndef __mips_soft_float
+ static void set_host_precision(enum rounding rounding)
+ {
+ int rhost;
+@@ -507,6 +508,7 @@ static void set_host_precision(enum rounding rounding)
+ die_host_rounding(rounding);
+ }
+ }
++#endif
+
+ static void set_soft_precision(enum rounding rounding)
+ {
+@@ -596,9 +598,11 @@ static void parse_args(int argc, char *argv[])
+
+ /* set precision and rounding mode based on the tester */
+ switch (tester) {
++#ifndef __mips_soft_float
+ case TESTER_HOST:
+ set_host_precision(rounding);
+ break;
++#endif
+ case TESTER_SOFT:
+ set_soft_precision(rounding);
+ switch (precision) {