diff options
| author | Rafael Espindola <rafael.espindola@gmail.com> | 2014-02-19 17:23:20 +0000 |
|---|---|---|
| committer | Rafael Espindola <rafael.espindola@gmail.com> | 2014-02-19 17:23:20 +0000 |
| commit | 737c9f6005594898eed4746cd310cd161ef209c6 (patch) | |
| tree | 2990b943f1db8362282b23b6c1d01019f24dd96f /examples | |
| parent | cf42174647af5265e35f0e15fbffa17445ae0e80 (diff) | |
| download | llvm-737c9f6005594898eed4746cd310cd161ef209c6.tar.gz llvm-737c9f6005594898eed4746cd310cd161ef209c6.tar.bz2 llvm-737c9f6005594898eed4746cd310cd161ef209c6.tar.xz | |
Add back r201608, r201622, r201624 and r201625
r201608 made llvm corretly handle private globals with MachO. r201622 fixed
a bug in it and r201624 and r201625 were changes for using private linkage,
assuming that llvm would do the right thing.
They all got reverted because r201608 introduced a crash in LTO. This patch
includes a fix for that. The issue was that TargetLoweringObjectFile now has
to be initialized before we can mangle names of private globals. This is
trivially true during the normal codegen pipeline (the asm printer does it),
but LTO has to do it manually.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@201700 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/ExceptionDemo/ExceptionDemo.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/ExceptionDemo/ExceptionDemo.cpp b/examples/ExceptionDemo/ExceptionDemo.cpp index be357730e6..d997cc55a9 100644 --- a/examples/ExceptionDemo/ExceptionDemo.cpp +++ b/examples/ExceptionDemo/ExceptionDemo.cpp @@ -915,7 +915,7 @@ void generateStringPrint(llvm::LLVMContext &context, new llvm::GlobalVariable(module, stringConstant->getType(), true, - llvm::GlobalValue::LinkerPrivateLinkage, + llvm::GlobalValue::PrivateLinkage, stringConstant, ""); } @@ -959,7 +959,7 @@ void generateIntegerPrint(llvm::LLVMContext &context, new llvm::GlobalVariable(module, stringConstant->getType(), true, - llvm::GlobalValue::LinkerPrivateLinkage, + llvm::GlobalValue::PrivateLinkage, stringConstant, ""); } |