Skip to content

Commit 43b5f93

Browse files
committed
make -fno-rtti the default unless a directory builds with REQUIRES_RTTI.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@94378 91177308-0d34-0410-b5e6-96231b3b80d8
1 parent c0f8a36 commit 43b5f93

File tree

86 files changed

+7
-90
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+7
-90
lines changed

Makefile.rules

+3-3
Original file line numberDiff line numberDiff line change
@@ -386,9 +386,9 @@ ifdef REQUIRES_FRAME_POINTER
386386
endif
387387

388388
# If REQUIRES_RTTI=1 is specified then don't disable run-time type id.
389-
ifeq ($(REQUIRES_RTTI), 1)
390-
CXX.Flags := $(filter-out -fno-rtti,$(CXX.Flags))
391-
CXXFLAGS := $(filter-out -fno-rtti,$(CXXFLAGS))
389+
ifneq ($(REQUIRES_RTTI), 1)
390+
CXX.Flags += -fno-rtti
391+
CXXFLAGS += -fno-rtti
392392
endif
393393

394394
ifdef ENABLE_COVERAGE

lib/Analysis/IPA/Makefile

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
LEVEL = ../../..
1111
LIBRARYNAME = LLVMipa
1212
BUILD_ARCHIVE = 1
13-
CXXFLAGS = -fno-rtti
1413

1514
include $(LEVEL)/Makefile.common
1615

lib/Analysis/Makefile

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ LEVEL = ../..
1111
LIBRARYNAME = LLVMAnalysis
1212
DIRS = IPA
1313
BUILD_ARCHIVE = 1
14-
CXXFLAGS = -fno-rtti
1514

1615
include $(LEVEL)/Makefile.common
1716

lib/Archive/Makefile

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
LEVEL = ../..
1111
LIBRARYNAME = LLVMArchive
12-
CXXFLAGS = -fno-rtti
1312

1413
# We only want an archive so only those modules actually used by a tool are
1514
# included.

lib/AsmParser/Makefile

-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,5 @@
1010
LEVEL = ../..
1111
LIBRARYNAME := LLVMAsmParser
1212
BUILD_ARCHIVE = 1
13-
CXXFLAGS = -fno-rtti
1413

1514
include $(LEVEL)/Makefile.common

lib/Bitcode/Reader/Makefile

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
LEVEL = ../../..
1111
LIBRARYNAME = LLVMBitReader
1212
BUILD_ARCHIVE = 1
13-
CXXFLAGS = -fno-rtti
1413

1514
include $(LEVEL)/Makefile.common
1615

lib/Bitcode/Writer/Makefile

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
LEVEL = ../../..
1111
LIBRARYNAME = LLVMBitWriter
1212
BUILD_ARCHIVE = 1
13-
CXXFLAGS = -fno-rtti
1413

1514
include $(LEVEL)/Makefile.common
1615

lib/CodeGen/AsmPrinter/Makefile

-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,5 @@
99

1010
LEVEL = ../../..
1111
LIBRARYNAME = LLVMAsmPrinter
12-
CXXFLAGS = -fno-rtti
1312

1413
include $(LEVEL)/Makefile.common

lib/CodeGen/Makefile

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ LEVEL = ../..
1111
LIBRARYNAME = LLVMCodeGen
1212
PARALLEL_DIRS = SelectionDAG AsmPrinter
1313
BUILD_ARCHIVE = 1
14-
CXXFLAGS = -fno-rtti
1514

1615
include $(LEVEL)/Makefile.common
1716

lib/CodeGen/SelectionDAG/Makefile

-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,5 @@
99

1010
LEVEL = ../../..
1111
LIBRARYNAME = LLVMSelectionDAG
12-
CXXFLAGS = -fno-rtti
1312

1413
include $(LEVEL)/Makefile.common

lib/ExecutionEngine/Interpreter/Makefile

-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,5 @@
99

1010
LEVEL = ../../..
1111
LIBRARYNAME = LLVMInterpreter
12-
CXXFLAGS = -fno-rtti
1312

1413
include $(LEVEL)/Makefile.common

lib/ExecutionEngine/JIT/Makefile

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
LEVEL = ../../..
1111
LIBRARYNAME = LLVMJIT
12-
CXXFLAGS = -fno-rtti
1312

1413
# Get the $(ARCH) setting
1514
include $(LEVEL)/Makefile.config

lib/ExecutionEngine/Makefile

-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,5 @@
99
LEVEL = ../..
1010
LIBRARYNAME = LLVMExecutionEngine
1111
PARALLEL_DIRS = Interpreter JIT
12-
CXXFLAGS = -fno-rtti
1312

1413
include $(LEVEL)/Makefile.common

lib/Linker/Makefile

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
LEVEL = ../..
1111
LIBRARYNAME = LLVMLinker
1212
BUILD_ARCHIVE := 1
13-
CXXFLAGS = -fno-rtti
1413

1514
include $(LEVEL)/Makefile.common
1615

lib/MC/MCParser/Makefile

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
LEVEL = ../../..
1111
LIBRARYNAME = LLVMMCParser
1212
BUILD_ARCHIVE := 1
13-
CXXFLAGS = -fno-rtti
1413

1514
include $(LEVEL)/Makefile.common
1615

lib/MC/Makefile

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ LEVEL = ../..
1111
LIBRARYNAME = LLVMMC
1212
BUILD_ARCHIVE := 1
1313
PARALLEL_DIRS := MCParser
14-
CXXFLAGS = -fno-rtti
1514

1615
include $(LEVEL)/Makefile.common
1716

lib/Target/ARM/AsmParser/Makefile

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
##===----------------------------------------------------------------------===##
99
LEVEL = ../../../..
1010
LIBRARYNAME = LLVMARMAsmParser
11-
CXXFLAGS = -fno-rtti
1211

1312
# Hack: we need to include 'main' ARM target directory to grab private headers
1413
CPPFLAGS = -I$(PROJ_OBJ_DIR)/.. -I$(PROJ_SRC_DIR)/..

lib/Target/ARM/AsmPrinter/Makefile

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
##===----------------------------------------------------------------------===##
99
LEVEL = ../../../..
1010
LIBRARYNAME = LLVMARMAsmPrinter
11-
CXXFLAGS = -fno-rtti
1211

1312
# Hack: we need to include 'main' arm target directory to grab private headers
1413
CPPFLAGS = -I$(PROJ_OBJ_DIR)/.. -I$(PROJ_SRC_DIR)/..

lib/Target/ARM/Makefile

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
LEVEL = ../../..
1111
LIBRARYNAME = LLVMARMCodeGen
1212
TARGET = ARM
13-
CXXFLAGS = -fno-rtti
1413

1514
# Make sure that tblgen is run, first thing.
1615
BUILT_SOURCES = ARMGenRegisterInfo.h.inc ARMGenRegisterNames.inc \

lib/Target/ARM/TargetInfo/Makefile

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
##===----------------------------------------------------------------------===##
99
LEVEL = ../../../..
1010
LIBRARYNAME = LLVMARMInfo
11-
CXXFLAGS = -fno-rtti
1211

1312
# Hack: we need to include 'main' target directory to grab private headers
1413
CPPFLAGS = -I$(PROJ_OBJ_DIR)/.. -I$(PROJ_SRC_DIR)/..

lib/Target/Alpha/AsmPrinter/Makefile

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
##===----------------------------------------------------------------------===##
99
LEVEL = ../../../..
1010
LIBRARYNAME = LLVMAlphaAsmPrinter
11-
CXXFLAGS = -fno-rtti
1211

1312
# Hack: we need to include 'main' alpha target directory to grab private headers
1413
CPPFLAGS = -I$(PROJ_OBJ_DIR)/.. -I$(PROJ_SRC_DIR)/..

lib/Target/Alpha/Makefile

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
LEVEL = ../../..
1111
LIBRARYNAME = LLVMAlphaCodeGen
1212
TARGET = Alpha
13-
CXXFLAGS = -fno-rtti
1413

1514
# Make sure that tblgen is run, first thing.
1615
BUILT_SOURCES = AlphaGenRegisterInfo.h.inc AlphaGenRegisterNames.inc \

lib/Target/Alpha/TargetInfo/Makefile

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
##===----------------------------------------------------------------------===##
99
LEVEL = ../../../..
1010
LIBRARYNAME = LLVMAlphaInfo
11-
CXXFLAGS = -fno-rtti
1211

1312
# Hack: we need to include 'main' target directory to grab private headers
1413
CPPFLAGS = -I$(PROJ_OBJ_DIR)/.. -I$(PROJ_SRC_DIR)/..

lib/Target/Blackfin/AsmPrinter/Makefile

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
##===----------------------------------------------------------------------===##
99
LEVEL = ../../../..
1010
LIBRARYNAME = LLVMBlackfinAsmPrinter
11-
CXXFLAGS = -fno-rtti
1211

1312
# Hack: we need to include 'main' Blackfin target directory to grab private
1413
# headers

lib/Target/Blackfin/Makefile

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
LEVEL = ../../..
1111
LIBRARYNAME = LLVMBlackfinCodeGen
1212
TARGET = Blackfin
13-
CXXFLAGS = -fno-rtti
1413

1514
# Make sure that tblgen is run, first thing.
1615
BUILT_SOURCES = BlackfinGenRegisterInfo.h.inc BlackfinGenRegisterNames.inc \

lib/Target/Blackfin/TargetInfo/Makefile

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
##===----------------------------------------------------------------------===##
99
LEVEL = ../../../..
1010
LIBRARYNAME = LLVMBlackfinInfo
11-
CXXFLAGS = -fno-rtti
1211

1312
# Hack: we need to include 'main' target directory to grab private headers
1413
CPPFLAGS = -I$(PROJ_OBJ_DIR)/.. -I$(PROJ_SRC_DIR)/..

lib/Target/CBackend/Makefile

-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99

1010
LEVEL = ../../..
1111
LIBRARYNAME = LLVMCBackend
12-
CXXFLAGS = -fno-rtti
13-
1412
DIRS = TargetInfo
1513

1614
include $(LEVEL)/Makefile.common

lib/Target/CBackend/TargetInfo/Makefile

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
##===----------------------------------------------------------------------===##
99
LEVEL = ../../../..
1010
LIBRARYNAME = LLVMCBackendInfo
11-
CXXFLAGS = -fno-rtti
1211

1312
# Hack: we need to include 'main' target directory to grab private headers
1413
CPPFLAGS = -I$(PROJ_OBJ_DIR)/.. -I$(PROJ_SRC_DIR)/..

lib/Target/CellSPU/AsmPrinter/Makefile

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
LEVEL = ../../../..
1111
LIBRARYNAME = LLVMCellSPUAsmPrinter
12-
CXXFLAGS = -fno-rtti
1312

1413
# Hack: we need to include 'main' CellSPU target directory to grab
1514
# private headers

lib/Target/CellSPU/Makefile

-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
LEVEL = ../../..
1111
LIBRARYNAME = LLVMCellSPUCodeGen
1212
TARGET = SPU
13-
CXXFLAGS = -fno-rtti
14-
1513
BUILT_SOURCES = SPUGenInstrNames.inc SPUGenRegisterNames.inc \
1614
SPUGenAsmWriter.inc SPUGenCodeEmitter.inc \
1715
SPUGenRegisterInfo.h.inc SPUGenRegisterInfo.inc \

lib/Target/CellSPU/TargetInfo/Makefile

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
##===----------------------------------------------------------------------===##
99
LEVEL = ../../../..
1010
LIBRARYNAME = LLVMCellSPUInfo
11-
CXXFLAGS = -fno-rtti
1211

1312
# Hack: we need to include 'main' target directory to grab private headers
1413
CPPFLAGS = -I$(PROJ_OBJ_DIR)/.. -I$(PROJ_SRC_DIR)/..

lib/Target/CppBackend/Makefile

-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99

1010
LEVEL = ../../..
1111
LIBRARYNAME = LLVMCppBackend
12-
CXXFLAGS = -fno-rtti
13-
1412
DIRS = TargetInfo
1513

1614
include $(LEVEL)/Makefile.common

lib/Target/CppBackend/TargetInfo/Makefile

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
##===----------------------------------------------------------------------===##
99
LEVEL = ../../../..
1010
LIBRARYNAME = LLVMCppBackendInfo
11-
CXXFLAGS = -fno-rtti
1211

1312
# Hack: we need to include 'main' target directory to grab private headers
1413
CPPFLAGS = -I$(PROJ_OBJ_DIR)/.. -I$(PROJ_SRC_DIR)/..

lib/Target/MSIL/Makefile

-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99

1010
LEVEL = ../../..
1111
LIBRARYNAME = LLVMMSIL
12-
CXXFLAGS = -fno-rtti
13-
1412
DIRS = TargetInfo
1513

1614
include $(LEVEL)/Makefile.common

lib/Target/MSIL/TargetInfo/Makefile

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
##===----------------------------------------------------------------------===##
99
LEVEL = ../../../..
1010
LIBRARYNAME = LLVMMSILInfo
11-
CXXFLAGS = -fno-rtti
1211

1312
# Hack: we need to include 'main' target directory to grab private headers
1413
CPPFLAGS = -I$(PROJ_OBJ_DIR)/.. -I$(PROJ_SRC_DIR)/..

lib/Target/MSP430/AsmPrinter/Makefile

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
##===----------------------------------------------------------------------===##
99
LEVEL = ../../../..
1010
LIBRARYNAME = LLVMMSP430AsmPrinter
11-
CXXFLAGS = -fno-rtti
1211

1312
# Hack: we need to include 'main' MSP430 target directory to grab private headers
1413
CPPFLAGS = -I$(PROJ_OBJ_DIR)/.. -I$(PROJ_SRC_DIR)/..

lib/Target/MSP430/Makefile

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
LEVEL = ../../..
1111
LIBRARYNAME = LLVMMSP430CodeGen
1212
TARGET = MSP430
13-
CXXFLAGS = -fno-rtti
1413

1514
# Make sure that tblgen is run, first thing.
1615
BUILT_SOURCES = MSP430GenRegisterInfo.h.inc MSP430GenRegisterNames.inc \

lib/Target/MSP430/TargetInfo/Makefile

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
##===----------------------------------------------------------------------===##
99
LEVEL = ../../../..
1010
LIBRARYNAME = LLVMMSP430Info
11-
CXXFLAGS = -fno-rtti
1211

1312
# Hack: we need to include 'main' target directory to grab private headers
1413
CPPFLAGS = -I$(PROJ_OBJ_DIR)/.. -I$(PROJ_SRC_DIR)/..

lib/Target/Makefile

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
LEVEL = ../..
1111
LIBRARYNAME = LLVMTarget
1212
BUILD_ARCHIVE = 1
13-
CXXFLAGS = -fno-rtti
1413

1514
# We include this early so we can access the value of TARGETS_TO_BUILD as the
1615
# value for PARALLEL_DIRS which must be set before Makefile.rules is included

lib/Target/Mips/AsmPrinter/Makefile

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
LEVEL = ../../../..
1111
LIBRARYNAME = LLVMMipsAsmPrinter
12-
CXXFLAGS = -fno-rtti
1312

1413
# Hack: we need to include 'main' Mips target directory to grab
1514
# private headers

lib/Target/Mips/Makefile

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
LEVEL = ../../..
1111
LIBRARYNAME = LLVMMipsCodeGen
1212
TARGET = Mips
13-
CXXFLAGS = -fno-rtti
1413

1514
# Make sure that tblgen is run, first thing.
1615
BUILT_SOURCES = MipsGenRegisterInfo.h.inc MipsGenRegisterNames.inc \

lib/Target/Mips/TargetInfo/Makefile

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
##===----------------------------------------------------------------------===##
99
LEVEL = ../../../..
1010
LIBRARYNAME = LLVMMipsInfo
11-
CXXFLAGS = -fno-rtti
1211

1312
# Hack: we need to include 'main' target directory to grab private headers
1413
CPPFLAGS = -I$(PROJ_OBJ_DIR)/.. -I$(PROJ_SRC_DIR)/..

lib/Target/PIC16/AsmPrinter/Makefile

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
##===----------------------------------------------------------------------===##
99
LEVEL = ../../../..
1010
LIBRARYNAME = LLVMPIC16AsmPrinter
11-
CXXFLAGS = -fno-rtti
1211

1312
# Hack: we need to include 'main' pic16 target directory to grab private headers
1413
CPPFLAGS = -I$(PROJ_OBJ_DIR)/.. -I$(PROJ_SRC_DIR)/..

lib/Target/PIC16/Makefile

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
LEVEL = ../../..
1111
LIBRARYNAME = LLVMPIC16CodeGen
1212
TARGET = PIC16
13-
CXXFLAGS = -fno-rtti
1413

1514
# Make sure that tblgen is run, first thing.
1615
BUILT_SOURCES = PIC16GenRegisterInfo.h.inc PIC16GenRegisterNames.inc \

lib/Target/PIC16/PIC16Passes/Makefile

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ LEVEL = ../../../..
1010
TARGET = PIC16
1111
LIBRARYNAME = LLVMpic16passes
1212
BUILD_ARCHIVE = 1
13-
CXXFLAGS = -fno-rtti
1413

1514
include $(LEVEL)/Makefile.common
1615

lib/Target/PIC16/TargetInfo/Makefile

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
##===----------------------------------------------------------------------===##
99
LEVEL = ../../../..
1010
LIBRARYNAME = LLVMPIC16Info
11-
CXXFLAGS = -fno-rtti
1211

1312
# Hack: we need to include 'main' target directory to grab private headers
1413
CPPFLAGS = -I$(PROJ_OBJ_DIR)/.. -I$(PROJ_SRC_DIR)/..

lib/Target/PowerPC/AsmPrinter/Makefile

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
##===----------------------------------------------------------------------===##
99
LEVEL = ../../../..
1010
LIBRARYNAME = LLVMPowerPCAsmPrinter
11-
CXXFLAGS = -fno-rtti
1211

1312
# Hack: we need to include 'main' PowerPC target directory to grab private headers
1413
CPPFLAGS = -I$(PROJ_OBJ_DIR)/.. -I$(PROJ_SRC_DIR)/..

lib/Target/PowerPC/Makefile

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
LEVEL = ../../..
1111
LIBRARYNAME = LLVMPowerPCCodeGen
1212
TARGET = PPC
13-
CXXFLAGS = -fno-rtti
1413

1514
# Make sure that tblgen is run, first thing.
1615
BUILT_SOURCES = PPCGenInstrNames.inc PPCGenRegisterNames.inc \

lib/Target/PowerPC/TargetInfo/Makefile

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
##===----------------------------------------------------------------------===##
99
LEVEL = ../../../..
1010
LIBRARYNAME = LLVMPowerPCInfo
11-
CXXFLAGS = -fno-rtti
1211

1312
# Hack: we need to include 'main' target directory to grab private headers
1413
CPPFLAGS = -I$(PROJ_OBJ_DIR)/.. -I$(PROJ_SRC_DIR)/..

0 commit comments

Comments
 (0)