summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2020-05-04 09:11:19 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2020-05-04 09:11:18 -0700
commit17d11a848a15a725936c90df57bd225dcc60ec00 (patch)
tree952db538797f0712c63a9cb41fe872fd7b7ca4ac
parentcad25d22c781465a207ac26727d4fe387bff1889 (diff)
parent2ba37a00a2a2353e2929e48c789a7f6a38463ef1 (diff)
Merge "Makefile: Disable undefined-optimized and tautological features"
-rw-r--r--AndroidKernel.mk4
-rw-r--r--Makefile3
2 files changed, 5 insertions, 2 deletions
diff --git a/AndroidKernel.mk b/AndroidKernel.mk
index e5ecb099e535..1e4726094308 100644
--- a/AndroidKernel.mk
+++ b/AndroidKernel.mk
@@ -52,11 +52,11 @@ ifeq ($(KERNEL_LLVM_SUPPORT), true)
ifeq ($(shell echo $(SDCLANG_PATH) | head -c 1),/)
KERNEL_LLVM_BIN := $(SDCLANG_PATH)/clang
else
- KERNEL_LLVM_BIN := $(ANDROID_BUILD_TOP)/$(SDCLANG_PATH)/clang
+ KERNEL_LLVM_BIN := $(shell pwd)/$(SDCLANG_PATH)/clang
endif
$(warning "Using sdllvm" $(KERNEL_LLVM_BIN))
else
- KERNEL_LLVM_BIN := $(ANDROID_BUILD_TOP)/$(CLANG) #Using aosp-llvm compiler
+ KERNEL_LLVM_BIN := $(shell pwd)/$(CLANG) #Using aosp-llvm compiler
$(warning "Using aosp-llvm" $(KERNEL_LLVM_BIN))
endif
endif
diff --git a/Makefile b/Makefile
index 30a6975cca35..7ad3e94711b0 100644
--- a/Makefile
+++ b/Makefile
@@ -734,6 +734,9 @@ KBUILD_CPPFLAGS += $(call cc-option,-Qunused-arguments,)
KBUILD_CFLAGS += $(call cc-disable-warning, format-invalid-specifier)
KBUILD_CFLAGS += $(call cc-disable-warning, gnu)
KBUILD_CFLAGS += $(call cc-disable-warning, duplicate-decl-specifier)
+KBUILD_CFLAGS += -Wno-undefined-optimized
+KBUILD_CFLAGS += -Wno-tautological-constant-out-of-range-compare
+
# Quiet clang warning: comparison of unsigned expression < 0 is always false
KBUILD_CFLAGS += $(call cc-disable-warning, tautological-compare)
# CLANG uses a _MergedGlobals as optimization, but this breaks modpost, as the