Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e8119e96 authored by Stephen Hines's avatar Stephen Hines
Browse files

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

This reverts commit f7dbab16.

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().
parent 8b2c37c9

core/clang/config.mk

+1 −2
Original line number Diff line number Diff line 
## Clang configurations.



LLVM_PREBUILTS_VERSION := 3.6

FORCE_BUILD_SANITIZER_SHARED_OBJECTS := true

LLVM_PREBUILTS_VERSION := 3.8

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/

core/config_sanitizers.mk

+5 −3
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ ifneq ($(filter coverage,$(my_sanitize)),) 
endif



ifneq ($(my_sanitize),)

  fsanitize_arg := $(subst $(space),$(comma),$(my_sanitize)),

  fsanitize_arg := $(subst $(space),$(comma),$(my_sanitize))

  my_cflags += -fsanitize=$(fsanitize_arg)



  ifdef LOCAL_IS_HOST_MODULE
@@ -92,8 +92,10 @@ ifneq ($(my_sanitize),) 
    my_ldflags += -fsanitize=$(fsanitize_arg)

    my_ldlibs += -lrt -ldl

  else

    my_cflags += -fsanitize-undefined-trap-on-error

    ifeq ($(filter address,$(my_sanitize)),)

      my_cflags += -fsanitize-trap=all

      my_cflags += -ftrap-function=abort

    endif

    my_shared_libraries += libdl

  endif

endif