diff options
| author | Chris Lattner <sabre@nondot.org> | 2010-06-05 04:17:30 +0000 |
|---|---|---|
| committer | Chris Lattner <sabre@nondot.org> | 2010-06-05 04:17:30 +0000 |
| commit | 1087f54ddb70bd2a7ab62608161e4a3f0c345935 (patch) | |
| tree | dc95c8cba3a2dd08aa0facb0293c7689bca5e6bb /include/llvm/Target | |
| parent | 3eca98bb3ab1ec27ab8763298c416d282cdaa261 (diff) | |
| download | external_llvm-1087f54ddb70bd2a7ab62608161e4a3f0c345935.zip external_llvm-1087f54ddb70bd2a7ab62608161e4a3f0c345935.tar.gz external_llvm-1087f54ddb70bd2a7ab62608161e4a3f0c345935.tar.bz2 | |
revert r105521, which is breaking the buildbots with stuff like this:
In file included from X86InstrInfo.cpp:16:
X86GenInstrInfo.inc:2789: error: integer constant is too large for 'long' type
X86GenInstrInfo.inc:2790: error: integer constant is too large for 'long' type
X86GenInstrInfo.inc:2792: error: integer constant is too large for 'long' type
X86GenInstrInfo.inc:2793: error: integer constant is too large for 'long' type
X86GenInstrInfo.inc:2808: error: integer constant is too large for 'long' type
X86GenInstrInfo.inc:2809: error: integer constant is too large for 'long' type
X86GenInstrInfo.inc:2816: error: integer constant is too large for 'long' type
X86GenInstrInfo.inc:2817: error: integer constant is too large for 'long' type
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@105524 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include/llvm/Target')
| -rw-r--r-- | include/llvm/Target/Target.td | 2 | ||||
| -rw-r--r-- | include/llvm/Target/TargetInstrDesc.h | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/include/llvm/Target/Target.td b/include/llvm/Target/Target.td index 6379459..ca551e5 100644 --- a/include/llvm/Target/Target.td +++ b/include/llvm/Target/Target.td @@ -244,7 +244,7 @@ class Instruction { string DisableEncoding = ""; /// Target-specific flags. This becomes the TSFlags field in TargetInstrDesc. - bits<64> TSFlags = 0; + bits<32> TSFlags = 0; } /// Predicates - These are extra conditionals which are turned into instruction diff --git a/include/llvm/Target/TargetInstrDesc.h b/include/llvm/Target/TargetInstrDesc.h index a004f95..adc37e1 100644 --- a/include/llvm/Target/TargetInstrDesc.h +++ b/include/llvm/Target/TargetInstrDesc.h @@ -15,8 +15,6 @@ #ifndef LLVM_TARGET_TARGETINSTRDESC_H #define LLVM_TARGET_TARGETINSTRDESC_H -#include "llvm/System/DataTypes.h" - namespace llvm { class TargetRegisterClass; @@ -133,7 +131,7 @@ public: unsigned short SchedClass; // enum identifying instr sched class const char * Name; // Name of the instruction record in td file unsigned Flags; // Flags identifying machine instr class - uint64_t TSFlags; // Target Specific Flag values + unsigned TSFlags; // Target Specific Flag values const unsigned *ImplicitUses; // Registers implicitly read by this instr const unsigned *ImplicitDefs; // Registers implicitly defined by this instr const TargetRegisterClass **RCBarriers; // Reg classes completely "clobbered" |