From e73a31f667ad2fe03e25c97ac45b58c30d7f07c3 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Fri, 22 Jan 2010 06:49:46 +0000 Subject: Stop building RTTI information for *most* llvm libraries. Notable missing ones are libsupport, libsystem and libvmcore. libvmcore is currently blocked on bugpoint, which uses EH. Once it stops using EH, we can switch it off. This #if 0's out 3 unit tests, because gtest requires RTTI information. Suggestions welcome on how to fix this. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@94164 91177308-0d34-0410-b5e6-96231b3b80d8 --- tools/gold/Makefile | 1 + tools/llc/Makefile | 1 + tools/lli/Makefile | 1 + tools/llvm-ar/Makefile | 1 + tools/llvm-as/Makefile | 2 +- tools/llvm-bcanalyzer/Makefile | 1 - tools/llvm-config/Makefile | 1 - tools/llvm-dis/Makefile | 2 +- tools/llvm-extract/Makefile | 1 + tools/llvm-ld/Makefile | 1 + tools/llvm-link/Makefile | 1 + tools/llvm-mc/Makefile | 1 + tools/llvm-nm/Makefile | 1 + tools/llvm-prof/Makefile | 1 + tools/lto/Makefile | 1 + tools/opt/Makefile | 1 + 16 files changed, 14 insertions(+), 4 deletions(-) (limited to 'tools') diff --git a/tools/gold/Makefile b/tools/gold/Makefile index 7bac4ec62d..3f77229b33 100644 --- a/tools/gold/Makefile +++ b/tools/gold/Makefile @@ -19,6 +19,7 @@ LINK_LIBS_IN_SHARED=1 SHARED_LIBRARY = 1 BUILD_ARCHIVE = 0 LOADABLE_MODULE = 1 +CXXFLAGS = -fno-rtti LINK_COMPONENTS := support system LIBS += -llto diff --git a/tools/llc/Makefile b/tools/llc/Makefile index 7319aada48..6b5b125d8a 100644 --- a/tools/llc/Makefile +++ b/tools/llc/Makefile @@ -9,6 +9,7 @@ LEVEL = ../.. TOOLNAME = llc +CXXFLAGS = -fno-rtti # Include this here so we can get the configuration of the targets # that have been configured for construction. We have to do this diff --git a/tools/lli/Makefile b/tools/lli/Makefile index 8f6eeed486..2341bed3dd 100644 --- a/tools/lli/Makefile +++ b/tools/lli/Makefile @@ -9,6 +9,7 @@ LEVEL := ../.. TOOLNAME := lli +CXXFLAGS = -fno-rtti LINK_COMPONENTS := jit interpreter nativecodegen bitreader selectiondag # Enable JIT support diff --git a/tools/llvm-ar/Makefile b/tools/llvm-ar/Makefile index e4fe4e8ca3..3db7964ad1 100644 --- a/tools/llvm-ar/Makefile +++ b/tools/llvm-ar/Makefile @@ -11,6 +11,7 @@ LEVEL = ../.. TOOLNAME = llvm-ar LINK_COMPONENTS = archive REQUIRES_EH := 1 +#CXXFLAGS = -fno-rtti # This tool has no plugins, optimize startup time. TOOL_NO_EXPORTS = 1 diff --git a/tools/llvm-as/Makefile b/tools/llvm-as/Makefile index ae449c479a..d6fbd710fa 100644 --- a/tools/llvm-as/Makefile +++ b/tools/llvm-as/Makefile @@ -10,7 +10,7 @@ LEVEL = ../.. TOOLNAME = llvm-as LINK_COMPONENTS := asmparser bitwriter -REQUIRES_EH := 1 +CXXFLAGS = -fno-rtti # This tool has no plugins, optimize startup time. TOOL_NO_EXPORTS = 1 diff --git a/tools/llvm-bcanalyzer/Makefile b/tools/llvm-bcanalyzer/Makefile index 251f758606..488387d5da 100644 --- a/tools/llvm-bcanalyzer/Makefile +++ b/tools/llvm-bcanalyzer/Makefile @@ -10,7 +10,6 @@ LEVEL = ../.. TOOLNAME = llvm-bcanalyzer LINK_COMPONENTS := bitreader -REQUIRES_EH := 1 # This tool has no plugins, optimize startup time. TOOL_NO_EXPORTS = 1 diff --git a/tools/llvm-config/Makefile b/tools/llvm-config/Makefile index 6eedca07b5..e5bdc04063 100644 --- a/tools/llvm-config/Makefile +++ b/tools/llvm-config/Makefile @@ -10,7 +10,6 @@ LEVEL = ../.. EXTRA_DIST = LibDeps.txt FinalLibDeps.txt llvm-config.in.in find-cycles.pl -REQUIRES_EH := 1 include $(LEVEL)/Makefile.common diff --git a/tools/llvm-dis/Makefile b/tools/llvm-dis/Makefile index dfd5e34981..96f3cbb568 100644 --- a/tools/llvm-dis/Makefile +++ b/tools/llvm-dis/Makefile @@ -10,7 +10,7 @@ LEVEL = ../.. TOOLNAME = llvm-dis LINK_COMPONENTS := bitreader -REQUIRES_EH := 1 +CXXFLAGS = -fno-rtti # This tool has no plugins, optimize startup time. TOOL_NO_EXPORTS = 1 diff --git a/tools/llvm-extract/Makefile b/tools/llvm-extract/Makefile index 5672aa3299..dee057270f 100644 --- a/tools/llvm-extract/Makefile +++ b/tools/llvm-extract/Makefile @@ -11,6 +11,7 @@ LEVEL = ../.. TOOLNAME = llvm-extract LINK_COMPONENTS := ipo bitreader bitwriter asmparser +CXXFLAGS = -fno-rtti # This tool has no plugins, optimize startup time. TOOL_NO_EXPORTS = 1 diff --git a/tools/llvm-ld/Makefile b/tools/llvm-ld/Makefile index 1ef9bf1174..1da19665a3 100644 --- a/tools/llvm-ld/Makefile +++ b/tools/llvm-ld/Makefile @@ -11,5 +11,6 @@ LEVEL = ../.. TOOLNAME = llvm-ld LINK_COMPONENTS = ipo scalaropts linker archive bitwriter +CXXFLAGS = -fno-rtti include $(LEVEL)/Makefile.common diff --git a/tools/llvm-link/Makefile b/tools/llvm-link/Makefile index 26370187c5..de592aae6a 100644 --- a/tools/llvm-link/Makefile +++ b/tools/llvm-link/Makefile @@ -10,6 +10,7 @@ LEVEL = ../.. TOOLNAME = llvm-link LINK_COMPONENTS = linker bitreader bitwriter asmparser +CXXFLAGS = -fno-rtti # This tool has no plugins, optimize startup time. TOOL_NO_EXPORTS = 1 diff --git a/tools/llvm-mc/Makefile b/tools/llvm-mc/Makefile index 5b0fe3f544..5ce1a8f7a8 100644 --- a/tools/llvm-mc/Makefile +++ b/tools/llvm-mc/Makefile @@ -13,6 +13,7 @@ TOOLNAME = llvm-mc # This tool has no plugins, optimize startup time. TOOL_NO_EXPORTS = 1 NO_INSTALL = 1 +CXXFLAGS = -fno-rtti # Include this here so we can get the configuration of the targets # that have been configured for construction. We have to do this diff --git a/tools/llvm-nm/Makefile b/tools/llvm-nm/Makefile index ecf5f8c3dc..bdefaa6248 100644 --- a/tools/llvm-nm/Makefile +++ b/tools/llvm-nm/Makefile @@ -13,5 +13,6 @@ LINK_COMPONENTS = archive bitreader # This tool has no plugins, optimize startup time. TOOL_NO_EXPORTS = 1 +CXXFLAGS = -fno-rtti include $(LEVEL)/Makefile.common diff --git a/tools/llvm-prof/Makefile b/tools/llvm-prof/Makefile index 86eb54d51b..b1fd3304f1 100644 --- a/tools/llvm-prof/Makefile +++ b/tools/llvm-prof/Makefile @@ -13,5 +13,6 @@ LINK_COMPONENTS = bitreader analysis # This tool has no plugins, optimize startup time. TOOL_NO_EXPORTS = 1 +CXXFLAGS = -fno-rtti include $(LEVEL)/Makefile.common diff --git a/tools/lto/Makefile b/tools/lto/Makefile index 3120aa52c9..f0bc67c50c 100644 --- a/tools/lto/Makefile +++ b/tools/lto/Makefile @@ -17,6 +17,7 @@ include $(LEVEL)/Makefile.config LINK_LIBS_IN_SHARED = 1 SHARED_LIBRARY = 1 +CXXFLAGS = -fno-rtti LINK_COMPONENTS := $(TARGETS_TO_BUILD) ipo scalaropts linker bitreader bitwriter diff --git a/tools/opt/Makefile b/tools/opt/Makefile index 726cad8712..2f184a679b 100644 --- a/tools/opt/Makefile +++ b/tools/opt/Makefile @@ -8,6 +8,7 @@ ##===----------------------------------------------------------------------===## LEVEL = ../.. TOOLNAME = opt +CXXFLAGS = -fno-rtti LINK_COMPONENTS := bitreader bitwriter asmparser instrumentation scalaropts ipo -- cgit v1.2.3