diff options
| author | Bob Wilson <bob.wilson@apple.com> | 2010-11-17 21:25:33 +0000 |
|---|---|---|
| committer | Bob Wilson <bob.wilson@apple.com> | 2010-11-17 21:25:33 +0000 |
| commit | 72831dc905c2354fc08762dbfd5f1b20fbd5b18b (patch) | |
| tree | 776e2e4f1627783e4d31858bbf0ff55e470ecbd5 | |
| parent | edf046716ce7d0da9479c37a5bbb6dd33ce6d390 (diff) | |
| download | llvm-72831dc905c2354fc08762dbfd5f1b20fbd5b18b.tar.gz llvm-72831dc905c2354fc08762dbfd5f1b20fbd5b18b.tar.bz2 llvm-72831dc905c2354fc08762dbfd5f1b20fbd5b18b.tar.xz | |
Change the symbol for merged globals from "merged" to "_MergedGlobals".
This makes it more clear that the symbol is an internal, compiler-generated
name and gives a little more description about its contents.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@119564 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Target/ARM/ARMGlobalMerge.cpp | 2 | ||||
| -rw-r--r-- | test/CodeGen/ARM/global-merge.ll | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/Target/ARM/ARMGlobalMerge.cpp b/lib/Target/ARM/ARMGlobalMerge.cpp index b25915a0bd..44d523569e 100644 --- a/lib/Target/ARM/ARMGlobalMerge.cpp +++ b/lib/Target/ARM/ARMGlobalMerge.cpp @@ -140,7 +140,7 @@ bool ARMGlobalMerge::doMerge(SmallVectorImpl<GlobalVariable*> &Globals, Constant *MergedInit = ConstantStruct::get(MergedTy, Inits); GlobalVariable *MergedGV = new GlobalVariable(M, MergedTy, isConst, GlobalValue::InternalLinkage, - MergedInit, "merged"); + MergedInit, "_MergedGlobals"); for (size_t k = i; k < j; ++k) { Constant *Idx[2] = { ConstantInt::get(Int32Ty, 0), diff --git a/test/CodeGen/ARM/global-merge.ll b/test/CodeGen/ARM/global-merge.ll index 9cadebd9c5..dcc16c07ef 100644 --- a/test/CodeGen/ARM/global-merge.ll +++ b/test/CodeGen/ARM/global-merge.ll @@ -6,6 +6,6 @@ ; CHECK: g0: @g0 = internal global [32 x i32] [ i32 1, i32 2, i32 3, i32 4, i32 5, i32 6, i32 7, i32 8, i32 9, i32 10, i32 1, i32 2, i32 3, i32 4, i32 5, i32 6, i32 7, i32 8, i32 9, i32 10, i32 1, i32 2, i32 3, i32 4, i32 5, i32 6, i32 7, i32 8, i32 9, i32 10, i32 1, i32 2 ] -; CHECK: merged: +; CHECK: _MergedGlobals: @g1 = internal global i32 1 @g2 = internal global i32 2 |