diff options
| author | rdivacky <rdivacky@FreeBSD.org> | 2010-01-23 11:09:33 +0000 |
|---|---|---|
| committer | rdivacky <rdivacky@FreeBSD.org> | 2010-01-23 11:09:33 +0000 |
| commit | 3fd58f91dd318518f7daa4ba64c0aaf31799d89b (patch) | |
| tree | 74eecbae571601ec6a626a53374b1eddc7b164a5 /lib/Linker | |
| parent | 3fba7d16b41dfbefe3b1be6bc0ab94c017728f79 (diff) | |
| download | FreeBSD-src-3fd58f91dd318518f7daa4ba64c0aaf31799d89b.zip FreeBSD-src-3fd58f91dd318518f7daa4ba64c0aaf31799d89b.tar.gz | |
Update LLVM to r94309.
Diffstat (limited to 'lib/Linker')
| -rw-r--r-- | lib/Linker/LinkModules.cpp | 2 | ||||
| -rw-r--r-- | lib/Linker/Makefile | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/Linker/LinkModules.cpp b/lib/Linker/LinkModules.cpp index dcd696c..e2cd47a 100644 --- a/lib/Linker/LinkModules.cpp +++ b/lib/Linker/LinkModules.cpp @@ -392,7 +392,7 @@ static Value *RemapOperand(const Value *In, assert(!isa<GlobalValue>(CPV) && "Unmapped global?"); llvm_unreachable("Unknown type of derived type constant value!"); } - } else if (isa<MetadataBase>(In)) { + } else if (isa<MDNode>(In) || isa<MDString>(In)) { Result = const_cast<Value*>(In); } else if (isa<InlineAsm>(In)) { Result = const_cast<Value*>(In); diff --git a/lib/Linker/Makefile b/lib/Linker/Makefile index 19e646b..2179fd2 100644 --- a/lib/Linker/Makefile +++ b/lib/Linker/Makefile @@ -10,6 +10,7 @@ LEVEL = ../.. LIBRARYNAME = LLVMLinker BUILD_ARCHIVE := 1 +CXXFLAGS = -fno-rtti include $(LEVEL)/Makefile.common |
