aboutsummaryrefslogtreecommitdiffstats
path: root/lib/Target/ARM/ARMGlobalMerge.cpp
diff options
context:
space:
mode:
authorOwen Anderson <resistor@mac.com>2010-08-06 18:33:48 +0000
committerOwen Anderson <resistor@mac.com>2010-08-06 18:33:48 +0000
commit7569322765651f19eea0609fb082e6b267d5d2b5 (patch)
tree3a2949af3670eddb92860ca641fab8a0e27e0e7b /lib/Target/ARM/ARMGlobalMerge.cpp
parent30dd9ac0401726e553ae8f5e35cfba3db45bbcb5 (diff)
downloadexternal_llvm-7569322765651f19eea0609fb082e6b267d5d2b5.zip
external_llvm-7569322765651f19eea0609fb082e6b267d5d2b5.tar.gz
external_llvm-7569322765651f19eea0609fb082e6b267d5d2b5.tar.bz2
Reapply r110396, with fixes to appease the Linux buildbot gods.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@110460 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Target/ARM/ARMGlobalMerge.cpp')
-rw-r--r--lib/Target/ARM/ARMGlobalMerge.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Target/ARM/ARMGlobalMerge.cpp b/lib/Target/ARM/ARMGlobalMerge.cpp
index af7298a..85b0c6c 100644
--- a/lib/Target/ARM/ARMGlobalMerge.cpp
+++ b/lib/Target/ARM/ARMGlobalMerge.cpp
@@ -78,7 +78,7 @@ namespace {
public:
static char ID; // Pass identification, replacement for typeid.
explicit ARMGlobalMerge(const TargetLowering *tli)
- : FunctionPass(&ID), TLI(tli) {}
+ : FunctionPass(ID), TLI(tli) {}
virtual bool doInitialization(Module &M);
virtual bool runOnFunction(Function& F);