Index: compiler-rt/lib/ubsan/CMakeLists.txt =================================================================== --- compiler-rt/lib/ubsan/CMakeLists.txt +++ compiler-rt/lib/ubsan/CMakeLists.txt @@ -151,7 +151,6 @@ add_compiler_rt_runtime(clang_rt.ubsan_standalone STATIC ARCHS ${UBSAN_SUPPORTED_ARCH} - SOURCES ubsan_init_standalone_preinit.cc OBJECT_LIBS RTSanitizerCommon RTSanitizerCommonLibc RTUbsan Index: compiler-rt/lib/ubsan/ubsan_flags.cc =================================================================== --- compiler-rt/lib/ubsan/ubsan_flags.cc +++ compiler-rt/lib/ubsan/ubsan_flags.cc @@ -18,6 +18,8 @@ #include "sanitizer_common/sanitizer_flags.h" #include "sanitizer_common/sanitizer_flag_parser.h" +#include + namespace __ubsan { const char *MaybeCallUbsanDefaultOptions() { @@ -45,7 +47,7 @@ CommonFlags cf; cf.CopyFrom(*common_flags()); cf.print_summary = false; - cf.external_symbolizer_path = GetEnv("UBSAN_SYMBOLIZER_PATH"); + cf.external_symbolizer_path = getenv("UBSAN_SYMBOLIZER_PATH"); OverrideCommonFlags(cf); } @@ -59,7 +61,7 @@ // Override from user-specified string. parser.ParseString(MaybeCallUbsanDefaultOptions()); // Override from environment variable. - parser.ParseString(GetEnv("UBSAN_OPTIONS")); + parser.ParseString(getenv("UBSAN_OPTIONS")); InitializeCommonFlags(); if (Verbosity()) ReportUnrecognizedFlags(); Index: compiler-rt/lib/ubsan/ubsan_init_standalone_preinit.cc =================================================================== --- compiler-rt/lib/ubsan/ubsan_init_standalone_preinit.cc +++ /dev/null @@ -1,37 +0,0 @@ -//===-- ubsan_init_standalone_preinit.cc -//------------------------------------------===// -// -// The LLVM Compiler Infrastructure -// -// This file is distributed under the University of Illinois Open Source -// License. See LICENSE.TXT for details. -// -//===----------------------------------------------------------------------===// -// -// Initialization of standalone UBSan runtime. -// -//===----------------------------------------------------------------------===// - -#include "ubsan_platform.h" -#if !CAN_SANITIZE_UB -#error "UBSan is not supported on this platform!" -#endif - -#include "sanitizer_common/sanitizer_internal_defs.h" -#include "ubsan_init.h" -#include "ubsan_signals_standalone.h" - -#if SANITIZER_CAN_USE_PREINIT_ARRAY - -namespace __ubsan { - -static void PreInitAsStandalone() { - InitAsStandalone(); - InitializeDeadlySignals(); -} - -} // namespace __ubsan - -__attribute__((section(".preinit_array"), used)) void (*__local_ubsan_preinit)( - void) = __ubsan::PreInitAsStandalone; -#endif // SANITIZER_CAN_USE_PREINIT_ARRAY