summaryrefslogtreecommitdiff
path: root/user/xorg-server/fix-musl-arm.patch
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2018-07-13 02:25:07 -0500
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2018-07-13 02:25:16 -0500
commitc04a7c0e4812b4d1e815fb11293c7181684c2b35 (patch)
tree34ea7b3c21db879c6585e6e809199900d185acce /user/xorg-server/fix-musl-arm.patch
parent1cde71fe5eba379d2b376936068471710b2eba80 (diff)
downloadpackages-c04a7c0e4812b4d1e815fb11293c7181684c2b35.tar.gz
packages-c04a7c0e4812b4d1e815fb11293c7181684c2b35.tar.bz2
packages-c04a7c0e4812b4d1e815fb11293c7181684c2b35.tar.xz
packages-c04a7c0e4812b4d1e815fb11293c7181684c2b35.zip
user/xorg-server: pull in, bump, take, fix
Diffstat (limited to 'user/xorg-server/fix-musl-arm.patch')
-rw-r--r--user/xorg-server/fix-musl-arm.patch20
1 files changed, 20 insertions, 0 deletions
diff --git a/user/xorg-server/fix-musl-arm.patch b/user/xorg-server/fix-musl-arm.patch
new file mode 100644
index 000000000..e661ae175
--- /dev/null
+++ b/user/xorg-server/fix-musl-arm.patch
@@ -0,0 +1,20 @@
+--- ./hw/xfree86/common/compiler.h.orig
++++ ./hw/xfree86/common/compiler.h
+@@ -721,7 +721,7 @@
+ :"r"(val), "r"(addr), "i"(ASI_PL));
+ }
+
+-#elif defined(__mips__) || (defined(__arm32__) && !defined(__linux__))
++#elif defined(__mips__) || (defined(__arm32__) && !defined(__GLIBC__))
+ #if defined(__arm32__) || defined(__mips64)
+ #define PORT_SIZE long
+ #else
+@@ -996,7 +996,7 @@
+ return xf86ReadMmio32Le((void *) ioBase, port);
+ }
+
+-#elif defined(__arm__) && defined(__linux__)
++#elif defined(__arm__) && defined(__GLIBC__)
+
+ /* for Linux on ARM, we use the LIBC inx/outx routines */
+ /* note that the appropriate setup via "ioperm" needs to be done */