summaryrefslogtreecommitdiff
path: root/lib/Target/R600/MCTargetDesc/AMDGPUMCTargetDesc.cpp
diff options
context:
space:
mode:
authorAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2013-06-12 21:27:20 +0200
committerAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2013-06-12 21:27:20 +0200
commit46ef71a74329a0777e3464c65927cd3e59c928d6 (patch)
treee8c06aeb70dcbe18acdf6db1f88a1452ac1dca68 /lib/Target/R600/MCTargetDesc/AMDGPUMCTargetDesc.cpp
parent32c493313c30abe0830e95dc92c7ad1c2241ba57 (diff)
parentce337502f5a88500df9ab2f59ab48f97be0b4395 (diff)
downloadllvm-46ef71a74329a0777e3464c65927cd3e59c928d6.tar.gz
llvm-46ef71a74329a0777e3464c65927cd3e59c928d6.tar.bz2
llvm-46ef71a74329a0777e3464c65927cd3e59c928d6.tar.xz
Merge branch 'release_33' of git://github.com/llvm-mirror/llvm into embtk-support-release-3.3
Diffstat (limited to 'lib/Target/R600/MCTargetDesc/AMDGPUMCTargetDesc.cpp')
-rw-r--r--lib/Target/R600/MCTargetDesc/AMDGPUMCTargetDesc.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Target/R600/MCTargetDesc/AMDGPUMCTargetDesc.cpp b/lib/Target/R600/MCTargetDesc/AMDGPUMCTargetDesc.cpp
index 45d009c2a0..61d70bb342 100644
--- a/lib/Target/R600/MCTargetDesc/AMDGPUMCTargetDesc.cpp
+++ b/lib/Target/R600/MCTargetDesc/AMDGPUMCTargetDesc.cpp
@@ -78,7 +78,7 @@ static MCCodeEmitter *createAMDGPUMCCodeEmitter(const MCInstrInfo &MCII,
if (STI.getFeatureBits() & AMDGPU::Feature64BitPtr) {
return createSIMCCodeEmitter(MCII, MRI, STI, Ctx);
} else {
- return createR600MCCodeEmitter(MCII, MRI, STI, Ctx);
+ return createR600MCCodeEmitter(MCII, MRI, STI);
}
}