diff options
author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2019-12-28 07:45:17 -0600 |
---|---|---|
committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2019-12-28 07:45:17 -0600 |
commit | c84d539dee8793217e08047149e040dba3e5d4a5 (patch) | |
tree | 4143c298484c2b72b2c5324410c1f2569901694f /user/xorg-server/fix-musl-arm.patch | |
parent | 3cf9c734f8e86066a1118e71090b156309fe6701 (diff) | |
download | packages-c84d539dee8793217e08047149e040dba3e5d4a5.tar.gz packages-c84d539dee8793217e08047149e040dba3e5d4a5.tar.bz2 packages-c84d539dee8793217e08047149e040dba3e5d4a5.tar.xz packages-c84d539dee8793217e08047149e040dba3e5d4a5.zip |
user/xorg-server: Bump to 1.20.6
Diffstat (limited to 'user/xorg-server/fix-musl-arm.patch')
-rw-r--r-- | user/xorg-server/fix-musl-arm.patch | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/user/xorg-server/fix-musl-arm.patch b/user/xorg-server/fix-musl-arm.patch index e661ae175..b5a64a4e7 100644 --- a/user/xorg-server/fix-musl-arm.patch +++ b/user/xorg-server/fix-musl-arm.patch @@ -1,7 +1,7 @@ --- ./hw/xfree86/common/compiler.h.orig +++ ./hw/xfree86/common/compiler.h -@@ -721,7 +721,7 @@ - :"r"(val), "r"(addr), "i"(ASI_PL)); +@@ -518,7 +518,7 @@ + barrier(); } -#elif defined(__mips__) || (defined(__arm32__) && !defined(__linux__)) @@ -9,12 +9,3 @@ #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 */ |