summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBob Wilson <bob.wilson@apple.com>2010-11-17 21:25:33 +0000
committerBob Wilson <bob.wilson@apple.com>2010-11-17 21:25:33 +0000
commit59182fb4b5c2aa82a9e3d6cd0d69a46728e5fa73 (patch)
treeaedee3a5a5209d7f1af5bc7b31b36e0d76e386a4
parentf796d4b4698eef2e6fe72d4fea4668d0bc8a5775 (diff)
downloadbcm5719-llvm-59182fb4b5c2aa82a9e3d6cd0d69a46728e5fa73.tar.gz
bcm5719-llvm-59182fb4b5c2aa82a9e3d6cd0d69a46728e5fa73.zip
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. llvm-svn: 119564
-rw-r--r--llvm/lib/Target/ARM/ARMGlobalMerge.cpp2
-rw-r--r--llvm/test/CodeGen/ARM/global-merge.ll2
2 files changed, 2 insertions, 2 deletions
diff --git a/llvm/lib/Target/ARM/ARMGlobalMerge.cpp b/llvm/lib/Target/ARM/ARMGlobalMerge.cpp
index b25915a0bd3..44d523569eb 100644
--- a/llvm/lib/Target/ARM/ARMGlobalMerge.cpp
+++ b/llvm/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/llvm/test/CodeGen/ARM/global-merge.ll b/llvm/test/CodeGen/ARM/global-merge.ll
index 9cadebd9c5a..dcc16c07ef4 100644
--- a/llvm/test/CodeGen/ARM/global-merge.ll
+++ b/llvm/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
OpenPOWER on IntegriCloud