commit ea4f39e86d315793390fb84b5b4d667aa4d3917b
author Stephen Hines <srhines@google.com> Thu Dec 04 02:59:20 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Dec 04 02:59:21 2014 +0000
tree 46467507b645f25d084e938cda73ef8a1dacc4d3
parent b919da4c6267cd139e8b3c41db921e1f61ad4c50
parent 433f1614b002df4f0fac1d916881a2d659893f19

Merge "Switch to Clang 3.6."

core/clang/config.mk

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 \