diff options
author | Rafael Espindola <rafael.espindola@gmail.com> | 2013-05-17 22:45:52 +0000 |
---|---|---|
committer | Rafael Espindola <rafael.espindola@gmail.com> | 2013-05-17 22:45:52 +0000 |
commit | 5986ce0e5dfa6a91e18b7aa056f8d825de6d3ebc (patch) | |
tree | 43bf1c007d73652c49d2cc5fb3467b2930398ef4 /llvm | |
parent | 94c2fea6db31e480ba847bd0a0fe2ac28d41c82d (diff) | |
download | bcm5719-llvm-5986ce0e5dfa6a91e18b7aa056f8d825de6d3ebc.tar.gz bcm5719-llvm-5986ce0e5dfa6a91e18b7aa056f8d825de6d3ebc.zip |
Fix the build in c++11 mode.
The errors were:
non-constant-expression cannot be narrowed from type 'int64_t' (aka 'long') to 'uint32_t' (aka 'unsigned int') in initializer list
and
non-constant-expression cannot be narrowed from type 'long' to 'uint32_t' (aka 'unsigned int') in initializer list
llvm-svn: 182168
Diffstat (limited to 'llvm')
-rw-r--r-- | llvm/lib/Target/R600/MCTargetDesc/R600MCCodeEmitter.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/llvm/lib/Target/R600/MCTargetDesc/R600MCCodeEmitter.cpp b/llvm/lib/Target/R600/MCTargetDesc/R600MCCodeEmitter.cpp index 59f717ac5f0..d93eb1cd6d1 100644 --- a/llvm/lib/Target/R600/MCTargetDesc/R600MCCodeEmitter.cpp +++ b/llvm/lib/Target/R600/MCTargetDesc/R600MCCodeEmitter.cpp @@ -107,13 +107,13 @@ void R600MCCodeEmitter::EncodeInstruction(const MCInst &MI, raw_ostream &OS, } else if (IS_TEX(Desc)) { int64_t Sampler = MI.getOperand(14).getImm(); - uint32_t SrcSelect[4] = { + int64_t SrcSelect[4] = { MI.getOperand(2).getImm(), MI.getOperand(3).getImm(), MI.getOperand(4).getImm(), MI.getOperand(5).getImm() }; - uint32_t Offsets[3] = { + long Offsets[3] = { MI.getOperand(6).getImm() & 0x1F, MI.getOperand(7).getImm() & 0x1F, MI.getOperand(8).getImm() & 0x1F |