diff options
| author | Chris Lattner <sabre@nondot.org> | 2005-01-16 01:31:31 +0000 |
|---|---|---|
| committer | Chris Lattner <sabre@nondot.org> | 2005-01-16 01:31:31 +0000 |
| commit | 638559aaa3a30cef596fae20292295cb0a329df1 (patch) | |
| tree | ce177d7b346073accd1b92edaef3b7904c749c08 /lib | |
| parent | 3eb223eaf707b576a799b07dcc55cc8c1183379e (diff) | |
Improve compatiblity with HPUX on Itanium, patch by Duraid Madina
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@19586 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp | 2 | ||||
| -rw-r--r-- | lib/Target/TargetSchedInfo.cpp | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp b/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp index 8b282a03f0..d2a67411de 100644 --- a/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp +++ b/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp @@ -461,7 +461,7 @@ GenericValue lle_X_scanf(FunctionType *M, const vector<GenericValue> &args) { // int clock(void) - Profiling implementation GenericValue lle_i_clock(FunctionType *M, const vector<GenericValue> &Args) { - extern int clock(void); + extern unsigned int clock(void); GenericValue GV; GV.IntVal = clock(); return GV; } diff --git a/lib/Target/TargetSchedInfo.cpp b/lib/Target/TargetSchedInfo.cpp index adf913723d..b2f66dbdee 100644 --- a/lib/Target/TargetSchedInfo.cpp +++ b/lib/Target/TargetSchedInfo.cpp @@ -61,22 +61,22 @@ RUConflict(const std::vector<resourceId_t>& fromRVec, } -static cycles_t +static CycleCount_t ComputeMinGap(const InstrRUsage &fromRU, const InstrRUsage &toRU) { - cycles_t minGap = 0; + CycleCount_t minGap = 0; if (fromRU.numBubbles > 0) minGap = fromRU.numBubbles; if (minGap < fromRU.numCycles) { // only need to check from cycle `minGap' onwards - for (cycles_t gap=minGap; gap <= fromRU.numCycles-1; gap++) { + for (CycleCount_t gap=minGap; gap <= fromRU.numCycles-1; gap++) { // check if instr. #2 can start executing `gap' cycles after #1 // by checking for resource conflicts in each overlapping cycle - cycles_t numOverlap =std::min(fromRU.numCycles - gap, toRU.numCycles); - for (cycles_t c = 0; c <= numOverlap-1; c++) + CycleCount_t numOverlap =std::min(fromRU.numCycles - gap, toRU.numCycles); + for (CycleCount_t c = 0; c <= numOverlap-1; c++) if (RUConflict(fromRU.resourcesByCycle[gap + c], toRU.resourcesByCycle[c])) { // conflict found so minGap must be more than `gap' |