forked from pool/MozillaFirefox
76 lines
2.1 KiB
Diff
76 lines
2.1 KiB
Diff
|
# HG changeset patch
|
||
|
|
# Parent 87e43d08cce58b76e1910946c36c6465bb4c74e6
|
||
|
|
From: upstream
|
||
|
|
Subject: Fix PPC64 build
|
||
|
|
https://bugzilla.mozilla.org/show_bug.cgi?id=670719
|
||
|
|
https://bugzilla.mozilla.org/show_bug.cgi?id=654056
|
||
|
|
|
||
|
|
diff --git a/ipc/chromium/src/build/build_config.h b/ipc/chromium/src/build/build_config.h
|
||
|
|
--- a/ipc/chromium/src/build/build_config.h
|
||
|
|
+++ b/ipc/chromium/src/build/build_config.h
|
||
|
|
@@ -52,16 +52,19 @@
|
||
|
|
#define ARCH_CPU_X86_FAMILY 1
|
||
|
|
#define ARCH_CPU_X86 1
|
||
|
|
#define ARCH_CPU_32_BITS 1
|
||
|
|
#elif defined(__ARMEL__)
|
||
|
|
#define ARCH_CPU_ARM_FAMILY 1
|
||
|
|
#define ARCH_CPU_ARMEL 1
|
||
|
|
#define ARCH_CPU_32_BITS 1
|
||
|
|
#define WCHAR_T_IS_UNSIGNED 1
|
||
|
|
+#elif defined(__powerpc64__)
|
||
|
|
+#define ARCH_CPU_PPC64 1
|
||
|
|
+#define ARCH_CPU_64_BITS 1
|
||
|
|
#elif defined(__ppc__) || defined(__powerpc__)
|
||
|
|
#define ARCH_CPU_PPC 1
|
||
|
|
#define ARCH_CPU_32_BITS 1
|
||
|
|
#else
|
||
|
|
#error Please add support for your architecture in build/build_config.h
|
||
|
|
#endif
|
||
|
|
|
||
|
|
// Type detection for wchar_t.
|
||
|
|
diff --git a/js/src/Makefile.in b/js/src/Makefile.in
|
||
|
|
--- a/js/src/Makefile.in
|
||
|
|
+++ b/js/src/Makefile.in
|
||
|
|
@@ -433,16 +433,18 @@ CPPSRCS += \
|
||
|
|
YarrPattern.cpp \
|
||
|
|
YarrSyntaxChecker.cpp \
|
||
|
|
$(NULL)
|
||
|
|
else
|
||
|
|
|
||
|
|
###############################################
|
||
|
|
# BEGIN include sources for the Nitro assembler
|
||
|
|
#
|
||
|
|
+ENABLE_YARR_JIT = 1
|
||
|
|
+
|
||
|
|
VPATH += $(srcdir)/assembler \
|
||
|
|
$(srcdir)/assembler/wtf \
|
||
|
|
$(srcdir)/assembler/jit \
|
||
|
|
$(srcdir)/assembler/assembler \
|
||
|
|
$(srcdir)/methodjit \
|
||
|
|
$(srcdir)/yarr \
|
||
|
|
$(NONE)
|
||
|
|
|
||
|
|
@@ -1076,17 +1078,21 @@ endif
|
||
|
|
|
||
|
|
###############################################
|
||
|
|
# BEGIN kludges for the Nitro assembler
|
||
|
|
#
|
||
|
|
|
||
|
|
# Needed to "configure" it correctly. Unfortunately these
|
||
|
|
# flags wind up being applied to all code in js/src, not just
|
||
|
|
# the code in js/src/assembler.
|
||
|
|
-CXXFLAGS += -DUSE_SYSTEM_MALLOC=1 -DENABLE_ASSEMBLER=1 -DENABLE_JIT=1
|
||
|
|
+CXXFLAGS += -DUSE_SYSTEM_MALLOC=1 -DENABLE_ASSEMBLER=1
|
||
|
|
+
|
||
|
|
+ifneq (,$(ENABLE_YARR_JIT)$(ENABLE_TRACEJIT)$(ENABLE_METHODJIT))
|
||
|
|
+CXXFLAGS += -DENABLE_JIT=1
|
||
|
|
+endif
|
||
|
|
|
||
|
|
INCLUDES += -I$(srcdir)/assembler -I$(srcdir)/yarr
|
||
|
|
|
||
|
|
ifdef ENABLE_METHODJIT
|
||
|
|
# Build a standalone test program that exercises the assembler
|
||
|
|
# sources a bit.
|
||
|
|
TESTMAIN_OBJS = \
|
||
|
|
Assertions.$(OBJ_SUFFIX) \
|