StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Switch from clang 3.6 to new clang repository (with 3.8).

Browse Source 
This reverts commit f7dbab16ff.

Bug: 23396112

Switch from "-fsanitize-undefined-trap-on-error" to
"-fsanitize-trap=all". The former ends up accidentally leaving
unresolved calls to __ubsan* helper functions in the object file with
clang 3.8. The latter is used when we don't include address sanitizer,
and replaces any misbehavior with a direct call to abort().
This commit is contained in:
Stephen Hines
2015-11-09 16:32:11 -08:00
parent 8b2c37c953
commit e8119e96fc
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/clang/config.mk
View File

@@ -1,7 +1,6 @@
## Clang configurations. ## Clang configurations.
LLVM_PREBUILTS_VERSION := 3.6 LLVM_PREBUILTS_VERSION := 3.8
FORCE_BUILD_SANITIZER_SHARED_OBJECTS := true
LLVM_PREBUILTS_PATH := prebuilts/clang/host/$(BUILD_OS)-x86/$(LLVM_PREBUILTS_VERSION)/bin LLVM_PREBUILTS_PATH := prebuilts/clang/host/$(BUILD_OS)-x86/$(LLVM_PREBUILTS_VERSION)/bin
LLVM_RTLIB_PATH := $(LLVM_PREBUILTS_PATH)/../lib/clang/$(LLVM_PREBUILTS_VERSION)/lib/linux/ LLVM_RTLIB_PATH := $(LLVM_PREBUILTS_PATH)/../lib/clang/$(LLVM_PREBUILTS_VERSION)/lib/linux/

8
core/config_sanitizers.mk
View File

@@ -84,7 +84,7 @@ ifneq ($(filter coverage,$(my_sanitize)),)
endif endif
ifneq ($(my_sanitize),) ifneq ($(my_sanitize),)
fsanitize_arg := $(subst $(space),$(comma),$(my_sanitize)), fsanitize_arg := $(subst $(space),$(comma),$(my_sanitize))
my_cflags += -fsanitize=$(fsanitize_arg) my_cflags += -fsanitize=$(fsanitize_arg)
ifdef LOCAL_IS_HOST_MODULE ifdef LOCAL_IS_HOST_MODULE
@@ -92,8 +92,10 @@ ifneq ($(my_sanitize),)
my_ldflags += -fsanitize=$(fsanitize_arg) my_ldflags += -fsanitize=$(fsanitize_arg)
my_ldlibs += -lrt -ldl my_ldlibs += -lrt -ldl
else else
my_cflags += -fsanitize-undefined-trap-on-error ifeq ($(filter address,$(my_sanitize)),)
my_cflags += -ftrap-function=abort my_cflags += -fsanitize-trap=all
my_cflags += -ftrap-function=abort
endif
my_shared_libraries += libdl my_shared_libraries += libdl
endif endif
endif endif