forked from OSchip/llvm-project
Remove autoconf support for building runtime libraries.
Summary: This patch is provided in preparation for removing autoconf on 1/26. The proposal to remove autoconf on 1/26 was discussed on the llvm-dev thread here: http://lists.llvm.org/pipermail/llvm-dev/2016-January/093875.html "I am the punishment of God... If [autoconf] had not committed great sins, God would not have sent a punishment like me upon [it]." -Genghis Khan Reviewers: chandlerc, grosbach, bob.wilson, zaks.anna, kubabrecka, samsonov, echristo Subscribers: iains, llvm-commits Differential Revision: http://reviews.llvm.org/D16473 llvm-svn: 258863
This commit is contained in:
Chris Bieneman
parent
2bf68c6c1c
commit
63a81b1415
|
|
@ -10,10 +10,4 @@
|
|||
SubDirs :=
|
||||
|
||||
# Add submodules.
|
||||
SubDirs += asan
|
||||
SubDirs += builtins
|
||||
SubDirs += interception
|
||||
SubDirs += lsan
|
||||
SubDirs += profile
|
||||
SubDirs += sanitizer_common
|
||||
SubDirs += ubsan
|
||||
|
|
|
|||
|
|
@ -1,29 +0,0 @@
|
|||
#===- lib/asan/Makefile.mk ---------------------------------*- Makefile -*--===#
|
||||
#
|
||||
# The LLVM Compiler Infrastructure
|
||||
#
|
||||
# This file is distributed under the University of Illinois Open Source
|
||||
# License. See LICENSE.TXT for details.
|
||||
#
|
||||
#===------------------------------------------------------------------------===#
|
||||
|
||||
ModuleName := asan
|
||||
SubDirs :=
|
||||
|
||||
CCSources := $(foreach file,$(wildcard $(Dir)/*.cc),$(notdir $(file)))
|
||||
CXXOnlySources := asan_new_delete.cc
|
||||
COnlySources := $(filter-out $(CXXOnlySources),$(CCSources))
|
||||
SSources := $(foreach file,$(wildcard $(Dir)/*.S),$(notdir $(file)))
|
||||
Sources := $(CCSources) $(SSources)
|
||||
ObjNames := $(CCSources:%.cc=%.o) $(SSources:%.S=%.o)
|
||||
|
||||
Implementation := Generic
|
||||
|
||||
# FIXME: use automatic dependencies?
|
||||
Dependencies := $(wildcard $(Dir)/*.h)
|
||||
Dependencies += $(wildcard $(Dir)/../interception/*.h)
|
||||
Dependencies += $(wildcard $(Dir)/../sanitizer_common/*.h)
|
||||
|
||||
# Define a convenience variable for all the asan functions.
|
||||
AsanFunctions := $(COnlySources:%.cc=%) $(SSources:%.S=%)
|
||||
AsanCXXFunctions := $(CXXOnlySources:%.cc=%)
|
||||
|
|
@ -1,23 +0,0 @@
|
|||
#===- lib/interception/Makefile.mk -------------------------*- Makefile -*--===#
|
||||
#
|
||||
# The LLVM Compiler Infrastructure
|
||||
#
|
||||
# This file is distributed under the University of Illinois Open Source
|
||||
# License. See LICENSE.TXT for details.
|
||||
#
|
||||
#===------------------------------------------------------------------------===#
|
||||
|
||||
ModuleName := interception
|
||||
SubDirs :=
|
||||
|
||||
Sources := $(foreach file,$(wildcard $(Dir)/*.cc),$(notdir $(file)))
|
||||
ObjNames := $(Sources:%.cc=%.o)
|
||||
|
||||
Implementation := Generic
|
||||
|
||||
# FIXME: use automatic dependencies?
|
||||
Dependencies := $(wildcard $(Dir)/*.h)
|
||||
Dependencies += $(wildcard $(Dir)/../sanitizer_common/*.h)
|
||||
|
||||
# Define a convenience variable for all the interception functions.
|
||||
InterceptionFunctions := $(Sources:%.cc=%)
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
#===- lib/lsan/Makefile.mk ---------------------------------*- Makefile -*--===#
|
||||
#
|
||||
# The LLVM Compiler Infrastructure
|
||||
#
|
||||
# This file is distributed under the University of Illinois Open Source
|
||||
# License. See LICENSE.TXT for details.
|
||||
#
|
||||
#===------------------------------------------------------------------------===#
|
||||
|
||||
ModuleName := lsan
|
||||
SubDirs :=
|
||||
|
||||
Sources := $(foreach file,$(wildcard $(Dir)/*.cc),$(notdir $(file)))
|
||||
ObjNames := $(Sources:%.cc=%.o)
|
||||
|
||||
Implementation := Generic
|
||||
|
||||
# FIXME: use automatic dependencies?
|
||||
Dependencies := $(wildcard $(Dir)/*.h)
|
||||
Dependencies += $(wildcard $(Dir)/../interception/*.h)
|
||||
Dependencies += $(wildcard $(Dir)/../sanitizer_common/*.h)
|
||||
|
||||
# lsan functions used in another sanitizers.
|
||||
LsanCommonSources := $(foreach file,$(wildcard $(Dir)/lsan_common*.cc),$(notdir $(file)))
|
||||
LsanCommonFunctions := $(LsanCommonSources:%.cc=%)
|
||||
|
|
@ -1,18 +0,0 @@
|
|||
#===- lib/profile/Makefile.mk ------------------------------*- Makefile -*--===#
|
||||
#
|
||||
# The LLVM Compiler Infrastructure
|
||||
#
|
||||
# This file is distributed under the University of Illinois Open Source
|
||||
# License. See LICENSE.TXT for details.
|
||||
#
|
||||
#===------------------------------------------------------------------------===#
|
||||
|
||||
ModuleName := profile
|
||||
SubDirs :=
|
||||
|
||||
Sources := $(foreach file,$(wildcard $(Dir)/*.c $(Dir)/*.cc),$(notdir $(file)))
|
||||
ObjNames := $(patsubst %.c,%.o,$(patsubst %.cc,%.o,$(Sources)))
|
||||
Implementation := Generic
|
||||
|
||||
# FIXME: use automatic dependencies?
|
||||
Dependencies := $(wildcard $(Dir)/*.h)
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
#===- lib/sanitizer_common/Makefile.mk ---------------------*- Makefile -*--===#
|
||||
#
|
||||
# The LLVM Compiler Infrastructure
|
||||
#
|
||||
# This file is distributed under the University of Illinois Open Source
|
||||
# License. See LICENSE.TXT for details.
|
||||
#
|
||||
#===------------------------------------------------------------------------===#
|
||||
|
||||
ModuleName := sanitizer_common
|
||||
SubDirs :=
|
||||
|
||||
Sources := $(foreach file,$(wildcard $(Dir)/*.cc),$(notdir $(file)))
|
||||
NolibcSources := $(foreach file,$(wildcard $(Dir)/*_nolibc.cc),$(notdir $(file)))
|
||||
Sources := $(filter-out $(NolibcSources),$(Sources))
|
||||
ObjNames := $(Sources:%.cc=%.o)
|
||||
|
||||
Implementation := Generic
|
||||
|
||||
# FIXME: use automatic dependencies?
|
||||
Dependencies := $(wildcard $(Dir)/*.h)
|
||||
|
||||
# Define a convenience variable for all the sanitizer_common functions.
|
||||
SanitizerCommonFunctions := $(Sources:%.cc=%)
|
||||
|
|
@ -1,28 +0,0 @@
|
|||
#===- lib/ubsan/Makefile.mk ---------------------------------*- Makefile -*--===#
|
||||
#
|
||||
# The LLVM Compiler Infrastructure
|
||||
#
|
||||
# This file is distributed under the University of Illinois Open Source
|
||||
# License. See LICENSE.TXT for details.
|
||||
#
|
||||
#===------------------------------------------------------------------------===#
|
||||
|
||||
ModuleName := ubsan
|
||||
SubDirs :=
|
||||
|
||||
Sources := $(foreach file,$(wildcard $(Dir)/*.cc),$(notdir $(file)))
|
||||
StandaloneSources := ubsan_init_standalone.cc
|
||||
CXXSources := ubsan_type_hash.cc ubsan_handlers_cxx.cc
|
||||
CSources := $(filter-out $(StandaloneSources),$(filter-out $(CXXSources),$(Sources)))
|
||||
ObjNames := $(Sources:%.cc=%.o)
|
||||
|
||||
Implementation := Generic
|
||||
|
||||
# FIXME: use automatic dependencies?
|
||||
Dependencies := $(wildcard $(Dir)/*.h)
|
||||
Dependencies += $(wildcard $(Dir)/../sanitizer_common/*.h)
|
||||
|
||||
# Define a convenience variable for all the ubsan functions.
|
||||
UbsanFunctions := $(CSources:%.cc=%)
|
||||
UbsanCXXFunctions := $(CXXSources:%.cc=%)
|
||||
UbsanStandaloneFunctions := $(StandaloneSources:%.cc=%)
|
||||
|
|
@ -101,26 +101,6 @@ UniversalArchs.cc_kext := $(call CheckArches,i386 x86_64 x86_64h,cc_kext,$(OSX_S
|
|||
Configs += cc_kext_ios
|
||||
UniversalArchs.cc_kext_ios += $(call CheckArches,armv7,cc_kext_ios,$(IOS_SDK))
|
||||
|
||||
# Configurations which define the profiling support functions.
|
||||
Configs += profile_osx
|
||||
UniversalArchs.profile_osx := $(call CheckArches,i386 x86_64 x86_64h,profile_osx,$(OSX_SDK))
|
||||
Configs += profile_ios
|
||||
UniversalArchs.profile_ios := $(call CheckArches,i386 x86_64,profile_ios,$(IOSSIM_SDK))
|
||||
UniversalArchs.profile_ios += $(call CheckArches,armv7 arm64,profile_ios,$(IOS_SDK))
|
||||
|
||||
# Configurations which define the ASAN support functions.
|
||||
Configs += asan_osx_dynamic
|
||||
UniversalArchs.asan_osx_dynamic := $(call CheckArches,i386 x86_64 x86_64h,asan_osx_dynamic,$(OSX_SDK))
|
||||
|
||||
Configs += asan_iossim_dynamic
|
||||
UniversalArchs.asan_iossim_dynamic := $(call CheckArches,i386 x86_64,asan_iossim_dynamic,$(IOSSIM_SDK))
|
||||
|
||||
Configs += ubsan_osx_dynamic
|
||||
UniversalArchs.ubsan_osx_dynamic := $(call CheckArches,i386 x86_64 x86_64h,ubsan_osx_dynamic,$(OSX_SDK))
|
||||
|
||||
Configs += ubsan_iossim_dynamic
|
||||
UniversalArchs.ubsan_iossim_dynamic := $(call CheckArches,i386 x86_64,ubsan_iossim_dynamic,$(IOSSIM_SDK))
|
||||
|
||||
# Darwin 10.6 has a bug in cctools that makes it unable to use ranlib on our ARM
|
||||
# object files. If we are on that platform, strip out all ARM archs. We still
|
||||
# build the libraries themselves so that Clang can find them where it expects
|
||||
|
|
@ -128,7 +108,6 @@ UniversalArchs.ubsan_iossim_dynamic := $(call CheckArches,i386 x86_64,ubsan_ioss
|
|||
ifneq ($(shell test -x /usr/bin/sw_vers && sw_vers -productVersion | grep 10.6),)
|
||||
UniversalArchs.ios := $(filter-out armv7, $(UniversalArchs.ios))
|
||||
UniversalArchs.cc_kext_ios := $(filter-out armv7, $(UniversalArchs.cc_kext_ios))
|
||||
UniversalArchs.profile_ios := $(filter-out armv7, $(UniversalArchs.profile_ios))
|
||||
endif
|
||||
|
||||
# If RC_SUPPORTED_ARCHS is defined, treat it as a list of the architectures we
|
||||
|
|
@ -175,26 +154,6 @@ SANITIZER_IOSSIM_DEPLOYMENT_ARGS := -mios-simulator-version-min=7.0 \
|
|||
-isysroot $(IOSSIM_SDK)
|
||||
SANITIZER_CFLAGS := -fno-builtin -gline-tables-only -stdlib=libc++
|
||||
|
||||
CFLAGS.asan_osx_dynamic := \
|
||||
$(CFLAGS) $(SANITIZER_MACOSX_DEPLOYMENT_ARGS) \
|
||||
$(SANITIZER_CFLAGS) \
|
||||
-DMAC_INTERPOSE_FUNCTIONS=1 \
|
||||
-DASAN_DYNAMIC=1
|
||||
|
||||
CFLAGS.asan_iossim_dynamic := \
|
||||
$(CFLAGS) $(SANITIZER_IOSSIM_DEPLOYMENT_ARGS) \
|
||||
$(SANITIZER_CFLAGS) \
|
||||
-DMAC_INTERPOSE_FUNCTIONS=1 \
|
||||
-DASAN_DYNAMIC=1
|
||||
|
||||
CFLAGS.ubsan_osx_dynamic := \
|
||||
$(CFLAGS) $(SANITIZER_MACOSX_DEPLOYMENT_ARGS) \
|
||||
$(SANITIZER_CFLAGS)
|
||||
|
||||
CFLAGS.ubsan_iossim_dynamic := \
|
||||
$(CFLAGS) $(SANITIZER_IOSSIM_DEPLOYMENT_ARGS) \
|
||||
$(SANITIZER_CFLAGS)
|
||||
|
||||
|
||||
CFLAGS.ios.i386 := $(CFLAGS) $(IOSSIM_DEPLOYMENT_ARGS)
|
||||
CFLAGS.ios.x86_64 := $(CFLAGS) $(IOSSIM_DEPLOYMENT_ARGS)
|
||||
|
|
@ -212,41 +171,9 @@ CFLAGS.cc_kext_ios.armv7 := $(CFLAGS) $(IOS6_DEPLOYMENT_ARGS)
|
|||
CFLAGS.cc_kext_ios.armv7k := $(CFLAGS) $(IOS6_DEPLOYMENT_ARGS)
|
||||
CFLAGS.cc_kext_ios.armv7s := $(CFLAGS) $(IOS6_DEPLOYMENT_ARGS)
|
||||
CFLAGS.cc_kext_ios.arm64 := $(CFLAGS) $(IOS6_DEPLOYMENT_ARGS)
|
||||
CFLAGS.profile_osx.i386 := $(CFLAGS) $(OSX_DEPLOYMENT_ARGS)
|
||||
CFLAGS.profile_osx.x86_64 := $(CFLAGS) $(OSX_DEPLOYMENT_ARGS)
|
||||
CFLAGS.profile_osx.x86_64h := $(CFLAGS) $(OSX_DEPLOYMENT_ARGS)
|
||||
CFLAGS.profile_ios.i386 := $(CFLAGS) $(IOSSIM_DEPLOYMENT_ARGS)
|
||||
CFLAGS.profile_ios.x86_64 := $(CFLAGS) $(IOSSIM_DEPLOYMENT_ARGS)
|
||||
CFLAGS.profile_ios.armv7 := $(CFLAGS) $(IOS_DEPLOYMENT_ARGS)
|
||||
CFLAGS.profile_ios.armv7k := $(CFLAGS) $(IOS_DEPLOYMENT_ARGS)
|
||||
CFLAGS.profile_ios.armv7s := $(CFLAGS) $(IOS_DEPLOYMENT_ARGS)
|
||||
CFLAGS.profile_ios.arm64 := $(CFLAGS) $(IOS6_DEPLOYMENT_ARGS)
|
||||
|
||||
SANITIZER_LDFLAGS := -stdlib=libc++ -lc++ -lc++abi
|
||||
|
||||
SHARED_LIBRARY.asan_osx_dynamic := 1
|
||||
LDFLAGS.asan_osx_dynamic := $(SANITIZER_LDFLAGS) -install_name @rpath/libclang_rt.asan_osx_dynamic.dylib \
|
||||
$(SANITIZER_MACOSX_DEPLOYMENT_ARGS)
|
||||
|
||||
SHARED_LIBRARY.asan_iossim_dynamic := 1
|
||||
LDFLAGS.asan_iossim_dynamic := $(SANITIZER_LDFLAGS) -install_name @rpath/libclang_rt.asan_iossim_dynamic.dylib \
|
||||
-Wl,-ios_simulator_version_min,7.0.0 $(SANITIZER_IOSSIM_DEPLOYMENT_ARGS)
|
||||
|
||||
SHARED_LIBRARY.ubsan_osx_dynamic := 1
|
||||
LDFLAGS.ubsan_osx_dynamic := $(SANITIZER_LDFLAGS) -install_name @rpath/libclang_rt.ubsan_osx_dynamic.dylib \
|
||||
$(SANITIZER_MACOSX_DEPLOYMENT_ARGS)
|
||||
|
||||
SHARED_LIBRARY.ubsan_iossim_dynamic := 1
|
||||
LDFLAGS.ubsan_iossim_dynamic := $(SANITIZER_LDFLAGS) -install_name @rpath/libclang_rt.ubsan_iossim_dynamic.dylib \
|
||||
-Wl,-ios_simulator_version_min,7.0.0 $(SANITIZER_IOSSIM_DEPLOYMENT_ARGS)
|
||||
|
||||
ifneq ($(OSX_SDK),)
|
||||
CFLAGS.asan_osx_dynamic += -isysroot $(OSX_SDK)
|
||||
LDFLAGS.asan_osx_dynamic += -isysroot $(OSX_SDK)
|
||||
CFLAGS.ubsan_osx_dynamic += -isysroot $(OSX_SDK)
|
||||
LDFLAGS.ubsan_osx_dynamic += -isysroot $(OSX_SDK)
|
||||
endif
|
||||
|
||||
ATOMIC_FUNCTIONS := \
|
||||
atomic_flag_clear \
|
||||
atomic_flag_clear_explicit \
|
||||
|
|
@ -274,32 +201,6 @@ FUNCTIONS.ios.arm64 := mulsc3 muldc3 divsc3 divdc3 udivti3 umodti3 \
|
|||
|
||||
FUNCTIONS.osx := mulosi4 mulodi4 muloti4 $(ATOMIC_FUNCTIONS) $(FP16_FUNCTIONS)
|
||||
|
||||
FUNCTIONS.profile_osx := GCDAProfiling InstrProfiling InstrProfilingBuffer \
|
||||
InstrProfilingFile InstrProfilingPlatformDarwin \
|
||||
InstrProfilingRuntime InstrProfilingUtil \
|
||||
InstrProfilingWriter InstrProfilingValue
|
||||
FUNCTIONS.profile_ios := $(FUNCTIONS.profile_osx)
|
||||
|
||||
FUNCTIONS.asan_osx_dynamic := $(AsanFunctions) $(AsanCXXFunctions) \
|
||||
$(InterceptionFunctions) \
|
||||
$(SanitizerCommonFunctions) \
|
||||
$(AsanDynamicFunctions) \
|
||||
$(UbsanFunctions) $(UbsanCXXFunctions)
|
||||
|
||||
FUNCTIONS.asan_iossim_dynamic := $(AsanFunctions) $(AsanCXXFunctions) \
|
||||
$(InterceptionFunctions) \
|
||||
$(SanitizerCommonFunctions) \
|
||||
$(AsanDynamicFunctions) \
|
||||
$(UbsanFunctions) $(UbsanCXXFunctions)
|
||||
|
||||
FUNCTIONS.ubsan_osx_dynamic := $(UbsanFunctions) $(UbsanCXXFunctions) \
|
||||
$(SanitizerCommonFunctions) \
|
||||
$(UbsanStandaloneFunctions)
|
||||
|
||||
FUNCTIONS.ubsan_iossim_dynamic := $(UbsanFunctions) $(UbsanCXXFunctions) \
|
||||
$(SanitizerCommonFunctions) \
|
||||
$(UbsanStandaloneFunctions)
|
||||
|
||||
CCKEXT_PROFILE_FUNCTIONS := \
|
||||
InstrProfiling \
|
||||
InstrProfilingBuffer \
|
||||
|
|
|
|||
Loading…
Reference in New Issue