diff options
| author | Yu Ke <ke.yu@intel.com> | 2011-05-09 16:12:51 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-05-11 16:43:22 +0100 |
| commit | 57d50baa7dc318471d5915c405ccba8032a02249 (patch) | |
| tree | 1b3ab1da8f286de410e51df8443537aee66e30c8 /meta/recipes-graphics | |
| parent | 495c109534b32be107c55864c0818df9387284cf (diff) | |
| download | poky-57d50baa7dc318471d5915c405ccba8032a02249.tar.gz | |
xserver-xf86-lite: upgrade to from 1.7 RC2 to 1.10.1
- remove the following patches, since they are already in upstream
xserver-xf86-lite/libdri-xinerama-symbol.patch,
xserver-xf86-lite/drmfix.patch
xserver-xf86-lite/nodolt.patch
xserver-xf86-lite/revert_make_sys_c_use_unaligned_access_functions.patch
- rebase the patch for 1.10.1
xserver-xf86-lite/crosscompile.patch
(From OE-Core rev: 057613870f54d1f9a25317e350219d967fcd25ef)
Signed-off-by: Yu Ke <ke.yu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
8 files changed, 61 insertions, 359 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/crosscompile.patch b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/crosscompile.patch index 2341e40bca..2f98bb8c89 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/crosscompile.patch +++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/crosscompile.patch | |||
| @@ -1,19 +1,22 @@ | |||
| 1 | Index: xorg-server-1.7.99.2/configure.ac | 1 | Upstream-Status: Inappropriate [configuration] |
| 2 | =================================================================== | 2 | |
| 3 | --- xorg-server-1.7.99.2.orig/configure.ac 2010-01-29 16:38:49.000000000 +0000 | 3 | diff --git a/configure.ac b/configure.ac |
| 4 | +++ xorg-server-1.7.99.2/configure.ac 2010-01-29 16:42:39.000000000 +0000 | 4 | index b3b752c..600500b 100644 |
| 5 | @@ -503,14 +503,10 @@ | 5 | --- a/configure.ac |
| 6 | 6 | +++ b/configure.ac | |
| 7 | dnl Uses --default-font-path if set, otherwise checks for /etc/X11/fontpath.d, | 7 | @@ -523,13 +523,9 @@ dnl Uses --default-font-path if set, otherwise checks for /etc/X11/fontpath.d, |
| 8 | dnl otherwise uses standard subdirectories of FONTROOTDIR | 8 | dnl otherwise uses standard subdirectories of FONTROOTDIR. When cross |
| 9 | -AC_CHECK_FILE([${sysconfdir}/X11/fontpath.d], | 9 | dnl compiling, assume default font path uses standard FONTROOTDIR directories. |
| 10 | - [DEFAULT_FONT_PATH='catalogue:${sysconfdir}/X11/fontpath.d'], | 10 | DEFAULT_FONT_PATH="${FONTMISCDIR}/,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/" |
| 11 | - [ | 11 | -if test "$cross_compiling" != yes; then |
| 12 | DEFAULT_FONT_PATH="${FONTMISCDIR}/,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/" | 12 | - AC_CHECK_FILE([${sysconfdir}/X11/fontpath.d], |
| 13 | case $host_os in | 13 | - [DEFAULT_FONT_PATH='catalogue:${sysconfdir}/X11/fontpath.d'], |
| 14 | darwin*) DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;; | 14 | - [case $host_os in |
| 15 | esac | 15 | + case $host_os in |
| 16 | - ]) | 16 | darwin*) DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;; |
| 17 | - esac]) | ||
| 18 | -fi | ||
| 19 | + esac | ||
| 17 | AC_ARG_WITH(default-font-path, AS_HELP_STRING([--with-default-font-path=PATH], [Comma separated list of font dirs]), | 20 | AC_ARG_WITH(default-font-path, AS_HELP_STRING([--with-default-font-path=PATH], [Comma separated list of font dirs]), |
| 18 | [ FONTPATH="$withval" ], | 21 | [ FONTPATH="$withval" ], |
| 19 | [ FONTPATH="${DEFAULT_FONT_PATH}" ]) | 22 | [ FONTPATH="${DEFAULT_FONT_PATH}" ]) |
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/drmfix.patch b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/drmfix.patch deleted file mode 100644 index a62a767f23..0000000000 --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/drmfix.patch +++ /dev/null | |||
| @@ -1,13 +0,0 @@ | |||
| 1 | Index: xorg-server-1.4/hw/xfree86/os-support/linux/Makefile.am | ||
| 2 | =================================================================== | ||
| 3 | --- xorg-server-1.4.orig/hw/xfree86/os-support/linux/Makefile.am 2007-08-23 21:04:53.000000000 +0200 | ||
| 4 | +++ xorg-server-1.4/hw/xfree86/os-support/linux/Makefile.am 2008-03-13 18:27:23.000000000 +0100 | ||
| 5 | @@ -41,7 +41,7 @@ | ||
| 6 | |||
| 7 | AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(DIX_CFLAGS) $(XORG_CFLAGS) $(PLATFORM_DEFINES) | ||
| 8 | |||
| 9 | -INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) -I/usr/include/drm # FIXME this last part is crack | ||
| 10 | +INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) $(LIBDRM_CFLAGS) | ||
| 11 | |||
| 12 | # FIXME: These need to be added to the build | ||
| 13 | LNX_EXTRA_SRCS = \ | ||
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/libdri-xinerama-symbol.patch b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/libdri-xinerama-symbol.patch deleted file mode 100644 index db29da93ca..0000000000 --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/libdri-xinerama-symbol.patch +++ /dev/null | |||
| @@ -1,50 +0,0 @@ | |||
| 1 | Index: xorg-server-1.5.0/hw/xfree86/dri/dri.c | ||
| 2 | =================================================================== | ||
| 3 | --- xorg-server-1.5.0.orig/hw/xfree86/dri/dri.c 2008-09-24 17:43:04.000000000 +0100 | ||
| 4 | +++ xorg-server-1.5.0/hw/xfree86/dri/dri.c 2008-09-24 17:46:38.000000000 +0100 | ||
| 5 | @@ -73,10 +73,6 @@ | ||
| 6 | |||
| 7 | #define PCI_BUS_NO_DOMAIN(bus) ((bus) & 0xffu) | ||
| 8 | |||
| 9 | -#if !defined(PANORAMIX) | ||
| 10 | -extern Bool noPanoramiXExtension; | ||
| 11 | -#endif | ||
| 12 | - | ||
| 13 | static int DRIEntPrivIndex = -1; | ||
| 14 | static DevPrivateKey DRIScreenPrivKey = &DRIScreenPrivKey; | ||
| 15 | static DevPrivateKey DRIWindowPrivKey = &DRIWindowPrivKey; | ||
| 16 | @@ -307,7 +303,6 @@ | ||
| 17 | drm_context_t * reserved; | ||
| 18 | int reserved_count; | ||
| 19 | int i; | ||
| 20 | - Bool xineramaInCore = FALSE; | ||
| 21 | DRIEntPrivPtr pDRIEntPriv; | ||
| 22 | ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; | ||
| 23 | DRIContextFlags flags = 0; | ||
| 24 | @@ -320,20 +315,13 @@ | ||
| 25 | return FALSE; | ||
| 26 | } | ||
| 27 | |||
| 28 | - /* | ||
| 29 | - * If Xinerama is on, don't allow DRI to initialise. It won't be usable | ||
| 30 | - * anyway. | ||
| 31 | - */ | ||
| 32 | - if (xf86LoaderCheckSymbol("noPanoramiXExtension")) | ||
| 33 | - xineramaInCore = TRUE; | ||
| 34 | - | ||
| 35 | - if (xineramaInCore) { | ||
| 36 | - if (!noPanoramiXExtension) { | ||
| 37 | - DRIDrvMsg(pScreen->myNum, X_WARNING, | ||
| 38 | - "Direct rendering is not supported when Xinerama is enabled\n"); | ||
| 39 | - return FALSE; | ||
| 40 | - } | ||
| 41 | +#if defined(PANORAMIX) | ||
| 42 | + if (!noPanoramiXExtension) { | ||
| 43 | + DRIDrvMsg(pScreen->myNum, X_WARNING, | ||
| 44 | + "Direct rendering is not supported when Xinerama is enabled\n"); | ||
| 45 | + return FALSE; | ||
| 46 | } | ||
| 47 | +#endif | ||
| 48 | |||
| 49 | if (!DRIOpenDRMMaster(pScrn, pDRIInfo->SAREASize, | ||
| 50 | pDRIInfo->busIdString, | ||
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/macro_tweak.patch b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/macro_tweak.patch new file mode 100644 index 0000000000..2b75427129 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/macro_tweak.patch | |||
| @@ -0,0 +1,30 @@ | |||
| 1 | This is the revised version of files/macro_tweak.patch for | ||
| 2 | xorg-server 1.8.99.904. | ||
| 3 | |||
| 4 | the files/macro_tweak.patch can not removed now since it is used by | ||
| 5 | xserver-kdrive-1.7.99.2 and xserver-xf86-lite_1.7.99.2. Once they | ||
| 6 | are all upgraded to 1.8.99.904, the the files/macro_tweak.patch | ||
| 7 | can be safely replace by this patch. | ||
| 8 | |||
| 9 | Upstream-Status: Pending | ||
| 10 | |||
| 11 | Signed-off-by: Yu Ke <ke.yu@intel.com> | ||
| 12 | |||
| 13 | diff --git a/xorg-server.m4 b/xorg-server.m4 | ||
| 14 | index bdecf62..040fdb8 100644 | ||
| 15 | --- a/xorg-server.m4 | ||
| 16 | +++ b/xorg-server.m4 | ||
| 17 | @@ -28,10 +28,12 @@ dnl | ||
| 18 | # Checks for the $1 define in xorg-server.h (from the sdk). If it | ||
| 19 | # is defined, then add $1 to $REQUIRED_MODULES. | ||
| 20 | |||
| 21 | +m4_pattern_allow(PKG_CONFIG_SYSROOT_DIR) | ||
| 22 | + | ||
| 23 | AC_DEFUN([XORG_DRIVER_CHECK_EXT],[ | ||
| 24 | AC_REQUIRE([PKG_PROG_PKG_CONFIG]) | ||
| 25 | SAVE_CFLAGS="$CFLAGS" | ||
| 26 | - CFLAGS="$CFLAGS -I`$PKG_CONFIG --variable=sdkdir xorg-server`" | ||
| 27 | + CFLAGS="$CFLAGS -I$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=sdkdir xorg-server`" | ||
| 28 | AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ | ||
| 29 | #include "xorg-server.h" | ||
| 30 | #if !defined $1 | ||
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/nodolt.patch b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/nodolt.patch deleted file mode 100644 index 6b34032a39..0000000000 --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/nodolt.patch +++ /dev/null | |||
| @@ -1,12 +0,0 @@ | |||
| 1 | Index: git/configure.ac | ||
| 2 | =================================================================== | ||
| 3 | --- git.orig/configure.ac 2009-01-15 20:35:31.000000000 +0000 | ||
| 4 | +++ git/configure.ac 2009-01-15 20:35:38.000000000 +0000 | ||
| 5 | @@ -62,7 +62,6 @@ | ||
| 6 | AC_LIBTOOL_WIN32_DLL | ||
| 7 | AC_DISABLE_STATIC | ||
| 8 | AC_PROG_LIBTOOL | ||
| 9 | -DOLT | ||
| 10 | AC_PROG_MAKE_SET | ||
| 11 | PKG_PROG_PKG_CONFIG | ||
| 12 | AC_PROG_LEX | ||
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/revert_make_sys_c_use_unaligned_access_functions.patch b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/revert_make_sys_c_use_unaligned_access_functions.patch deleted file mode 100644 index 235b55153a..0000000000 --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/revert_make_sys_c_use_unaligned_access_functions.patch +++ /dev/null | |||
| @@ -1,256 +0,0 @@ | |||
| 1 | From 74ab27f64a747ee45810f99cdc6e29b82cf8035e Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Tiago Vignatti <tiago.vignatti@nokia.com> | ||
| 3 | Date: Mon, 28 Dec 2009 16:00:28 +0000 | ||
| 4 | Subject: Revert "Make sys.c use unaligned access functions provided in compiler." | ||
| 5 | |||
| 6 | This reverts commit da923d0bc15e99a8ed1986bd6f5df37f7af7284b. | ||
| 7 | |||
| 8 | Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com> | ||
| 9 | Signed-off-by: Keith Packard <keithp@keithp.com> | ||
| 10 | --- | ||
| 11 | diff --git a/hw/xfree86/x86emu/Makefile.am b/hw/xfree86/x86emu/Makefile.am | ||
| 12 | index e7368f5..df96977 100644 | ||
| 13 | --- a/hw/xfree86/x86emu/Makefile.am | ||
| 14 | +++ b/hw/xfree86/x86emu/Makefile.am | ||
| 15 | @@ -11,7 +11,7 @@ libx86emu_la_SOURCES = debug.c \ | ||
| 16 | sys.c \ | ||
| 17 | x86emu.h | ||
| 18 | |||
| 19 | -INCLUDES = $(XORG_INCS) | ||
| 20 | +INCLUDES = | ||
| 21 | |||
| 22 | AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) | ||
| 23 | |||
| 24 | diff --git a/hw/xfree86/x86emu/sys.c b/hw/xfree86/x86emu/sys.c | ||
| 25 | index 2ebf6f1..e15fb09 100644 | ||
| 26 | --- a/hw/xfree86/x86emu/sys.c | ||
| 27 | +++ b/hw/xfree86/x86emu/sys.c | ||
| 28 | @@ -48,13 +48,168 @@ | ||
| 29 | #ifndef NO_SYS_HEADERS | ||
| 30 | #include <string.h> | ||
| 31 | #endif | ||
| 32 | -#include "compiler.h" /* for unaligned access functions */ | ||
| 33 | /*------------------------- Global Variables ------------------------------*/ | ||
| 34 | |||
| 35 | X86EMU_sysEnv _X86EMU_env; /* Global emulator machine state */ | ||
| 36 | X86EMU_intrFuncs _X86EMU_intrTab[256]; | ||
| 37 | |||
| 38 | /*----------------------------- Implementation ----------------------------*/ | ||
| 39 | +#if defined(__alpha__) || defined(__alpha) | ||
| 40 | +/* to cope with broken egcs-1.1.2 :-(((( */ | ||
| 41 | + | ||
| 42 | +#define ALPHA_UALOADS | ||
| 43 | +/* | ||
| 44 | + * inline functions to do unaligned accesses | ||
| 45 | + * from linux/include/asm-alpha/unaligned.h | ||
| 46 | + */ | ||
| 47 | + | ||
| 48 | +/* | ||
| 49 | + * EGCS 1.1 knows about arbitrary unaligned loads. Define some | ||
| 50 | + * packed structures to talk about such things with. | ||
| 51 | + */ | ||
| 52 | + | ||
| 53 | +#if defined(__GNUC__) | ||
| 54 | +struct __una_u64 { unsigned long x __attribute__((packed)); }; | ||
| 55 | +struct __una_u32 { unsigned int x __attribute__((packed)); }; | ||
| 56 | +struct __una_u16 { unsigned short x __attribute__((packed)); }; | ||
| 57 | +#endif | ||
| 58 | + | ||
| 59 | +static __inline__ unsigned long ldq_u(unsigned long * r11) | ||
| 60 | +{ | ||
| 61 | +#if defined(__GNUC__) | ||
| 62 | + const struct __una_u64 *ptr = (const struct __una_u64 *) r11; | ||
| 63 | + return ptr->x; | ||
| 64 | +#else | ||
| 65 | + unsigned long r1,r2; | ||
| 66 | + __asm__("ldq_u %0,%3\n\t" | ||
| 67 | + "ldq_u %1,%4\n\t" | ||
| 68 | + "extql %0,%2,%0\n\t" | ||
| 69 | + "extqh %1,%2,%1" | ||
| 70 | + :"=&r" (r1), "=&r" (r2) | ||
| 71 | + :"r" (r11), | ||
| 72 | + "m" (*r11), | ||
| 73 | + "m" (*(const unsigned long *)(7+(char *) r11))); | ||
| 74 | + return r1 | r2; | ||
| 75 | +#endif | ||
| 76 | +} | ||
| 77 | + | ||
| 78 | +static __inline__ unsigned long ldl_u(unsigned int * r11) | ||
| 79 | +{ | ||
| 80 | +#if defined(__GNUC__) | ||
| 81 | + const struct __una_u32 *ptr = (const struct __una_u32 *) r11; | ||
| 82 | + return ptr->x; | ||
| 83 | +#else | ||
| 84 | + unsigned long r1,r2; | ||
| 85 | + __asm__("ldq_u %0,%3\n\t" | ||
| 86 | + "ldq_u %1,%4\n\t" | ||
| 87 | + "extll %0,%2,%0\n\t" | ||
| 88 | + "extlh %1,%2,%1" | ||
| 89 | + :"=&r" (r1), "=&r" (r2) | ||
| 90 | + :"r" (r11), | ||
| 91 | + "m" (*r11), | ||
| 92 | + "m" (*(const unsigned long *)(3+(char *) r11))); | ||
| 93 | + return r1 | r2; | ||
| 94 | +#endif | ||
| 95 | +} | ||
| 96 | + | ||
| 97 | +static __inline__ unsigned long ldw_u(unsigned short * r11) | ||
| 98 | +{ | ||
| 99 | +#if defined(__GNUC__) | ||
| 100 | + const struct __una_u16 *ptr = (const struct __una_u16 *) r11; | ||
| 101 | + return ptr->x; | ||
| 102 | +#else | ||
| 103 | + unsigned long r1,r2; | ||
| 104 | + __asm__("ldq_u %0,%3\n\t" | ||
| 105 | + "ldq_u %1,%4\n\t" | ||
| 106 | + "extwl %0,%2,%0\n\t" | ||
| 107 | + "extwh %1,%2,%1" | ||
| 108 | + :"=&r" (r1), "=&r" (r2) | ||
| 109 | + :"r" (r11), | ||
| 110 | + "m" (*r11), | ||
| 111 | + "m" (*(const unsigned long *)(1+(char *) r11))); | ||
| 112 | + return r1 | r2; | ||
| 113 | +#endif | ||
| 114 | +} | ||
| 115 | + | ||
| 116 | +/* | ||
| 117 | + * Elemental unaligned stores | ||
| 118 | + */ | ||
| 119 | + | ||
| 120 | +static __inline__ void stq_u(unsigned long r5, unsigned long * r11) | ||
| 121 | +{ | ||
| 122 | +#if defined(__GNUC__) | ||
| 123 | + struct __una_u64 *ptr = (struct __una_u64 *) r11; | ||
| 124 | + ptr->x = r5; | ||
| 125 | +#else | ||
| 126 | + unsigned long r1,r2,r3,r4; | ||
| 127 | + | ||
| 128 | + __asm__("ldq_u %3,%1\n\t" | ||
| 129 | + "ldq_u %2,%0\n\t" | ||
| 130 | + "insqh %6,%7,%5\n\t" | ||
| 131 | + "insql %6,%7,%4\n\t" | ||
| 132 | + "mskqh %3,%7,%3\n\t" | ||
| 133 | + "mskql %2,%7,%2\n\t" | ||
| 134 | + "bis %3,%5,%3\n\t" | ||
| 135 | + "bis %2,%4,%2\n\t" | ||
| 136 | + "stq_u %3,%1\n\t" | ||
| 137 | + "stq_u %2,%0" | ||
| 138 | + :"=m" (*r11), | ||
| 139 | + "=m" (*(unsigned long *)(7+(char *) r11)), | ||
| 140 | + "=&r" (r1), "=&r" (r2), "=&r" (r3), "=&r" (r4) | ||
| 141 | + :"r" (r5), "r" (r11)); | ||
| 142 | +#endif | ||
| 143 | +} | ||
| 144 | + | ||
| 145 | +static __inline__ void stl_u(unsigned long r5, unsigned int * r11) | ||
| 146 | +{ | ||
| 147 | +#if defined(__GNUC__) | ||
| 148 | + struct __una_u32 *ptr = (struct __una_u32 *) r11; | ||
| 149 | + ptr->x = r5; | ||
| 150 | +#else | ||
| 151 | + unsigned long r1,r2,r3,r4; | ||
| 152 | + | ||
| 153 | + __asm__("ldq_u %3,%1\n\t" | ||
| 154 | + "ldq_u %2,%0\n\t" | ||
| 155 | + "inslh %6,%7,%5\n\t" | ||
| 156 | + "insll %6,%7,%4\n\t" | ||
| 157 | + "msklh %3,%7,%3\n\t" | ||
| 158 | + "mskll %2,%7,%2\n\t" | ||
| 159 | + "bis %3,%5,%3\n\t" | ||
| 160 | + "bis %2,%4,%2\n\t" | ||
| 161 | + "stq_u %3,%1\n\t" | ||
| 162 | + "stq_u %2,%0" | ||
| 163 | + :"=m" (*r11), | ||
| 164 | + "=m" (*(unsigned long *)(3+(char *) r11)), | ||
| 165 | + "=&r" (r1), "=&r" (r2), "=&r" (r3), "=&r" (r4) | ||
| 166 | + :"r" (r5), "r" (r11)); | ||
| 167 | +#endif | ||
| 168 | +} | ||
| 169 | + | ||
| 170 | +static __inline__ void stw_u(unsigned long r5, unsigned short * r11) | ||
| 171 | +{ | ||
| 172 | +#if defined(__GNUC__) | ||
| 173 | + struct __una_u16 *ptr = (struct __una_u16 *) r11; | ||
| 174 | + ptr->x = r5; | ||
| 175 | +#else | ||
| 176 | + unsigned long r1,r2,r3,r4; | ||
| 177 | + | ||
| 178 | + __asm__("ldq_u %3,%1\n\t" | ||
| 179 | + "ldq_u %2,%0\n\t" | ||
| 180 | + "inswh %6,%7,%5\n\t" | ||
| 181 | + "inswl %6,%7,%4\n\t" | ||
| 182 | + "mskwh %3,%7,%3\n\t" | ||
| 183 | + "mskwl %2,%7,%2\n\t" | ||
| 184 | + "bis %3,%5,%3\n\t" | ||
| 185 | + "bis %2,%4,%2\n\t" | ||
| 186 | + "stq_u %3,%1\n\t" | ||
| 187 | + "stq_u %2,%0" | ||
| 188 | + :"=m" (*r11), | ||
| 189 | + "=m" (*(unsigned long *)(1+(char *) r11)), | ||
| 190 | + "=&r" (r1), "=&r" (r2), "=&r" (r3), "=&r" (r4) | ||
| 191 | + :"r" (r5), "r" (r11)); | ||
| 192 | +#endif | ||
| 193 | +} | ||
| 194 | +#endif | ||
| 195 | |||
| 196 | /**************************************************************************** | ||
| 197 | PARAMETERS: | ||
| 198 | @@ -107,7 +262,13 @@ u16 X86API rdw( | ||
| 199 | } | ||
| 200 | else | ||
| 201 | #endif | ||
| 202 | +#if defined(ALPHA_UALOADS) | ||
| 203 | val = ldw_u((u16*)(M.mem_base + addr)); | ||
| 204 | +#elif defined(IA64_UALOADS) | ||
| 205 | + val = uldw((u16*)(M.mem_base + addr)); | ||
| 206 | +#else | ||
| 207 | + val = *(u16*)(M.mem_base + addr); | ||
| 208 | +#endif | ||
| 209 | DB( if (DEBUG_MEM_TRACE()) | ||
| 210 | printk("%#08x 2 -> %#x\n", addr, val);) | ||
| 211 | return val; | ||
| 212 | @@ -140,7 +301,13 @@ u32 X86API rdl( | ||
| 213 | } | ||
| 214 | else | ||
| 215 | #endif | ||
| 216 | +#if defined(ALPHA_UALOADS) | ||
| 217 | val = ldl_u((u32*)(M.mem_base + addr)); | ||
| 218 | +#elif defined(IA64_UALOADS) | ||
| 219 | + val = uldl((u32*)(M.mem_base + addr)); | ||
| 220 | +#else | ||
| 221 | + val = *(u32*)(M.mem_base + addr); | ||
| 222 | +#endif | ||
| 223 | DB( if (DEBUG_MEM_TRACE()) | ||
| 224 | printk("%#08x 4 -> %#x\n", addr, val);) | ||
| 225 | return val; | ||
| 226 | @@ -192,7 +359,13 @@ DB( if (DEBUG_MEM_TRACE()) | ||
| 227 | } | ||
| 228 | else | ||
| 229 | #endif | ||
| 230 | +#if defined(ALPHA_UALOADS) | ||
| 231 | stw_u(val,(u16*)(M.mem_base + addr)); | ||
| 232 | +#elif defined(IA64_UALOADS) | ||
| 233 | + ustw(val,(u16*)(M.mem_base + addr)); | ||
| 234 | +#else | ||
| 235 | + *(u16*)(M.mem_base + addr) = val; | ||
| 236 | +#endif | ||
| 237 | } | ||
| 238 | |||
| 239 | /**************************************************************************** | ||
| 240 | @@ -222,7 +395,13 @@ DB( if (DEBUG_MEM_TRACE()) | ||
| 241 | } | ||
| 242 | else | ||
| 243 | #endif | ||
| 244 | +#if defined(ALPHA_UALOADS) | ||
| 245 | stl_u(val,(u32*)(M.mem_base + addr)); | ||
| 246 | +#elif defined(IA64_UALOADS) | ||
| 247 | + ustl(val,(u32*)(M.mem_base + addr)); | ||
| 248 | +#else | ||
| 249 | + *(u32*)(M.mem_base + addr) = val; | ||
| 250 | +#endif | ||
| 251 | } | ||
| 252 | |||
| 253 | /**************************************************************************** | ||
| 254 | -- | ||
| 255 | cgit v0.8.3-6-g21f6 | ||
| 256 | |||
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.10.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.10.1.bb new file mode 100644 index 0000000000..f9b3a64f47 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.10.1.bb | |||
| @@ -0,0 +1,12 @@ | |||
| 1 | require xserver-xf86-lite.inc | ||
| 2 | |||
| 3 | LIC_FILES_CHKSUM = "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00" | ||
| 4 | |||
| 5 | PR = "r0" | ||
| 6 | |||
| 7 | DEPENDS += "font-util" | ||
| 8 | |||
| 9 | SRC_URI += "file://crosscompile.patch" | ||
| 10 | |||
| 11 | # Misc build failure for master HEAD | ||
| 12 | SRC_URI += "file://fix_open_max_preprocessor_error.patch;" | ||
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.7.99.2.bb b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.7.99.2.bb deleted file mode 100644 index 5ef23019ad..0000000000 --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.7.99.2.bb +++ /dev/null | |||
| @@ -1,12 +0,0 @@ | |||
| 1 | require xserver-xf86-lite.inc | ||
| 2 | |||
| 3 | PR = "r1" | ||
| 4 | |||
| 5 | DEPENDS += "font-util" | ||
| 6 | |||
| 7 | SRC_URI += "file://nodolt.patch;patch=1 \ | ||
| 8 | file://crosscompile.patch;patch=1" | ||
| 9 | |||
| 10 | # Misc build failure for master HEAD | ||
| 11 | SRC_URI += "file://fix_open_max_preprocessor_error.patch;patch=1 \ | ||
| 12 | file://revert_make_sys_c_use_unaligned_access_functions.patch;patch=1" | ||
