Merge "Leave 'linux' defined on x86/x86-64, like arm."
diff --git a/core/64_bit_blacklist.mk b/core/64_bit_blacklist.mk
index 8e5fb80..a237935 100644
--- a/core/64_bit_blacklist.mk
+++ b/core/64_bit_blacklist.mk
@@ -1,11 +1,9 @@
ifneq ($(TARGET_2ND_ARCH),)
-# Chromium/V8: needs 64-bit support
+# chromium-libpac needs porting to the chromium_org V8 instead of legacy V8.
_64_bit_directory_blacklist += \
external/chromium-libpac \
- external/chromium_org \
external/v8 \
- frameworks/webview \
# misc build errors
_64_bit_directory_blacklist += \
diff --git a/core/combo/TARGET_linux-mips.mk b/core/combo/TARGET_linux-mips.mk
index 27304ee..ba03b5d 100644
--- a/core/combo/TARGET_linux-mips.mk
+++ b/core/combo/TARGET_linux-mips.mk
@@ -82,7 +82,7 @@
$(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS += \
$(TARGET_mips_CFLAGS) \
- -Ulinux -U__unix -U__unix__ -Umips \
+ -U__unix -U__unix__ -Umips \
-fpic -fPIE\
-ffunction-sections \
-fdata-sections \
diff --git a/core/combo/TARGET_linux-mips64.mk b/core/combo/TARGET_linux-mips64.mk
index 36b70ad..969ba10 100644
--- a/core/combo/TARGET_linux-mips64.mk
+++ b/core/combo/TARGET_linux-mips64.mk
@@ -87,7 +87,7 @@
TARGET_GLOBAL_CFLAGS += \
$(TARGET_mips_CFLAGS) \
- -Ulinux -U__unix -U__unix__ -Umips \
+ -U__unix -U__unix__ -Umips \
-fpic -fPIE\
-ffunction-sections \
-fdata-sections \