ba402baa78
OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=210
113 lines
3.4 KiB
Diff
113 lines
3.4 KiB
Diff
Subject: Patches needed to build on SLE11/11.1
|
|
References:
|
|
https://bugzilla.mozilla.org/show_bug.cgi?id=513422
|
|
|
|
diff --git a/gfx/cairo/cairo/src/cairo-xlib-surface.c b/gfx/cairo/cairo/src/cairo-xlib-surface.c
|
|
--- a/gfx/cairo/cairo/src/cairo-xlib-surface.c
|
|
+++ b/gfx/cairo/cairo/src/cairo-xlib-surface.c
|
|
@@ -4041,17 +4041,19 @@ _cairo_xlib_surface_add_glyph (Display *
|
|
new = malloc (4 * c);
|
|
if (unlikely (new == NULL)) {
|
|
status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
|
|
goto BAIL;
|
|
}
|
|
n = new;
|
|
d = (uint32_t *) data;
|
|
do {
|
|
- *n++ = bswap_32 (*d++);
|
|
+ *n = bswap_32 (*d);
|
|
+ *n++;
|
|
+ *d++;
|
|
} while (--c);
|
|
data = (uint8_t *) new;
|
|
}
|
|
break;
|
|
case CAIRO_FORMAT_RGB24:
|
|
default:
|
|
ASSERT_NOT_REACHED;
|
|
break;
|
|
diff --git a/xpcom/glue/SSE.cpp b/xpcom/glue/SSE.cpp
|
|
--- a/xpcom/glue/SSE.cpp
|
|
+++ b/xpcom/glue/SSE.cpp
|
|
@@ -44,26 +44,77 @@ namespace {
|
|
// SSE.h has parallel #ifs which declare MOZILLA_SSE_HAVE_CPUID_DETECTION.
|
|
// We can't declare these functions in the header file, however, because
|
|
// <intrin.h> conflicts with <windows.h> on MSVC 2005, and some files want to
|
|
// include both SSE.h and <windows.h>.
|
|
|
|
#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)) && (defined(__i386__) || defined(__x86_64__))
|
|
|
|
// cpuid.h is available on gcc 4.3 and higher on i386 and x86_64
|
|
-#include <cpuid.h>
|
|
+//#include <cpuid.h>
|
|
|
|
enum CPUIDRegister { eax = 0, ebx = 1, ecx = 2, edx = 3 };
|
|
|
|
+#ifdef __i386__
|
|
+#define _my_cpuid(level, a, b, c, d) \
|
|
+ __asm__ ("xchg{l}\t{%%}ebx, %1\n\t" \
|
|
+ "cpuid\n\t" \
|
|
+ "xchg{l}\t{%%}ebx, %1\n\t" \
|
|
+ : "=a" (a), "=r" (b), "=c" (c), "=d" (d) \
|
|
+ : "0" (level))
|
|
+#else
|
|
+#define _my_cpuid(level, a, b, c, d) \
|
|
+ __asm__ ("cpuid\n\t" \
|
|
+ : "=a" (a), "=b" (b), "=c" (c), "=d" (d) \
|
|
+ : "0" (level))
|
|
+#endif
|
|
+
|
|
+static __inline unsigned int
|
|
+my_cpuid_max (unsigned int __ext, unsigned int *__sig)
|
|
+{
|
|
+ unsigned int __eax, __ebx, __ecx, __edx;
|
|
+
|
|
+#ifdef __i386__
|
|
+ __asm__ ("pushf{l|d}\n\t"
|
|
+ "pushf{l|d}\n\t"
|
|
+ "pop{l}\t%0\n\t"
|
|
+ "mov{l}\t{%0, %1|%1, %0}\n\t"
|
|
+ "xor{l}\t{%2, %0|%0, %2}\n\t"
|
|
+ "push{l}\t%0\n\t"
|
|
+ "popf{l|d}\n\t"
|
|
+ "pushf{l|d}\n\t"
|
|
+ "pop{l}\t%0\n\t"
|
|
+ "popf{l|d}\n\t"
|
|
+ : "=&r" (__eax), "=&r" (__ebx)
|
|
+ : "i" (0x00200000));
|
|
+
|
|
+ if (!((__eax ^ __ebx) & 0x00200000))
|
|
+ return 0;
|
|
+#endif
|
|
+
|
|
+ /* Host supports cpuid. Return highest supported cpuid input value. */
|
|
+ _my_cpuid (__ext, __eax, __ebx, __ecx, __edx);
|
|
+
|
|
+ if (__sig)
|
|
+ *__sig = __ebx;
|
|
+
|
|
+ return __eax;
|
|
+}
|
|
+
|
|
static bool
|
|
has_cpuid_bit(unsigned int level, CPUIDRegister reg, unsigned int bit)
|
|
{
|
|
unsigned int regs[4];
|
|
- return __get_cpuid(level, ®s[0], ®s[1], ®s[2], ®s[3]) &&
|
|
- (regs[reg] & bit);
|
|
+
|
|
+ unsigned int __ext = level & 0x80000000;
|
|
+ if (my_cpuid_max(__ext, 0) < level)
|
|
+ return false;
|
|
+
|
|
+ _my_cpuid(level, regs[0], regs[1], regs[2], regs[3]);
|
|
+ return !!(unsigned(regs[reg]) & bit);
|
|
}
|
|
|
|
#elif defined(_MSC_VER) && _MSC_VER >= 1400 && (defined(_M_IX86) || defined(_M_AMD64))
|
|
|
|
// MSVC 2005 or newer on x86-32 or x86-64
|
|
#include <intrin.h>
|
|
|
|
enum CPUIDRegister { eax = 0, ebx = 1, ecx = 2, edx = 3 };
|