Merge "Upgrade gcc compiler for arm build from 4.8 to 4.9"
diff --git a/core/clang/config.mk b/core/clang/config.mk
index d5b4e7a..05066c8 100644
--- a/core/clang/config.mk
+++ b/core/clang/config.mk
@@ -6,7 +6,7 @@
WITHOUT_HOST_CLANG := true
endif
-LLVM_PREBUILTS_VERSION := 3.5
+LLVM_PREBUILTS_VERSION := 3.6
LLVM_PREBUILTS_PATH := prebuilts/clang/$(BUILD_OS)-x86/host/$(LLVM_PREBUILTS_VERSION)/bin
CLANG := $(LLVM_PREBUILTS_PATH)/clang$(BUILD_EXECUTABLE_SUFFIX)
@@ -32,7 +32,7 @@
# Clang flags for all host or target rules
CLANG_CONFIG_EXTRA_ASFLAGS :=
CLANG_CONFIG_EXTRA_CFLAGS :=
-CLANG_CONFIG_EXTRA_CONLYFLAGS :=
+CLANG_CONFIG_EXTRA_CONLYFLAGS := -std=gnu99
CLANG_CONFIG_EXTRA_CPPFLAGS :=
CLANG_CONFIG_EXTRA_LDFLAGS :=
@@ -48,7 +48,13 @@
CLANG_CONFIG_EXTRA_CFLAGS += \
-Wno-unused-command-line-argument
+# Disable -Winconsistent-missing-override until we can clean up the existing
+# codebase for it.
+CLANG_CONFIG_EXTRA_CPPFLAGS += \
+ -Wno-inconsistent-missing-override
+
CLANG_CONFIG_UNKNOWN_CFLAGS := \
+ -finline-functions \
-finline-limit=64 \
-fno-canonical-system-headers \
-fno-tree-sra \
diff --git a/core/combo/arch/x86/x86-atom.mk b/core/combo/arch/x86/atom.mk
similarity index 100%
rename from core/combo/arch/x86/x86-atom.mk
rename to core/combo/arch/x86/atom.mk
diff --git a/core/combo/include/arch/darwin-x86/AndroidConfig.h b/core/combo/include/arch/darwin-x86/AndroidConfig.h
index 3c47056..a64c1c0 100644
--- a/core/combo/include/arch/darwin-x86/AndroidConfig.h
+++ b/core/combo/include/arch/darwin-x86/AndroidConfig.h
@@ -48,14 +48,6 @@
#define HAVE_SYMLINKS
/*
- * We need to choose between 32-bit and 64-bit off_t. All of our code should
- * agree on the same size. For desktop systems, use 64-bit values,
- * because some of our libraries (e.g. wxWidgets) expect to be built that way.
- */
-#define _FILE_OFFSET_BITS 64
-#define _LARGEFILE_SOURCE 1
-
-/*
* Add any extra platform-specific defines here.
*/
#define _THREAD_SAFE
@@ -66,11 +58,6 @@
/* #define HAVE_MALLOC_H */
/*
- * What CPU architecture does this platform use?
- */
-#define ARCH_X86
-
-/*
* sprintf() format string for shared library naming.
*/
#define OS_SHARED_LIB_FORMAT_STR "lib%s.dylib"
diff --git a/core/combo/include/arch/linux-arm/AndroidConfig.h b/core/combo/include/arch/linux-arm/AndroidConfig.h
index c38fc8a..eec05e2 100644
--- a/core/combo/include/arch/linux-arm/AndroidConfig.h
+++ b/core/combo/include/arch/linux-arm/AndroidConfig.h
@@ -68,11 +68,6 @@
#define HAVE_LIBC_SYSTEM_PROPERTIES 1
/*
- * What CPU architecture does this platform use?
- */
-#define ARCH_ARM
-
-/*
* sprintf() format string for shared library naming.
*/
#define OS_SHARED_LIB_FORMAT_STR "lib%s.so"
diff --git a/core/combo/include/arch/linux-arm64/AndroidConfig.h b/core/combo/include/arch/linux-arm64/AndroidConfig.h
index 6375ee7..9455f5a 100644
--- a/core/combo/include/arch/linux-arm64/AndroidConfig.h
+++ b/core/combo/include/arch/linux-arm64/AndroidConfig.h
@@ -52,8 +52,6 @@
*/
#define HAVE_POSIX_CLOCKS
-#define _FILE_OFFSET_BITS 64
-
/*
* Define if we have <malloc.h> header
*/
diff --git a/core/combo/include/arch/linux-mips64/AndroidConfig.h b/core/combo/include/arch/linux-mips64/AndroidConfig.h
index 3732ca9..c95f497 100644
--- a/core/combo/include/arch/linux-mips64/AndroidConfig.h
+++ b/core/combo/include/arch/linux-mips64/AndroidConfig.h
@@ -52,8 +52,6 @@
*/
#define HAVE_POSIX_CLOCKS
-#define _FILE_OFFSET_BITS 64
-
/*
* Define if we have <malloc.h> header
*/
diff --git a/core/combo/include/arch/linux-x86/AndroidConfig.h b/core/combo/include/arch/linux-x86/AndroidConfig.h
index 3d57efe..10e6e11 100644
--- a/core/combo/include/arch/linux-x86/AndroidConfig.h
+++ b/core/combo/include/arch/linux-x86/AndroidConfig.h
@@ -66,11 +66,6 @@
#define HAVE_MALLOC_H
/*
- * What CPU architecture does this platform use?
- */
-#define ARCH_X86
-
-/*
* Define if system provides a system property server (should be
* mutually exclusive with HAVE_LIBC_SYSTEM_PROPERTIES).
*/
diff --git a/core/combo/include/arch/target_linux-x86/AndroidConfig.h b/core/combo/include/arch/target_linux-x86/AndroidConfig.h
index e294167..6a3eec2 100644
--- a/core/combo/include/arch/target_linux-x86/AndroidConfig.h
+++ b/core/combo/include/arch/target_linux-x86/AndroidConfig.h
@@ -40,15 +40,6 @@
#define HAVE_POSIX_CLOCKS
/*
- * We need to choose between 32-bit and 64-bit off_t. All of our code should
- * agree on the same size. For desktop systems, use 64-bit values,
- * because some of our libraries (e.g. wxWidgets) expect to be built that way.
- */
-#if defined(__LP64__)
-#define _FILE_OFFSET_BITS 64
-#endif
-
-/*
* Define if we have <malloc.h> header
*/
#define HAVE_MALLOC_H
@@ -64,11 +55,6 @@
#define HAVE_LIBC_SYSTEM_PROPERTIES 1
/*
- * What CPU architecture does this platform use?
- */
-#define ARCH_X86
-
-/*
* sprintf() format string for shared library naming.
*/
#define OS_SHARED_LIB_FORMAT_STR "lib%s.so"
diff --git a/core/combo/include/arch/windows/AndroidConfig.h b/core/combo/include/arch/windows/AndroidConfig.h
index 4e2186e..3e2f3af 100644
--- a/core/combo/include/arch/windows/AndroidConfig.h
+++ b/core/combo/include/arch/windows/AndroidConfig.h
@@ -98,11 +98,6 @@
#define HAVE_WINDOWS_PATHS /* needed by simulator */
/*
- * What CPU architecture does this platform use?
- */
-#define ARCH_X86
-
-/*
* sprintf() format string for shared library naming.
*/
#define OS_SHARED_LIB_FORMAT_STR "lib%s.dll"