diff options
| author | CyberLeo <cyberleo@cyberleo.net> | 2020-03-28 05:45:52 -0500 |
|---|---|---|
| committer | CyberLeo <cyberleo@cyberleo.net> | 2020-03-28 05:45:52 -0500 |
| commit | 9297468fa579836e3a6a381b798feb6b78217c2d (patch) | |
| tree | 53168212f427afbcf0693b534530a4af803152e9 /user/xorg-server/fix-musl-arm.patch | |
| parent | a63cc05c53a6f4c22422dc8c69808b14d87a6f6e (diff) | |
| parent | da5a69b65a8791fffa6e93366ee585f87eff136d (diff) | |
| download | packages-9297468fa579836e3a6a381b798feb6b78217c2d.tar.gz packages-9297468fa579836e3a6a381b798feb6b78217c2d.tar.bz2 packages-9297468fa579836e3a6a381b798feb6b78217c2d.tar.xz packages-9297468fa579836e3a6a381b798feb6b78217c2d.zip | |
Merge branch 'master' into zfs
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 */ |