From 433f1614b002df4f0fac1d916881a2d659893f19 Mon Sep 17 00:00:00 2001 From: Stephen Hines Date: Wed, 26 Nov 2014 00:57:34 -0800 Subject: [PATCH] Switch to Clang 3.6. This change also defaults C compilations with clang to gnu99, and turns off the -Winconsistent-missing-override flag, since we need further cleanup to turn it on. -finline-functions is an unnecessary flag that only gcc needs. Change-Id: I1cfcaedca32d9e3c248a6aa9460603205901c491 --- core/clang/config.mk | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/core/clang/config.mk b/core/clang/config.mk index d5b4e7a82..05066c896 100644 --- a/core/clang/config.mk +++ b/core/clang/config.mk @@ -6,7 +6,7 @@ WITHOUT_TARGET_CLANG := true 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 @@ endif # 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 += \ 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 \