From vadve at cs.uiuc.edu Mon Sep 8 10:33:02 2003 From: vadve at cs.uiuc.edu (Vikram Adve) Date: Mon Sep 8 10:33:02 2003 Subject: [llvm-commits] CVS: llvm/utils/makellvm Message-ID: <200309081532.KAA07166@psmith.cs.uiuc.edu> Changes in directory llvm/utils: makellvm updated: 1.6 -> 1.7 --- Log message: Fix syntax error when makellvm is run in an invalid directory. Add debugging support. --- Diffs of the changes: Index: llvm/utils/makellvm diff -u llvm/utils/makellvm:1.6 llvm/utils/makellvm:1.7 --- llvm/utils/makellvm:1.6 Tue Jul 22 07:35:28 2003 +++ llvm/utils/makellvm Mon Sep 8 10:32:47 2003 @@ -6,6 +6,7 @@ set EXEC = opt set GMAKE_OPTS = "" +set DEBUG = 0 set doit = 1 unset options_done @@ -18,6 +19,8 @@ shift argv; set MFILE = $argv[1]; shift argv; breaksw case -n : set doit = 0; shift argv; breaksw + case -d : + set doit = 0; set DEBUG = 1; shift argv; breaksw case -* : set GMAKE_OPTS = ( $GMAKE_OPTS $argv[1] ); shift argv; breaksw default : @@ -39,6 +42,9 @@ if ($#argv > 0) then set EXEC = $argv[1] endif +if ($DEBUG) then + echo "DEBUG: EXEC = $EXEC" +endif ## Compute LLVMDIR: the root of the current LLVM tree. ## It is recorded in the variable LEVEL in Makefile, to compute it @@ -52,15 +58,22 @@ set MFILE = Makefile endif endif +if ($DEBUG) then + echo "DEBUG: MFILE = $MFILE" +endif if (! -f $MFILE) then echo "Missing or invalid makefile: $MFILE" exit 1 endif set LLVMDIR = `awk '/LEVEL[ ]*=/ {print $NF}' $MFILE` +if ($DEBUG) then + echo "DEBUG: LLVMDIR = $LLVMDIR" +endif -if ($?LLVMDIR == 0 || ! -d $LLVMDIR) then - echo "Unable to find LEVEL or LEVEL is invalid ($LEVEL)" +if ($#LLVMDIR == 0 || ! -d "$LLVMDIR") then + echo "Unable to find LLVM obj-root directory or directory is invalid." + echo "Are you within a valid LLVM directory for running gmake?" exit 1 endif From lattner at cs.uiuc.edu Mon Sep 8 11:30:03 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Mon Sep 8 11:30:03 2003 Subject: [llvm-commits] CVS: llvm/test/Regression/Transforms/GCSE/gcsetests.ll Message-ID: <200309081629.LAA09657@apoc.cs.uiuc.edu> Changes in directory llvm/test/Regression/Transforms/GCSE: gcsetests.ll updated: 1.2 -> 1.3 --- Log message: Fix old style test --- Diffs of the changes: Index: llvm/test/Regression/Transforms/GCSE/gcsetests.ll diff -u llvm/test/Regression/Transforms/GCSE/gcsetests.ll:1.2 llvm/test/Regression/Transforms/GCSE/gcsetests.ll:1.3 --- llvm/test/Regression/Transforms/GCSE/gcsetests.ll:1.2 Wed Aug 14 14:28:22 2002 +++ llvm/test/Regression/Transforms/GCSE/gcsetests.ll Mon Sep 8 11:29:02 2003 @@ -12,9 +12,9 @@ %C = shl int %i, ubyte 1 %D = shl int %i, ubyte 1 - %E = getelementptr int* %p, uint 12 - %F = getelementptr int* %p, uint 12 - %G = getelementptr int* %p, uint 13 + %E = getelementptr int* %p, long 12 + %F = getelementptr int* %p, long 12 + %G = getelementptr int* %p, long 13 ret void end From lattner at cs.uiuc.edu Mon Sep 8 12:43:04 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Mon Sep 8 12:43:04 2003 Subject: [llvm-commits] CVS: llvm/test/QMTestDB/regression.qms/transforms.qms/gcse.qms/rle-preserve-volatile.qmt Message-ID: <200309081742.MAA09861@apoc.cs.uiuc.edu> Changes in directory llvm/test/QMTestDB/regression.qms/transforms.qms/gcse.qms: rle-preserve-volatile.qmt added (r1.1) --- Log message: New testcase --- Diffs of the changes: Index: llvm/test/QMTestDB/regression.qms/transforms.qms/gcse.qms/rle-preserve-volatile.qmt diff -c /dev/null llvm/test/QMTestDB/regression.qms/transforms.qms/gcse.qms/rle-preserve-volatile.qmt:1.1 *** /dev/null Mon Sep 8 12:42:17 2003 --- llvm/test/QMTestDB/regression.qms/transforms.qms/gcse.qms/rle-preserve-volatile.qmt Mon Sep 8 12:42:07 2003 *************** *** 0 **** --- 1,2 ---- + + .*test/Regression/Transforms/GCSE/RLE-Preserve-Volatile.ll \ No newline at end of file From lattner at cs.uiuc.edu Mon Sep 8 12:44:02 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Mon Sep 8 12:44:02 2003 Subject: [llvm-commits] CVS: llvm/test/Regression/Transforms/GCSE/RLE-Preserve-Volatile.ll Message-ID: <200309081743.MAA10007@apoc.cs.uiuc.edu> Changes in directory llvm/test/Regression/Transforms/GCSE: RLE-Preserve-Volatile.ll added (r1.1) --- Log message: New testcase --- Diffs of the changes: Index: llvm/test/Regression/Transforms/GCSE/RLE-Preserve-Volatile.ll diff -c /dev/null llvm/test/Regression/Transforms/GCSE/RLE-Preserve-Volatile.ll:1.1 *** /dev/null Mon Sep 8 12:43:46 2003 --- llvm/test/Regression/Transforms/GCSE/RLE-Preserve-Volatile.ll Mon Sep 8 12:43:36 2003 *************** *** 0 **** --- 1,9 ---- + + ; RUN: llvm-as < %s | opt -load-vn -gcse -instcombine | dis | grep sub + + int %test(int* %P) { + %X = load volatile int* %P + %Y = load volatile int* %P + %Z = sub int %X, %Y + ret int %Z + } From lattner at cs.uiuc.edu Mon Sep 8 12:46:02 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Mon Sep 8 12:46:02 2003 Subject: [llvm-commits] CVS: llvm/test/Regression/Transforms/GCSE/RLE-Preserve-Volatile.ll Message-ID: <200309081745.MAA10032@apoc.cs.uiuc.edu> Changes in directory llvm/test/Regression/Transforms/GCSE: RLE-Preserve-Volatile.ll updated: 1.1 -> 1.2 --- Log message: Fix grammar-o --- Diffs of the changes: Index: llvm/test/Regression/Transforms/GCSE/RLE-Preserve-Volatile.ll diff -u llvm/test/Regression/Transforms/GCSE/RLE-Preserve-Volatile.ll:1.1 llvm/test/Regression/Transforms/GCSE/RLE-Preserve-Volatile.ll:1.2 --- llvm/test/Regression/Transforms/GCSE/RLE-Preserve-Volatile.ll:1.1 Mon Sep 8 12:43:36 2003 +++ llvm/test/Regression/Transforms/GCSE/RLE-Preserve-Volatile.ll Mon Sep 8 12:45:18 2003 @@ -2,8 +2,8 @@ ; RUN: llvm-as < %s | opt -load-vn -gcse -instcombine | dis | grep sub int %test(int* %P) { - %X = load volatile int* %P - %Y = load volatile int* %P + %X = volatile load int* %P + %Y = volatile load int* %P %Z = sub int %X, %Y ret int %Z } From lattner at cs.uiuc.edu Mon Sep 8 12:47:02 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Mon Sep 8 12:47:02 2003 Subject: [llvm-commits] CVS: llvm/lib/VMCore/AsmWriter.cpp iMemory.cpp Message-ID: <200309081746.MAA10052@apoc.cs.uiuc.edu> Changes in directory llvm/lib/VMCore: AsmWriter.cpp updated: 1.97 -> 1.98 iMemory.cpp updated: 1.30 -> 1.31 --- Log message: Add support for volatile loads/stores --- Diffs of the changes: Index: llvm/lib/VMCore/AsmWriter.cpp diff -u llvm/lib/VMCore/AsmWriter.cpp:1.97 llvm/lib/VMCore/AsmWriter.cpp:1.98 --- llvm/lib/VMCore/AsmWriter.cpp:1.97 Wed Sep 3 12:56:43 2003 +++ llvm/lib/VMCore/AsmWriter.cpp Mon Sep 8 12:45:57 2003 @@ -771,6 +771,11 @@ if (I.hasName()) Out << getLLVMName(I.getName()) << " = "; + // If this is a volatile load or store, print out the volatile marker + if ((isa(I) && cast(I).isVolatile()) || + (isa(I) && cast(I).isVolatile())) + Out << "volatile "; + // Print out the opcode... Out << I.getOpcodeName(); Index: llvm/lib/VMCore/iMemory.cpp diff -u llvm/lib/VMCore/iMemory.cpp:1.30 llvm/lib/VMCore/iMemory.cpp:1.31 --- llvm/lib/VMCore/iMemory.cpp:1.30 Tue Sep 2 01:45:34 2003 +++ llvm/lib/VMCore/iMemory.cpp Mon Sep 8 12:45:57 2003 @@ -1,4 +1,4 @@ -//===-- iMemory.cpp - Implement Memory instructions --------------*- C++ -*--=// +//===-- iMemory.cpp - Implement Memory instructions -----------------------===// // // This file implements the various memory related classes defined in iMemory.h // @@ -58,18 +58,34 @@ LoadInst::LoadInst(Value *Ptr, const std::string &Name, Instruction *InsertBef) : Instruction(cast(Ptr->getType())->getElementType(), - Load, Name, InsertBef) { + Load, Name, InsertBef), Volatile(false) { Operands.reserve(1); Operands.push_back(Use(Ptr, this)); } +LoadInst::LoadInst(Value *Ptr, const std::string &Name, bool isVolatile, + Instruction *InsertBef) + : Instruction(cast(Ptr->getType())->getElementType(), + Load, Name, InsertBef), Volatile(isVolatile) { + Operands.reserve(1); + Operands.push_back(Use(Ptr, this)); +} //===----------------------------------------------------------------------===// // StoreInst Implementation //===----------------------------------------------------------------------===// StoreInst::StoreInst(Value *Val, Value *Ptr, Instruction *InsertBefore) - : Instruction(Type::VoidTy, Store, "", InsertBefore) { + : Instruction(Type::VoidTy, Store, "", InsertBefore), Volatile(false) { + + Operands.reserve(2); + Operands.push_back(Use(Val, this)); + Operands.push_back(Use(Ptr, this)); +} + +StoreInst::StoreInst(Value *Val, Value *Ptr, bool isVolatile, + Instruction *InsertBefore) + : Instruction(Type::VoidTy, Store, "", InsertBefore), Volatile(isVolatile) { Operands.reserve(2); Operands.push_back(Use(Val, this)); From lattner at cs.uiuc.edu Mon Sep 8 12:47:05 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Mon Sep 8 12:47:05 2003 Subject: [llvm-commits] CVS: llvm/include/llvm/iMemory.h Message-ID: <200309081746.MAA10059@apoc.cs.uiuc.edu> Changes in directory llvm/include/llvm: iMemory.h updated: 1.38 -> 1.39 --- Log message: Add support for volatile loads/stores --- Diffs of the changes: Index: llvm/include/llvm/iMemory.h diff -u llvm/include/llvm/iMemory.h:1.38 llvm/include/llvm/iMemory.h:1.39 --- llvm/include/llvm/iMemory.h:1.38 Mon Feb 24 14:48:28 2003 +++ llvm/include/llvm/iMemory.h Mon Sep 8 12:45:59 2003 @@ -1,7 +1,7 @@ -//===-- llvm/iMemory.h - Memory Operator node definitions --------*- C++ -*--=// +//===-- llvm/iMemory.h - Memory Operator node definitions -------*- C++ -*-===// // // This file contains the declarations of all of the memory related operators. -// This includes: malloc, free, alloca, load, store, getfield, putfield +// This includes: malloc, free, alloca, load, store, and getelementptr // //===----------------------------------------------------------------------===// @@ -139,13 +139,24 @@ class LoadInst : public Instruction { LoadInst(const LoadInst &LI) : Instruction(LI.getType(), Load) { + Volatile = LI.isVolatile(); Operands.reserve(1); Operands.push_back(Use(LI.Operands[0], this)); } + bool Volatile; // True if this is a volatile load public: - LoadInst(Value *Ptr, const std::string &Name = "", + LoadInst(Value *Ptr, const std::string &Name, Instruction *InsertBefore); + LoadInst(Value *Ptr, const std::string &Name = "", bool isVolatile = false, Instruction *InsertBefore = 0); + /// isVolatile - Return true if this is a load from a volatile memory + /// location. + bool isVolatile() const { return Volatile; } + + /// setVolatile - Specify whether this is a volatile load or not. + /// + void setVolatile(bool V) { Volatile = V; } + virtual Instruction *clone() const { return new LoadInst(*this); } Value *getPointerOperand() { return getOperand(0); } @@ -155,7 +166,7 @@ // Methods for support type inquiry through isa, cast, and dyn_cast: static inline bool classof(const LoadInst *) { return true; } static inline bool classof(const Instruction *I) { - return (I->getOpcode() == Instruction::Load); + return I->getOpcode() == Instruction::Load; } static inline bool classof(const Value *V) { return isa(V) && classof(cast(V)); @@ -169,12 +180,26 @@ class StoreInst : public Instruction { StoreInst(const StoreInst &SI) : Instruction(SI.getType(), Store) { + Volatile = SI.isVolatile(); Operands.reserve(2); Operands.push_back(Use(SI.Operands[0], this)); Operands.push_back(Use(SI.Operands[1], this)); } + bool Volatile; // True if this is a volatile store public: - StoreInst(Value *Val, Value *Ptr, Instruction *InsertBefore = 0); + StoreInst(Value *Val, Value *Ptr, Instruction *InsertBefore); + StoreInst(Value *Val, Value *Ptr, bool isVolatile = false, + Instruction *InsertBefore = 0); + + + /// isVolatile - Return true if this is a load from a volatile memory + /// location. + bool isVolatile() const { return Volatile; } + + /// setVolatile - Specify whether this is a volatile load or not. + /// + void setVolatile(bool V) { Volatile = V; } + virtual Instruction *clone() const { return new StoreInst(*this); } virtual bool mayWriteToMemory() const { return true; } @@ -186,7 +211,7 @@ // Methods for support type inquiry through isa, cast, and dyn_cast: static inline bool classof(const StoreInst *) { return true; } static inline bool classof(const Instruction *I) { - return (I->getOpcode() == Instruction::Store); + return I->getOpcode() == Instruction::Store; } static inline bool classof(const Value *V) { return isa(V) && classof(cast(V)); From lattner at cs.uiuc.edu Mon Sep 8 12:59:02 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Mon Sep 8 12:59:02 2003 Subject: [llvm-commits] CVS: llvm/lib/Bytecode/Writer/WriteInst.cpp Message-ID: <200309081758.MAA13920@apoc.cs.uiuc.edu> Changes in directory llvm/lib/Bytecode/Writer: WriteInst.cpp updated: 1.28 -> 1.29 --- Log message: Add support for writing volatile load/stores --- Diffs of the changes: Index: llvm/lib/Bytecode/Writer/WriteInst.cpp diff -u llvm/lib/Bytecode/Writer/WriteInst.cpp:1.28 llvm/lib/Bytecode/Writer/WriteInst.cpp:1.29 --- llvm/lib/Bytecode/Writer/WriteInst.cpp:1.28 Wed May 7 21:44:07 2003 +++ llvm/lib/Bytecode/Writer/WriteInst.cpp Mon Sep 8 12:58:37 2003 @@ -12,8 +12,7 @@ #include "WriterInternals.h" #include "llvm/Module.h" #include "llvm/DerivedTypes.h" -#include "llvm/iOther.h" -#include "llvm/iTerminators.h" +#include "llvm/Instructions.h" #include "Support/Statistic.h" #include @@ -27,11 +26,11 @@ // // Format: [opcode] [type] [numargs] [arg0] [arg1] ... [arg] // -static void outputInstructionFormat0(const Instruction *I, +static void outputInstructionFormat0(const Instruction *I, unsigned Opcode, const SlotCalculator &Table, unsigned Type, std::deque &Out) { // Opcode must have top two bits clear... - output_vbr(I->getOpcode() << 2, Out); // Instruction Opcode ID + output_vbr(Opcode << 2, Out); // Instruction Opcode ID output_vbr(Type, Out); // Result type unsigned NumArgs = I->getNumOperands(); @@ -62,12 +61,12 @@ // // Format: [opcode] [type] [numargs] [arg0] [arg1] ... [arg] // -static void outputInstrVarArgsCall(const Instruction *I, +static void outputInstrVarArgsCall(const Instruction *I, unsigned Opcode, const SlotCalculator &Table, unsigned Type, std::deque &Out) { assert(isa(I) || isa(I)); // Opcode must have top two bits clear... - output_vbr(I->getOpcode() << 2, Out); // Instruction Opcode ID + output_vbr(Opcode << 2, Out); // Instruction Opcode ID output_vbr(Type, Out); // Result type (varargs type) unsigned NumArgs = I->getNumOperands(); @@ -105,11 +104,9 @@ // outputInstructionFormat1 - Output one operand instructions, knowing that no // operand index is >= 2^12. // -static void outputInstructionFormat1(const Instruction *I, +static void outputInstructionFormat1(const Instruction *I, unsigned Opcode, const SlotCalculator &Table, int *Slots, unsigned Type, std::deque &Out) { - unsigned Opcode = I->getOpcode(); // Instruction Opcode ID - // bits Instruction format: // -------------------------- // 01-00: Opcode type, fixed to 1. @@ -126,11 +123,9 @@ // outputInstructionFormat2 - Output two operand instructions, knowing that no // operand index is >= 2^8. // -static void outputInstructionFormat2(const Instruction *I, +static void outputInstructionFormat2(const Instruction *I, unsigned Opcode, const SlotCalculator &Table, int *Slots, unsigned Type, std::deque &Out) { - unsigned Opcode = I->getOpcode(); // Instruction Opcode ID - // bits Instruction format: // -------------------------- // 01-00: Opcode type, fixed to 2. @@ -150,11 +145,9 @@ // outputInstructionFormat3 - Output three operand instructions, knowing that no // operand index is >= 2^6. // -static void outputInstructionFormat3(const Instruction *I, +static void outputInstructionFormat3(const Instruction *I, unsigned Opcode, const SlotCalculator &Table, int *Slots, unsigned Type, std::deque &Out) { - unsigned Opcode = I->getOpcode(); // Instruction Opcode ID - // bits Instruction format: // -------------------------- // 01-00: Opcode type, fixed to 3. @@ -172,7 +165,14 @@ } void BytecodeWriter::processInstruction(const Instruction &I) { - assert(I.getOpcode() < 64 && "Opcode too big???"); + assert(I.getOpcode() < 62 && "Opcode too big???"); + unsigned Opcode = I.getOpcode(); + + // Encode 'volatile load' as 62 and 'volatile store' as 63. + if (isa(I) && cast(I).isVolatile()) + Opcode = 62; + if (isa(I) && cast(I).isVolatile()) + Opcode = 63; unsigned NumOperands = I.getNumOperands(); int MaxOpSlot = 0; @@ -228,13 +228,13 @@ } else if (const CallInst *CI = dyn_cast(&I)){// Handle VarArg calls const PointerType *Ty = cast(CI->getCalledValue()->getType()); if (cast(Ty->getElementType())->isVarArg()) { - outputInstrVarArgsCall(CI, Table, Type, Out); + outputInstrVarArgsCall(CI, Opcode, Table, Type, Out); return; } } else if (const InvokeInst *II = dyn_cast(&I)) {// ... & Invokes const PointerType *Ty = cast(II->getCalledValue()->getType()); if (cast(Ty->getElementType())->isVarArg()) { - outputInstrVarArgsCall(II, Table, Type, Out); + outputInstrVarArgsCall(II, Opcode, Table, Type, Out); return; } } @@ -250,21 +250,21 @@ case 0: case 1: if (MaxOpSlot < (1 << 12)-1) { // -1 because we use 4095 to indicate 0 ops - outputInstructionFormat1(&I, Table, Slots, Type, Out); + outputInstructionFormat1(&I, Opcode, Table, Slots, Type, Out); return; } break; case 2: if (MaxOpSlot < (1 << 8)) { - outputInstructionFormat2(&I, Table, Slots, Type, Out); + outputInstructionFormat2(&I, Opcode, Table, Slots, Type, Out); return; } break; case 3: if (MaxOpSlot < (1 << 6)) { - outputInstructionFormat3(&I, Table, Slots, Type, Out); + outputInstructionFormat3(&I, Opcode, Table, Slots, Type, Out); return; } break; @@ -272,5 +272,5 @@ // If we weren't handled before here, we either have a large number of // operands or a large operand index that we are refering to. - outputInstructionFormat0(&I, Table, Type, Out); + outputInstructionFormat0(&I, Opcode, Table, Type, Out); } From lattner at cs.uiuc.edu Mon Sep 8 13:05:04 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Mon Sep 8 13:05:04 2003 Subject: [llvm-commits] CVS: llvm/lib/Bytecode/Reader/ReadInst.cpp Reader.cpp ReaderInternals.h Message-ID: <200309081804.NAA15577@apoc.cs.uiuc.edu> Changes in directory llvm/lib/Bytecode/Reader: ReadInst.cpp updated: 1.46 -> 1.47 Reader.cpp updated: 1.59 -> 1.60 ReaderInternals.h updated: 1.40 -> 1.41 --- Log message: Remove a gross hack that was there to support bytecode files that are over a year old. If you still have these suckers laying around, you have GOT to rebuild them. geeze. --- Diffs of the changes: Index: llvm/lib/Bytecode/Reader/ReadInst.cpp diff -u llvm/lib/Bytecode/Reader/ReadInst.cpp:1.46 llvm/lib/Bytecode/Reader/ReadInst.cpp:1.47 --- llvm/lib/Bytecode/Reader/ReadInst.cpp:1.46 Fri Sep 5 13:25:29 2003 +++ llvm/lib/Bytecode/Reader/ReadInst.cpp Mon Sep 8 13:04:16 2003 @@ -116,8 +116,7 @@ bool BytecodeParser::ParseInstruction(const unsigned char *&Buf, const unsigned char *EndBuf, - Instruction *&Res, - BasicBlock *BB /*HACK*/) { + Instruction *&Res) { RawInst Raw; if (ParseRawInst(Buf, EndBuf, Raw)) return true; @@ -359,14 +358,13 @@ Res = new FreeInst(V); return false; - case Instruction::Load: case Instruction::GetElementPtr: { std::vector Idx; if (!isa(Raw.Ty)) return true; const CompositeType *TopTy = dyn_cast(Raw.Ty); switch (Raw.NumOperands) { - case 0: std::cerr << "Invalid load encountered!\n"; return true; + case 0: std::cerr << "Invalid getelementptr encountered!\n"; return true; case 1: break; case 2: if (!TopTy) return true; @@ -403,71 +401,20 @@ break; } - if (Raw.Opcode == Instruction::Load) { - Value *Src = getValue(Raw.Ty, Raw.Arg1); - if (!Idx.empty()) { - std::cerr << "WARNING: Bytecode contains load instruction with indices." - << " Replacing with getelementptr/load pair\n"; - assert(GetElementPtrInst::getIndexedType(Raw.Ty, Idx) && - "Bad indices for Load!"); - Src = new GetElementPtrInst(Src, Idx); - // FIXME: Remove this compatibility code and the BB parameter to this - // method. - BB->getInstList().push_back(cast(Src)); - } - Res = new LoadInst(Src); - } else if (Raw.Opcode == Instruction::GetElementPtr) - Res = new GetElementPtrInst(getValue(Raw.Ty, Raw.Arg1), Idx); - else - abort(); + Res = new GetElementPtrInst(getValue(Raw.Ty, Raw.Arg1), Idx); return false; } - case Instruction::Store: { - std::vector Idx; - if (!isa(Raw.Ty)) return true; - const CompositeType *TopTy = dyn_cast(Raw.Ty); - - switch (Raw.NumOperands) { - case 0: - case 1: std::cerr << "Invalid store encountered!\n"; return true; - case 2: break; - case 3: - if (!TopTy) return true; - Idx.push_back(V = getValue(TopTy->getIndexType(), Raw.Arg3)); - if (!V) return true; - break; - default: - std::vector &args = *Raw.VarArgs; - const CompositeType *ElTy = TopTy; - unsigned i, E; - for (i = 0, E = args.size(); ElTy && i != E; ++i) { - Idx.push_back(V = getValue(ElTy->getIndexType(), args[i])); - if (!V) return true; - const Type *ETy = GetElementPtrInst::getIndexedType(Raw.Ty, Idx, true); - ElTy = dyn_cast_or_null(ETy); - } - if (i != E) - return true; // didn't use up all of the indices! + case Instruction::Load: + if (Raw.NumOperands != 1) return true; + if (!isa(Raw.Ty)) return true; + Res = new LoadInst(getValue(Raw.Ty, Raw.Arg1)); + return false; - delete Raw.VarArgs; - break; - } + case Instruction::Store: { + if (!isa(Raw.Ty) || Raw.NumOperands != 2) return true; Value *Ptr = getValue(Raw.Ty, Raw.Arg2); - if (!Idx.empty()) { - std::cerr << "WARNING: Bytecode contains load instruction with indices. " - << "Replacing with getelementptr/load pair\n"; - - const Type *ElType = GetElementPtrInst::getIndexedType(Raw.Ty, Idx); - if (ElType == 0) return true; - - Ptr = new GetElementPtrInst(Ptr, Idx); - // FIXME: Remove this compatibility code and the BB parameter to this - // method. - BB->getInstList().push_back(cast(Ptr)); - } - const Type *ValTy = cast(Ptr->getType())->getElementType(); Res = new StoreInst(getValue(ValTy, Raw.Arg1), Ptr); return false; Index: llvm/lib/Bytecode/Reader/Reader.cpp diff -u llvm/lib/Bytecode/Reader/Reader.cpp:1.59 llvm/lib/Bytecode/Reader/Reader.cpp:1.60 --- llvm/lib/Bytecode/Reader/Reader.cpp:1.59 Sun Aug 24 08:47:32 2003 +++ llvm/lib/Bytecode/Reader/Reader.cpp Mon Sep 8 13:04:16 2003 @@ -222,7 +222,7 @@ while (Buf < EndBuf) { Instruction *Inst; - if (ParseInstruction(Buf, EndBuf, Inst, /*HACK*/BB)) { + if (ParseInstruction(Buf, EndBuf, Inst)) { delete BB; return true; } Index: llvm/lib/Bytecode/Reader/ReaderInternals.h diff -u llvm/lib/Bytecode/Reader/ReaderInternals.h:1.40 llvm/lib/Bytecode/Reader/ReaderInternals.h:1.41 --- llvm/lib/Bytecode/Reader/ReaderInternals.h:1.40 Thu Sep 4 18:47:07 2003 +++ llvm/lib/Bytecode/Reader/ReaderInternals.h Mon Sep 8 13:04:16 2003 @@ -137,7 +137,7 @@ bool ParseBasicBlock (const unsigned char *&Buf, const unsigned char *End, BasicBlock *&); bool ParseInstruction (const unsigned char *&Buf, const unsigned char *End, - Instruction *&, BasicBlock *BB /*HACK*/); + Instruction *&); bool ParseRawInst (const unsigned char *&Buf, const unsigned char *End, RawInst &); From lattner at cs.uiuc.edu Mon Sep 8 13:09:18 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Mon Sep 8 13:09:18 2003 Subject: [llvm-commits] CVS: llvm/utils/emacs/llvm-mode.el Message-ID: <200309081808.NAA16580@apoc.cs.uiuc.edu> Changes in directory llvm/utils/emacs: llvm-mode.el updated: 1.7 -> 1.8 --- Log message: Syntax hilight --- Diffs of the changes: Index: llvm/utils/emacs/llvm-mode.el diff -u llvm/utils/emacs/llvm-mode.el:1.7 llvm/utils/emacs/llvm-mode.el:1.8 --- llvm/utils/emacs/llvm-mode.el:1.7 Mon Aug 11 14:10:02 2003 +++ llvm/utils/emacs/llvm-mode.el Mon Sep 8 13:07:57 2003 @@ -25,7 +25,7 @@ ;; Hex constants '("0x[0-9A-Fa-f]+" . font-lock-preprocessor-face) ;; Keywords - '("begin\\|end\\|true\\|false\\|declare\\|global\\|constant\\|const\\|internal\\|linkonce\\|appending\\|uninitialized\\|implementation\\|\\.\\.\\.\\|null\\|to\\|except\\|not\\|target\\|endian\\|little\\|big\\|pointersize" . font-lock-keyword-face) + '("begin\\|end\\|true\\|false\\|declare\\|global\\|constant\\|const\\|internal\\|linkonce\\|appending\\|uninitialized\\|implementation\\|\\.\\.\\.\\|null\\|to\\|except\\|not\\|target\\|endian\\|little\\|big\\|pointersize\\|volatile" . font-lock-keyword-face) ;; Types '("void\\|bool\\|sbyte\\|ubyte\\|u?short\\|u?int\\|u?long\\|float\\|double\\|type\\|label\\|opaque" . font-lock-type-face) ;; Arithmetic and Logical Operators From lattner at cs.uiuc.edu Mon Sep 8 13:09:23 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Mon Sep 8 13:09:23 2003 Subject: [llvm-commits] CVS: llvm/utils/vim/llvm.vim Message-ID: <200309081808.NAA16695@apoc.cs.uiuc.edu> Changes in directory llvm/utils/vim: llvm.vim updated: 1.5 -> 1.6 --- Log message: syntax highlightify --- Diffs of the changes: Index: llvm/utils/vim/llvm.vim diff -u llvm/utils/vim/llvm.vim:1.5 llvm/utils/vim/llvm.vim:1.6 --- llvm/utils/vim/llvm.vim:1.5 Mon Jun 2 19:56:09 2003 +++ llvm/utils/vim/llvm.vim Mon Sep 8 13:08:11 2003 @@ -29,7 +29,7 @@ syn keyword llvmStatement internal uninitialized external implementation syn keyword llvmStatement linkonce appending syn keyword llvmStatement null to except not target endian pointersize -syn keyword llvmStatement big little +syn keyword llvmStatement big little volatile "syn match llvmFunction /%[a-zA-Z\$._\-][a-zA-Z\$._\-0-9]*/ syn match llvmNumber /\<\d\+\>/ From lattner at cs.uiuc.edu Mon Sep 8 13:15:02 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Mon Sep 8 13:15:02 2003 Subject: [llvm-commits] CVS: llvm/lib/Analysis/LoadValueNumbering.cpp Message-ID: <200309081814.NAA18264@apoc.cs.uiuc.edu> Changes in directory llvm/lib/Analysis: LoadValueNumbering.cpp updated: 1.5 -> 1.6 --- Log message: Fix bug: RLE-Preserve-Volatile.ll Volatile loads and stores must not be value numbered --- Diffs of the changes: Index: llvm/lib/Analysis/LoadValueNumbering.cpp diff -u llvm/lib/Analysis/LoadValueNumbering.cpp:1.5 llvm/lib/Analysis/LoadValueNumbering.cpp:1.6 --- llvm/lib/Analysis/LoadValueNumbering.cpp:1.5 Mon Aug 18 09:29:03 2003 +++ llvm/lib/Analysis/LoadValueNumbering.cpp Mon Sep 8 13:13:58 2003 @@ -90,6 +90,10 @@ getAnalysis().getMustAliases(V, RetVals); if (LoadInst *LI = dyn_cast(V)) { + // Volatile loads cannot be replaced with the value of other loads. + if (LI->isVolatile()) + return getAnalysis().getEqualNumberNodes(V, RetVals); + // If we have a load instruction, find all of the load and store // instructions that use the same source operand. We implement this // recursively, because there could be a load of a load of a load that are @@ -119,10 +123,10 @@ UI != UE; ++UI) if (LoadInst *Cand = dyn_cast(*UI)) {// Is a load of source? if (Cand->getParent()->getParent() == F && // In the same function? - Cand != LI) // Not LI itself? + Cand != LI && !Cand->isVolatile()) // Not LI itself? CandidateLoads.push_back(Cand); // Got one... } else if (StoreInst *Cand = dyn_cast(*UI)) { - if (Cand->getParent()->getParent() == F && + if (Cand->getParent()->getParent() == F && !Cand->isVolatile() && Cand->getOperand(1) == Source) // It's a store THROUGH the ptr... CandidateStores.push_back(Cand); } From lattner at cs.uiuc.edu Mon Sep 8 13:18:02 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Mon Sep 8 13:18:02 2003 Subject: [llvm-commits] CVS: llvm/lib/Transforms/Scalar/LICM.cpp Message-ID: <200309081817.NAA18399@apoc.cs.uiuc.edu> Changes in directory llvm/lib/Transforms/Scalar: LICM.cpp updated: 1.30 -> 1.31 --- Log message: Do not hoist volatile loads --- Diffs of the changes: Index: llvm/lib/Transforms/Scalar/LICM.cpp diff -u llvm/lib/Transforms/Scalar/LICM.cpp:1.30 llvm/lib/Transforms/Scalar/LICM.cpp:1.31 --- llvm/lib/Transforms/Scalar/LICM.cpp:1.30 Tue Aug 5 15:39:02 2003 +++ llvm/lib/Transforms/Scalar/LICM.cpp Mon Sep 8 13:17:14 2003 @@ -316,7 +316,7 @@ void LICM::visitLoadInst(LoadInst &LI) { - if (isLoopInvariant(LI.getOperand(0)) && + if (isLoopInvariant(LI.getOperand(0)) && !LI.isVolatile() && !pointerInvalidatedByLoop(LI.getOperand(0)) && SafeToHoist(LI)) { hoist(LI); ++NumHoistedLoads; From lattner at cs.uiuc.edu Mon Sep 8 13:21:02 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Mon Sep 8 13:21:02 2003 Subject: [llvm-commits] CVS: llvm/lib/ExecutionEngine/Makefile Message-ID: <200309081820.NAA18424@apoc.cs.uiuc.edu> Changes in directory llvm/lib/ExecutionEngine: Makefile updated: 1.40 -> 1.41 --- Log message: Remove a bunch of unneeded stuph --- Diffs of the changes: Index: llvm/lib/ExecutionEngine/Makefile diff -u llvm/lib/ExecutionEngine/Makefile:1.40 llvm/lib/ExecutionEngine/Makefile:1.41 --- llvm/lib/ExecutionEngine/Makefile:1.40 Fri Sep 5 14:39:22 2003 +++ llvm/lib/ExecutionEngine/Makefile Mon Sep 8 13:19:58 2003 @@ -2,49 +2,4 @@ LIBRARYNAME = executionengine PARALLEL_DIRS = Interpreter JIT -# Get the $(ARCH) setting -include $(LEVEL)/Makefile.config - -# Generic JIT libraries -JITLIBS = lli-jit codegen -ARCHLIBS = - -# You can enable the X86 JIT on a non-X86 host by setting the flag -# ENABLE_X86_JIT on the make command line. If not, it will still be -# enabled automagically on an X86 host. -ifeq ($(ARCH), x86) - ENABLE_X86_JIT = 1 -endif - -# What the X86 JIT requires -ifdef ENABLE_X86_JIT - CPPFLAGS += -DENABLE_X86_JIT - JITLIBS += x86 selectiondag - # X86 doesn't require any ARCHLIBS -endif - -# You can enable the Sparc JIT on a non-Sparc host by setting the flag -# ENABLE_SPARC_JIT on the make command line. If not, it will still be -# enabled automagically on an Sparc host. -ifeq ($(ARCH), Sparc) - ENABLE_SPARC_JIT = 1 -endif - -# What the Sparc JIT requires -ifdef ENABLE_SPARC_JIT - CPPFLAGS += -DENABLE_SPARC_JIT - JITLIBS += sparc - ARCHLIBS += sched livevar instrument.a profpaths \ - bcwriter transforms.a ipo.a ipa.a datastructure.a regalloc \ - select -endif - -USEDLIBS = lli-interpreter $(JITLIBS) $(ARCHLIBS) scalaropts analysis.a \ - transformutils.a bcreader vmcore support target.a - -# Have gcc tell the linker to export symbols from the program so that -# dynamically loaded modules can be linked against them. -# -TOOLLINKOPTS = $(PLATFORMLIBDL) - include $(LEVEL)/Makefile.common From lattner at cs.uiuc.edu Mon Sep 8 13:21:06 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Mon Sep 8 13:21:06 2003 Subject: [llvm-commits] CVS: llvm/lib/Bytecode/Reader/ReadInst.cpp Message-ID: <200309081820.NAA18438@apoc.cs.uiuc.edu> Changes in directory llvm/lib/Bytecode/Reader: ReadInst.cpp updated: 1.47 -> 1.48 --- Log message: Read volatile loads/stores --- Diffs of the changes: Index: llvm/lib/Bytecode/Reader/ReadInst.cpp diff -u llvm/lib/Bytecode/Reader/ReadInst.cpp:1.47 llvm/lib/Bytecode/Reader/ReadInst.cpp:1.48 --- llvm/lib/Bytecode/Reader/ReadInst.cpp:1.47 Mon Sep 8 13:04:16 2003 +++ llvm/lib/Bytecode/Reader/ReadInst.cpp Mon Sep 8 13:20:14 2003 @@ -405,18 +405,20 @@ return false; } + case 62: // volatile load case Instruction::Load: if (Raw.NumOperands != 1) return true; if (!isa(Raw.Ty)) return true; - Res = new LoadInst(getValue(Raw.Ty, Raw.Arg1)); + Res = new LoadInst(getValue(Raw.Ty, Raw.Arg1), "", Raw.Opcode == 62); return false; + case 63: // volatile store case Instruction::Store: { if (!isa(Raw.Ty) || Raw.NumOperands != 2) return true; Value *Ptr = getValue(Raw.Ty, Raw.Arg2); const Type *ValTy = cast(Ptr->getType())->getElementType(); - Res = new StoreInst(getValue(ValTy, Raw.Arg1), Ptr); + Res = new StoreInst(getValue(ValTy, Raw.Arg1), Ptr, Raw.Opcode == 63); return false; } } // end switch(Raw.Opcode) From lattner at cs.uiuc.edu Mon Sep 8 13:21:08 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Mon Sep 8 13:21:08 2003 Subject: [llvm-commits] CVS: llvm/lib/AsmParser/Lexer.l llvmAsmParser.y Message-ID: <200309081820.NAA18450@apoc.cs.uiuc.edu> Changes in directory llvm/lib/AsmParser: Lexer.l updated: 1.36 -> 1.37 llvmAsmParser.y updated: 1.121 -> 1.122 --- Log message: Parse volatile loads/stores --- Diffs of the changes: Index: llvm/lib/AsmParser/Lexer.l diff -u llvm/lib/AsmParser/Lexer.l:1.36 llvm/lib/AsmParser/Lexer.l:1.37 --- llvm/lib/AsmParser/Lexer.l:1.36 Mon Jun 30 16:58:38 2003 +++ llvm/lib/AsmParser/Lexer.l Mon Sep 8 13:20:29 2003 @@ -185,6 +185,7 @@ pointersize { return POINTERSIZE; } little { return LITTLE; } big { return BIG; } +volatile { return VOLATILE; } void { llvmAsmlval.PrimType = Type::VoidTy ; return VOID; } bool { llvmAsmlval.PrimType = Type::BoolTy ; return BOOL; } Index: llvm/lib/AsmParser/llvmAsmParser.y diff -u llvm/lib/AsmParser/llvmAsmParser.y:1.121 llvm/lib/AsmParser/llvmAsmParser.y:1.122 --- llvm/lib/AsmParser/llvmAsmParser.y:1.121 Mon Sep 1 11:31:28 2003 +++ llvm/lib/AsmParser/llvmAsmParser.y Mon Sep 8 13:20:29 2003 @@ -664,6 +664,7 @@ %type TypeListI ArgTypeListI %type JumpTable %type GlobalType // GLOBAL or CONSTANT? +%type OptVolatile // 'volatile' or not %type OptLinkage %type BigOrLittle @@ -695,7 +696,7 @@ %token IMPLEMENTATION ZEROINITIALIZER TRUE FALSE BEGINTOK ENDTOK -%token DECLARE GLOBAL CONSTANT +%token DECLARE GLOBAL CONSTANT VOLATILE %token TO EXCEPT DOTDOTDOT NULL_TOK CONST INTERNAL LINKONCE APPENDING %token OPAQUE NOT EXTERNAL TARGET ENDIAN POINTERSIZE LITTLE BIG @@ -1705,10 +1706,18 @@ // IndexList - List of indices for GEP based instructions... IndexList : ',' ValueRefList { - $$ = $2; -} | /* empty */ { - $$ = new std::vector(); -}; + $$ = $2; + } | /* empty */ { + $$ = new std::vector(); + }; + +OptVolatile : VOLATILE { + $$ = true; + } + | /* empty */ { + $$ = false; + }; + MemoryInst : MALLOC Types { $$ = new MallocInst(*$2); @@ -1733,25 +1742,25 @@ $$ = new FreeInst($2); } - | LOAD Types ValueRef { - if (!isa($2->get())) + | OptVolatile LOAD Types ValueRef { + if (!isa($3->get())) ThrowException("Can't load from nonpointer type: " + - (*$2)->getDescription()); - $$ = new LoadInst(getVal(*$2, $3)); - delete $2; + (*$3)->getDescription()); + $$ = new LoadInst(getVal(*$3, $4), "", $2); + delete $3; } - | STORE ResolvedVal ',' Types ValueRef { - const PointerType *PT = dyn_cast($4->get()); + | OptVolatile STORE ResolvedVal ',' Types ValueRef { + const PointerType *PT = dyn_cast($5->get()); if (!PT) ThrowException("Can't store to a nonpointer type: " + - (*$4)->getDescription()); + (*$5)->getDescription()); const Type *ElTy = PT->getElementType(); - if (ElTy != $2->getType()) - ThrowException("Can't store '" + $2->getType()->getDescription() + + if (ElTy != $3->getType()) + ThrowException("Can't store '" + $3->getType()->getDescription() + "' into space of type '" + ElTy->getDescription() + "'!"); - $$ = new StoreInst($2, getVal(*$4, $5)); - delete $4; + $$ = new StoreInst($3, getVal(*$5, $6), $2); + delete $5; } | GETELEMENTPTR Types ValueRef IndexList { if (!isa($2->get())) From lattner at cs.uiuc.edu Mon Sep 8 13:29:02 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Mon Sep 8 13:29:02 2003 Subject: [llvm-commits] CVS: llvm/www/docs/LangRef.html Message-ID: <200309081828.NAA10212@tank.cs.uiuc.edu> Changes in directory llvm/www/docs: LangRef.html updated: 1.30 -> 1.31 --- Log message: Add info about volatile loads/stores --- Diffs of the changes: Index: llvm/www/docs/LangRef.html diff -u llvm/www/docs/LangRef.html:1.30 llvm/www/docs/LangRef.html:1.31 --- llvm/www/docs/LangRef.html:1.30 Tue Sep 2 23:20:13 2003 +++ llvm/www/docs/LangRef.html Mon Sep 8 13:27:49 2003 @@ -1405,6 +1405,7 @@
Syntax:
   <result> = load <ty>* <pointer>
+  <result> = volatile load <ty>* <pointer>
 
Overview:
@@ -1412,7 +1413,12 @@
Arguments:
-The argument to the 'load' instruction specifies the memory address to load from. The pointer must point to a first class type.

+The argument to the 'load' instruction specifies the memory address to +load from. The pointer must point to a first class +type. If the load is marked as volatile then the optimizer is +not allowed to modify the number or order of execution of this load +with other volatile load and store +instructions.

Semantics:
@@ -1434,6 +1440,7 @@
Syntax:
   store <ty> <value>, <ty>* <pointer>                   ; yields {void}
+  volatile store <ty> <value>, <ty>* <pointer>                   ; yields {void}
 
Overview:
@@ -1443,8 +1450,11 @@ There are two arguments to the 'store' instruction: a value to store and an address to store it into. The type of the '<pointer>' -operand must be a pointer to the type of the '<value>' -operand.

+operand must be a pointer to the type of the '<value>' operand. +If the store is marked as volatile then the optimizer is not +allowed to modify the number or order of execution of this store with +other volatile load and store +instructions.

Semantics:
The contents of memory are updated to contain '<value>' at the location specified by the @@ -1895,7 +1905,7 @@
Chris Lattner
-Last modified: Tue Sep 2 19:41:01 CDT 2003 +Last modified: Mon Sep 8 13:27:14 CDT 2003 From lattner at cs.uiuc.edu Mon Sep 8 13:55:02 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Mon Sep 8 13:55:02 2003 Subject: [llvm-commits] CVS: llvm/include/llvm/iTerminators.h Message-ID: <200309081854.NAA08185@apoc.cs.uiuc.edu> Changes in directory llvm/include/llvm: iTerminators.h updated: 1.30 -> 1.31 --- Log message: Add the unwind instruction class --- Diffs of the changes: Index: llvm/include/llvm/iTerminators.h diff -u llvm/include/llvm/iTerminators.h:1.30 llvm/include/llvm/iTerminators.h:1.31 --- llvm/include/llvm/iTerminators.h:1.30 Sat Aug 23 18:14:25 2003 +++ llvm/include/llvm/iTerminators.h Mon Sep 8 13:54:09 2003 @@ -61,7 +61,6 @@ } }; - //===--------------------------------------------------------------------------- // BranchInst - Conditional or Unconditional Branch instruction. // @@ -264,6 +263,38 @@ static inline bool classof(const InvokeInst *) { return true; } static inline bool classof(const Instruction *I) { return (I->getOpcode() == Instruction::Invoke); + } + static inline bool classof(const Value *V) { + return isa(V) && classof(cast(V)); + } +}; + + +//===--------------------------------------------------------------------------- +/// UnwindInst - Immediately exit the current function, unwinding the stack +/// until an invoke instruction is found. +/// +struct UnwindInst : public TerminatorInst { + UnwindInst(Instruction *InsertBefore = 0) + : TerminatorInst(Instruction::Unwind, InsertBefore) { + } + + virtual Instruction *clone() const { return new UnwindInst(); } + + virtual const BasicBlock *getSuccessor(unsigned idx) const { + assert(0 && "UnwindInst has no successors!"); + abort(); + return 0; + } + virtual void setSuccessor(unsigned idx, BasicBlock *NewSucc) { + assert(0 && "UnwindInst has no successors!"); + } + virtual unsigned getNumSuccessors() const { return 0; } + + // Methods for support type inquiry through isa, cast, and dyn_cast: + static inline bool classof(const UnwindInst *) { return true; } + static inline bool classof(const Instruction *I) { + return I->getOpcode() == Instruction::Unwind; } static inline bool classof(const Value *V) { return isa(V) && classof(cast(V)); From lattner at cs.uiuc.edu Mon Sep 8 13:55:04 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Mon Sep 8 13:55:04 2003 Subject: [llvm-commits] CVS: llvm/include/llvm/Support/InstVisitor.h Message-ID: <200309081854.NAA08195@apoc.cs.uiuc.edu> Changes in directory llvm/include/llvm/Support: InstVisitor.h updated: 1.20 -> 1.21 --- Log message: add support for the unwind inst --- Diffs of the changes: Index: llvm/include/llvm/Support/InstVisitor.h diff -u llvm/include/llvm/Support/InstVisitor.h:1.20 llvm/include/llvm/Support/InstVisitor.h:1.21 --- llvm/include/llvm/Support/InstVisitor.h:1.20 Fri Aug 29 09:48:21 2003 +++ llvm/include/llvm/Support/InstVisitor.h Mon Sep 8 13:54:16 2003 @@ -156,6 +156,7 @@ RetTy visitBranchInst(BranchInst &I) { DELEGATE(TerminatorInst);} RetTy visitSwitchInst(SwitchInst &I) { DELEGATE(TerminatorInst);} RetTy visitInvokeInst(InvokeInst &I) { DELEGATE(TerminatorInst);} + RetTy visitUnwindInst(UnwindInst &I) { DELEGATE(TerminatorInst);} RetTy visitSetCondInst(SetCondInst &I) { DELEGATE(BinaryOperator);} RetTy visitMallocInst(MallocInst &I) { DELEGATE(AllocationInst);} RetTy visitAllocaInst(AllocaInst &I) { DELEGATE(AllocationInst);} From lattner at cs.uiuc.edu Mon Sep 8 13:55:05 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Mon Sep 8 13:55:05 2003 Subject: [llvm-commits] CVS: llvm/include/llvm/Instruction.def Message-ID: <200309081854.NAA08395@apoc.cs.uiuc.edu> Changes in directory llvm/include/llvm: Instruction.def updated: 1.6 -> 1.7 --- Log message: Add new unwind instruction. Happily there was a slot leftover from when the 'not' instruction was removed long ago --- Diffs of the changes: Index: llvm/include/llvm/Instruction.def diff -u llvm/include/llvm/Instruction.def:1.6 llvm/include/llvm/Instruction.def:1.7 --- llvm/include/llvm/Instruction.def:1.6 Wed May 7 21:42:50 2003 +++ llvm/include/llvm/Instruction.def Mon Sep 8 13:54:01 2003 @@ -77,7 +77,8 @@ HANDLE_TERM_INST ( 2, Br , BranchInst) HANDLE_TERM_INST ( 3, Switch, SwitchInst) HANDLE_TERM_INST ( 4, Invoke, InvokeInst) - LAST_TERM_INST ( 4) +HANDLE_TERM_INST ( 5, Unwind, UnwindInst) + LAST_TERM_INST ( 5) // Standard binary operators... FIRST_BINARY_INST( 6) From lattner at cs.uiuc.edu Mon Sep 8 13:55:07 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Mon Sep 8 13:55:07 2003 Subject: [llvm-commits] CVS: llvm/lib/AsmParser/Lexer.l llvmAsmParser.y Message-ID: <200309081854.NAA08427@apoc.cs.uiuc.edu> Changes in directory llvm/lib/AsmParser: Lexer.l updated: 1.37 -> 1.38 llvmAsmParser.y updated: 1.122 -> 1.123 --- Log message: Add support for the unwind instruction --- Diffs of the changes: Index: llvm/lib/AsmParser/Lexer.l diff -u llvm/lib/AsmParser/Lexer.l:1.37 llvm/lib/AsmParser/Lexer.l:1.38 --- llvm/lib/AsmParser/Lexer.l:1.37 Mon Sep 8 13:20:29 2003 +++ llvm/lib/AsmParser/Lexer.l Mon Sep 8 13:54:47 2003 @@ -229,6 +229,7 @@ br { RET_TOK(TermOpVal, Br, BR); } switch { RET_TOK(TermOpVal, Switch, SWITCH); } invoke { RET_TOK(TermOpVal, Invoke, INVOKE); } +unwind { RET_TOK(TermOpVal, Unwind, UNWIND); } malloc { RET_TOK(MemOpVal, Malloc, MALLOC); } Index: llvm/lib/AsmParser/llvmAsmParser.y diff -u llvm/lib/AsmParser/llvmAsmParser.y:1.122 llvm/lib/AsmParser/llvmAsmParser.y:1.123 --- llvm/lib/AsmParser/llvmAsmParser.y:1.122 Mon Sep 8 13:20:29 2003 +++ llvm/lib/AsmParser/llvmAsmParser.y Mon Sep 8 13:54:48 2003 @@ -701,7 +701,7 @@ %token OPAQUE NOT EXTERNAL TARGET ENDIAN POINTERSIZE LITTLE BIG // Basic Block Terminating Operators -%token RET BR SWITCH +%token RET BR SWITCH INVOKE UNWIND // Binary Operators %type BinaryOps // all the binary operators @@ -714,7 +714,7 @@ // Other Operators %type ShiftOps -%token PHI CALL INVOKE CAST SHL SHR VA_ARG +%token PHI CALL CAST SHL SHR VA_ARG %start Module %% @@ -1535,6 +1535,9 @@ $$ = new InvokeInst(V, Normal, Except, *$5); } delete $5; + } + | UNWIND { + $$ = new UnwindInst(); }; From lattner at cs.uiuc.edu Mon Sep 8 13:55:09 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Mon Sep 8 13:55:09 2003 Subject: [llvm-commits] CVS: llvm/lib/Bytecode/Reader/ReadInst.cpp Message-ID: <200309081854.NAA08434@apoc.cs.uiuc.edu> Changes in directory llvm/lib/Bytecode/Reader: ReadInst.cpp updated: 1.48 -> 1.49 --- Log message: Add support for the unwind instruction --- Diffs of the changes: Index: llvm/lib/Bytecode/Reader/ReadInst.cpp diff -u llvm/lib/Bytecode/Reader/ReadInst.cpp:1.48 llvm/lib/Bytecode/Reader/ReadInst.cpp:1.49 --- llvm/lib/Bytecode/Reader/ReadInst.cpp:1.48 Mon Sep 8 13:20:14 2003 +++ llvm/lib/Bytecode/Reader/ReadInst.cpp Mon Sep 8 13:54:49 2003 @@ -421,6 +421,9 @@ Res = new StoreInst(getValue(ValTy, Raw.Arg1), Ptr, Raw.Opcode == 63); return false; } + case Instruction::Unwind: + if (Raw.NumOperands != 0) return true; + return new UnwindInst(); } // end switch(Raw.Opcode) std::cerr << "Unrecognized instruction! " << Raw.Opcode From lattner at cs.uiuc.edu Mon Sep 8 13:56:02 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Mon Sep 8 13:56:02 2003 Subject: [llvm-commits] CVS: llvm/lib/CWriter/Writer.cpp Message-ID: <200309081855.NAA08441@apoc.cs.uiuc.edu> Changes in directory llvm/lib/CWriter: Writer.cpp updated: 1.120 -> 1.121 --- Log message: Add support for the unwind instruction --- Diffs of the changes: Index: llvm/lib/CWriter/Writer.cpp diff -u llvm/lib/CWriter/Writer.cpp:1.120 llvm/lib/CWriter/Writer.cpp:1.121 --- llvm/lib/CWriter/Writer.cpp:1.120 Thu Aug 28 14:56:10 2003 +++ llvm/lib/CWriter/Writer.cpp Mon Sep 8 13:54:50 2003 @@ -117,6 +117,7 @@ void visitBranchInst(BranchInst &I); void visitSwitchInst(SwitchInst &I); void visitInvokeInst(InvokeInst &I); + void visitUnwindInst(UnwindInst &I); void visitPHINode(PHINode &I); void visitBinaryOperator(Instruction &I); @@ -979,6 +980,19 @@ emittedInvoke = true; } + +void CWriter::visitUnwindInst(UnwindInst &I) { + // The unwind instructions causes a control flow transfer out of the current + // function, unwinding the stack until a caller who used the invoke + // instruction is found. In this context, we code generated the invoke + // instruction to add an entry to the top of the jmpbuf_list. Thus, here we + // just have to longjmp to the specified handler. + Out << " if (__llvm_jmpbuf_list == 0) { /* llvm.unwind */\n" + << " printf(\"throw found with no handler!\\n\"); abort();\n" + << " }\n" + << " longjmp(__llvm_jmpbuf_list->buf, 1);\n"; + emittedInvoke = true; +} static bool isGotoCodeNeccessary(BasicBlock *From, BasicBlock *To) { // If PHI nodes need copies, we need the copy code... From lattner at cs.uiuc.edu Mon Sep 8 13:56:04 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Mon Sep 8 13:56:04 2003 Subject: [llvm-commits] CVS: llvm/lib/Transforms/Scalar/SCCP.cpp Message-ID: <200309081855.NAA08462@apoc.cs.uiuc.edu> Changes in directory llvm/lib/Transforms/Scalar: SCCP.cpp updated: 1.73 -> 1.74 --- Log message: Add support for the unwind instruction --- Diffs of the changes: Index: llvm/lib/Transforms/Scalar/SCCP.cpp diff -u llvm/lib/Transforms/Scalar/SCCP.cpp:1.73 llvm/lib/Transforms/Scalar/SCCP.cpp:1.74 --- llvm/lib/Transforms/Scalar/SCCP.cpp:1.73 Tue Aug 26 20:08:35 2003 +++ llvm/lib/Transforms/Scalar/SCCP.cpp Mon Sep 8 13:54:55 2003 @@ -196,6 +196,7 @@ markOverdefined(&I); visitTerminatorInst(I); } + void visitUnwindInst (TerminatorInst &I) { /*returns void*/ } void visitAllocationInst(Instruction &I) { markOverdefined(&I); } void visitVarArgInst (Instruction &I) { markOverdefined(&I); } void visitFreeInst (Instruction &I) { /*returns void*/ } From lattner at cs.uiuc.edu Mon Sep 8 13:56:05 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Mon Sep 8 13:56:05 2003 Subject: [llvm-commits] CVS: llvm/lib/VMCore/Instruction.cpp Message-ID: <200309081855.NAA08467@apoc.cs.uiuc.edu> Changes in directory llvm/lib/VMCore: Instruction.cpp updated: 1.24 -> 1.25 --- Log message: Add support for unwind --- Diffs of the changes: Index: llvm/lib/VMCore/Instruction.cpp diff -u llvm/lib/VMCore/Instruction.cpp:1.24 llvm/lib/VMCore/Instruction.cpp:1.25 --- llvm/lib/VMCore/Instruction.cpp:1.24 Thu Jul 31 00:06:09 2003 +++ llvm/lib/VMCore/Instruction.cpp Mon Sep 8 13:54:36 2003 @@ -56,6 +56,7 @@ case Br: return "br"; case Switch: return "switch"; case Invoke: return "invoke"; + case Unwind: return "unwind"; // Standard binary operators... case Add: return "add"; From lattner at cs.uiuc.edu Mon Sep 8 13:56:07 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Mon Sep 8 13:56:07 2003 Subject: [llvm-commits] CVS: llvm/lib/Target/X86/InstSelectSimple.cpp Message-ID: <200309081855.NAA08448@apoc.cs.uiuc.edu> Changes in directory llvm/lib/Target/X86: InstSelectSimple.cpp updated: 1.124 -> 1.125 --- Log message: Add support for the unwind instruction --- Diffs of the changes: Index: llvm/lib/Target/X86/InstSelectSimple.cpp diff -u llvm/lib/Target/X86/InstSelectSimple.cpp:1.124 llvm/lib/Target/X86/InstSelectSimple.cpp:1.125 --- llvm/lib/Target/X86/InstSelectSimple.cpp:1.124 Thu Aug 28 16:23:43 2003 +++ llvm/lib/Target/X86/InstSelectSimple.cpp Mon Sep 8 13:54:52 2003 @@ -132,6 +132,7 @@ const std::vector &Args); void visitCallInst(CallInst &I); void visitInvokeInst(InvokeInst &II); + void visitUnwindInst(UnwindInst &UI); void visitIntrinsicCall(LLVMIntrinsic::ID ID, CallInst &I); // Arithmetic operators @@ -1020,6 +1021,10 @@ BuildMI(BB, X86::JMP, 1).addPCDisp(II.getNormalDest()); } +void ISel::visitUnwindInst(UnwindInst &UI) { + // unwind is not supported yet! Just abort when the unwind inst is executed! + BuildMI(BB, X86::CALLpcrel32, 1).addExternalSymbol("abort", true); +} void ISel::visitIntrinsicCall(LLVMIntrinsic::ID ID, CallInst &CI) { unsigned TmpReg1, TmpReg2; From lattner at cs.uiuc.edu Mon Sep 8 13:56:08 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Mon Sep 8 13:56:08 2003 Subject: [llvm-commits] CVS: llvm/lib/Transforms/IPO/MutateStructTypes.cpp Message-ID: <200309081855.NAA08455@apoc.cs.uiuc.edu> Changes in directory llvm/lib/Transforms/IPO: MutateStructTypes.cpp updated: 1.37 -> 1.38 --- Log message: Add support for the unwind instruction --- Diffs of the changes: Index: llvm/lib/Transforms/IPO/MutateStructTypes.cpp diff -u llvm/lib/Transforms/IPO/MutateStructTypes.cpp:1.37 llvm/lib/Transforms/IPO/MutateStructTypes.cpp:1.38 --- llvm/lib/Transforms/IPO/MutateStructTypes.cpp:1.37 Fri Aug 1 17:15:01 2003 +++ llvm/lib/Transforms/IPO/MutateStructTypes.cpp Mon Sep 8 13:54:53 2003 @@ -352,6 +352,7 @@ } case Instruction::Switch: case Instruction::Invoke: + case Instruction::Unwind: assert(0 && "Insn not implemented!"); // Binary Instructions From lattner at cs.uiuc.edu Mon Sep 8 14:01:03 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Mon Sep 8 14:01:03 2003 Subject: [llvm-commits] CVS: llvm/lib/Transforms/Utils/InlineFunction.cpp Message-ID: <200309081900.OAA10363@apoc.cs.uiuc.edu> Changes in directory llvm/lib/Transforms/Utils: InlineFunction.cpp updated: 1.5 -> 1.6 --- Log message: Should invokify is always true --- Diffs of the changes: Index: llvm/lib/Transforms/Utils/InlineFunction.cpp diff -u llvm/lib/Transforms/Utils/InlineFunction.cpp:1.5 llvm/lib/Transforms/Utils/InlineFunction.cpp:1.6 --- llvm/lib/Transforms/Utils/InlineFunction.cpp:1.5 Mon Aug 25 17:34:15 2003 +++ llvm/lib/Transforms/Utils/InlineFunction.cpp Mon Sep 8 14:00:30 2003 @@ -185,10 +185,6 @@ // We only need to check for function calls: inlined invoke instructions // require no special handling... if (CallInst *CI = dyn_cast(I)) { - // FIXME: this should use annotations of the LLVM functions themselves - // to determine whether or not the function can throw. - bool ShouldInvokify = true; - if (Function *F = CI->getCalledFunction()) if (unsigned ID = F->getIntrinsicID()) if (ID == LLVMIntrinsic::unwind) { @@ -213,27 +209,23 @@ break; // Done with this basic block! } - // If we should convert this function into an invoke instruction, do - // so now. - if (ShouldInvokify) { - // First, split the basic block... - BasicBlock *Split = BB->splitBasicBlock(CI, CI->getName()+".noexc"); - - // Next, create the new invoke instruction, inserting it at the end - // of the old basic block. - new InvokeInst(CI->getCalledValue(), Split, InvokeDest, - std::vector(CI->op_begin()+1, CI->op_end()), - CI->getName(), BB->getTerminator()); + // Convert this function call into an invoke instruction... - // Delete the unconditional branch inserted by splitBasicBlock - BB->getInstList().pop_back(); - Split->getInstList().pop_front(); // Delete the original call - - // This basic block is now complete, start scanning the next one. - break; - } else { - ++I; - } + // First, split the basic block... + BasicBlock *Split = BB->splitBasicBlock(CI, CI->getName()+".noexc"); + + // Next, create the new invoke instruction, inserting it at the end + // of the old basic block. + new InvokeInst(CI->getCalledValue(), Split, InvokeDest, + std::vector(CI->op_begin()+1, CI->op_end()), + CI->getName(), BB->getTerminator()); + + // Delete the unconditional branch inserted by splitBasicBlock + BB->getInstList().pop_back(); + Split->getInstList().pop_front(); // Delete the original call + + // This basic block is now complete, start scanning the next one. + break; } else { ++I; } From lattner at cs.uiuc.edu Mon Sep 8 14:45:02 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Mon Sep 8 14:45:02 2003 Subject: [llvm-commits] CVS: llvm/lib/Bytecode/Reader/ReadInst.cpp Message-ID: <200309081943.OAA04746@apoc.cs.uiuc.edu> Changes in directory llvm/lib/Bytecode/Reader: ReadInst.cpp updated: 1.49 -> 1.50 --- Log message: Fix bug --- Diffs of the changes: Index: llvm/lib/Bytecode/Reader/ReadInst.cpp diff -u llvm/lib/Bytecode/Reader/ReadInst.cpp:1.49 llvm/lib/Bytecode/Reader/ReadInst.cpp:1.50 --- llvm/lib/Bytecode/Reader/ReadInst.cpp:1.49 Mon Sep 8 13:54:49 2003 +++ llvm/lib/Bytecode/Reader/ReadInst.cpp Mon Sep 8 14:43:46 2003 @@ -423,7 +423,8 @@ } case Instruction::Unwind: if (Raw.NumOperands != 0) return true; - return new UnwindInst(); + Res = new UnwindInst(); + return false; } // end switch(Raw.Opcode) std::cerr << "Unrecognized instruction! " << Raw.Opcode From lattner at cs.uiuc.edu Mon Sep 8 14:45:04 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Mon Sep 8 14:45:04 2003 Subject: [llvm-commits] CVS: llvm/lib/CWriter/Writer.cpp Message-ID: <200309081944.OAA05000@apoc.cs.uiuc.edu> Changes in directory llvm/lib/CWriter: Writer.cpp updated: 1.121 -> 1.122 --- Log message: Eliminate support for the llvm.unwind intrinisic, using the Unwind instruction instead --- Diffs of the changes: Index: llvm/lib/CWriter/Writer.cpp diff -u llvm/lib/CWriter/Writer.cpp:1.121 llvm/lib/CWriter/Writer.cpp:1.122 --- llvm/lib/CWriter/Writer.cpp:1.121 Mon Sep 8 13:54:50 2003 +++ llvm/lib/CWriter/Writer.cpp Mon Sep 8 14:44:20 2003 @@ -1153,19 +1153,6 @@ Out << ")"; return; - case LLVMIntrinsic::unwind: - // The unwind intrinsic calls a control flow transfer out of the current - // function, unwinding the stack until a caller who used the invoke - // instruction is found. In this context, we code generated the invoke - // instruction to add an entry to the top of the jmpbuf_list. Thus, - // here we just have to longjmp to the specified handler. - Out << "if (__llvm_jmpbuf_list == 0) { /* llvm.unwind */\n" - << " printf(\"throw found with no handler!\\n\"); abort();\n" - << " }\n" - << " longjmp(__llvm_jmpbuf_list->buf, 1)"; - return; - - case LLVMIntrinsic::setjmp: case LLVMIntrinsic::sigsetjmp: // This instrinsic should never exist in the program, but until we get From lattner at cs.uiuc.edu Mon Sep 8 14:45:06 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Mon Sep 8 14:45:06 2003 Subject: [llvm-commits] CVS: llvm/lib/Target/X86/InstSelectSimple.cpp Message-ID: <200309081944.OAA05007@apoc.cs.uiuc.edu> Changes in directory llvm/lib/Target/X86: InstSelectSimple.cpp updated: 1.125 -> 1.126 --- Log message: Eliminate support for the llvm.unwind intrinisic, using the Unwind instruction instead --- Diffs of the changes: Index: llvm/lib/Target/X86/InstSelectSimple.cpp diff -u llvm/lib/Target/X86/InstSelectSimple.cpp:1.125 llvm/lib/Target/X86/InstSelectSimple.cpp:1.126 --- llvm/lib/Target/X86/InstSelectSimple.cpp:1.125 Mon Sep 8 13:54:52 2003 +++ llvm/lib/Target/X86/InstSelectSimple.cpp Mon Sep 8 14:44:21 2003 @@ -1044,7 +1044,6 @@ addDirectMem(BuildMI(BB, X86::MOVrm32, 5), TmpReg2).addReg(TmpReg1); return; - case LLVMIntrinsic::unwind: // llvm.unwind is not supported yet! case LLVMIntrinsic::longjmp: case LLVMIntrinsic::siglongjmp: BuildMI(BB, X86::CALLpcrel32, 1).addExternalSymbol("abort", true); From lattner at cs.uiuc.edu Mon Sep 8 14:45:08 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Mon Sep 8 14:45:08 2003 Subject: [llvm-commits] CVS: llvm/lib/Transforms/IPO/PruneEH.cpp Message-ID: <200309081944.OAA05014@apoc.cs.uiuc.edu> Changes in directory llvm/lib/Transforms/IPO: PruneEH.cpp updated: 1.2 -> 1.3 --- Log message: Eliminate support for the llvm.unwind intrinisic, using the Unwind instruction instead --- Diffs of the changes: Index: llvm/lib/Transforms/IPO/PruneEH.cpp diff -u llvm/lib/Transforms/IPO/PruneEH.cpp:1.2 llvm/lib/Transforms/IPO/PruneEH.cpp:1.3 --- llvm/lib/Transforms/IPO/PruneEH.cpp:1.2 Sun Aug 31 11:30:07 2003 +++ llvm/lib/Transforms/IPO/PruneEH.cpp Mon Sep 8 14:44:23 2003 @@ -38,7 +38,7 @@ // First, check to see if any callees might throw or if there are any external // functions in this SCC: if so, we cannot prune any functions in this SCC. - // If this SCC includes the llvm.unwind intrinsic, we KNOW it throws, so + // If this SCC includes the unwind instruction, we KNOW it throws, so // obviously the SCC might throw. // bool SCCMightThrow = false; @@ -48,10 +48,11 @@ std::find(SCC.begin(), SCC.end(), SCC[i]) == SCC.end()) { SCCMightThrow = true; break; } else if (Function *F = SCC[i]->getFunction()) - if (F->isExternal() || // Is external function - F->getIntrinsicID() == LLVMIntrinsic::unwind) {// Is unwind function! - SCCMightThrow = true; break; - } + if (!F->isExternal()) + for (Function::iterator I = F->begin(), E = F->end(); I != E; ++I) + if (isa(I->getTerminator())) { // Uses unwind! + SCCMightThrow = true; break; + } bool MadeChange = false; From lattner at cs.uiuc.edu Mon Sep 8 14:45:09 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Mon Sep 8 14:45:09 2003 Subject: [llvm-commits] CVS: llvm/lib/Transforms/Utils/InlineFunction.cpp SimplifyCFG.cpp Message-ID: <200309081944.OAA05023@apoc.cs.uiuc.edu> Changes in directory llvm/lib/Transforms/Utils: InlineFunction.cpp updated: 1.6 -> 1.7 SimplifyCFG.cpp updated: 1.14 -> 1.15 --- Log message: Eliminate support for the llvm.unwind intrinisic, using the Unwind instruction instead --- Diffs of the changes: Index: llvm/lib/Transforms/Utils/InlineFunction.cpp diff -u llvm/lib/Transforms/Utils/InlineFunction.cpp:1.6 llvm/lib/Transforms/Utils/InlineFunction.cpp:1.7 --- llvm/lib/Transforms/Utils/InlineFunction.cpp:1.6 Mon Sep 8 14:00:30 2003 +++ llvm/lib/Transforms/Utils/InlineFunction.cpp Mon Sep 8 14:44:25 2003 @@ -177,38 +177,13 @@ // If we just inlined a call due to an invoke instruction, scan the inlined // function checking for function calls that should now be made into invoke - // instructions, and for llvm.exc.rethrow()'s which should be turned into - // branches. + // instructions, and for unwind's which should be turned into branches. if (InvokeDest) - for (Function::iterator BB = LastBlock, E = Caller->end(); BB != E; ++BB) + for (Function::iterator BB = LastBlock, E = Caller->end(); BB != E; ++BB) { for (BasicBlock::iterator I = BB->begin(), E = BB->end(); I != E; ) { // We only need to check for function calls: inlined invoke instructions // require no special handling... if (CallInst *CI = dyn_cast(I)) { - if (Function *F = CI->getCalledFunction()) - if (unsigned ID = F->getIntrinsicID()) - if (ID == LLVMIntrinsic::unwind) { - // llvm.unwind requires special handling when it gets inlined - // into an invoke site. Once this happens, we know that the - // unwind would cause a control transfer to the invoke exception - // destination, so we can transform it into a direct branch to - // the exception destination. - BranchInst *BI = new BranchInst(InvokeDest, CI); - - // Note that since any instructions after the rethrow/branch are - // dead, we must delete them now (otherwise the terminator we - // just inserted wouldn't be at the end of the basic block!) - BasicBlock *CurBB = BB; - while (&CurBB->back() != BI) { - Instruction *I = &CurBB->back(); - if (!I->use_empty()) - I->replaceAllUsesWith(Constant::getNullValue(I->getType())); - CurBB->getInstList().pop_back(); - } - - break; // Done with this basic block! - } - // Convert this function call into an invoke instruction... // First, split the basic block... @@ -230,6 +205,18 @@ ++I; } } + + if (UnwindInst *UI = dyn_cast(BB->getTerminator())) { + // An UnwindInst requires special handling when it gets inlined into an + // invoke site. Once this happens, we know that the unwind would cause + // a control transfer to the invoke exception destination, so we can + // transform it into a direct branch to the exception destination. + BranchInst *BI = new BranchInst(InvokeDest, UI); + + // Delete the unwind instruction! + UI->getParent()->getInstList().pop_back(); + } + } // Now that the function is correct, make it a little bit nicer. In // particular, move the basic blocks inserted from the end of the function Index: llvm/lib/Transforms/Utils/SimplifyCFG.cpp diff -u llvm/lib/Transforms/Utils/SimplifyCFG.cpp:1.14 llvm/lib/Transforms/Utils/SimplifyCFG.cpp:1.15 --- llvm/lib/Transforms/Utils/SimplifyCFG.cpp:1.14 Sun Aug 24 13:36:16 2003 +++ llvm/lib/Transforms/Utils/SimplifyCFG.cpp Mon Sep 8 14:44:25 2003 @@ -101,32 +101,31 @@ // 'llvm.unwind'. If so, replace any invoke instructions which use this as an // exception destination with call instructions. // - if (CallInst *CI = dyn_cast(&BB->front())) - if (Function *F = CI->getCalledFunction()) - if (F->getIntrinsicID() == LLVMIntrinsic::unwind) { - std::vector Preds(pred_begin(BB), pred_end(BB)); - while (!Preds.empty()) { - BasicBlock *Pred = Preds.back(); - if (InvokeInst *II = dyn_cast(Pred->getTerminator())) - if (II->getExceptionalDest() == BB) { - // Insert a new branch instruction before the invoke, because this - // is now a fall through... - BranchInst *BI = new BranchInst(II->getNormalDest(), II); - Pred->getInstList().remove(II); // Take out of symbol table - - // Insert the call now... - std::vector Args(II->op_begin()+3, II->op_end()); - CallInst *CI = new CallInst(II->getCalledValue(), Args, - II->getName(), BI); - // If the invoke produced a value, the Call now does instead - II->replaceAllUsesWith(CI); - delete II; - Changed = true; - } - - Preds.pop_back(); - } + if (UnwindInst *UI = dyn_cast(BB->getTerminator())) + if (BB->begin() == BasicBlock::iterator(UI)) { // Empty block? + std::vector Preds(pred_begin(BB), pred_end(BB)); + while (!Preds.empty()) { + BasicBlock *Pred = Preds.back(); + if (InvokeInst *II = dyn_cast(Pred->getTerminator())) + if (II->getExceptionalDest() == BB) { + // Insert a new branch instruction before the invoke, because this + // is now a fall through... + BranchInst *BI = new BranchInst(II->getNormalDest(), II); + Pred->getInstList().remove(II); // Take out of symbol table + + // Insert the call now... + std::vector Args(II->op_begin()+3, II->op_end()); + CallInst *CI = new CallInst(II->getCalledValue(), Args, + II->getName(), BI); + // If the invoke produced a value, the Call now does instead + II->replaceAllUsesWith(CI); + delete II; + Changed = true; + } + + Preds.pop_back(); } + } // Remove basic blocks that have no predecessors... which are unreachable. if (pred_begin(BB) == pred_end(BB) && From lattner at cs.uiuc.edu Mon Sep 8 14:45:11 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Mon Sep 8 14:45:11 2003 Subject: [llvm-commits] CVS: llvm/lib/VMCore/Function.cpp Verifier.cpp Message-ID: <200309081944.OAA05033@apoc.cs.uiuc.edu> Changes in directory llvm/lib/VMCore: Function.cpp updated: 1.46 -> 1.47 Verifier.cpp updated: 1.58 -> 1.59 --- Log message: Eliminate support for the llvm.unwind intrinisic, using the Unwind instruction instead --- Diffs of the changes: Index: llvm/lib/VMCore/Function.cpp diff -u llvm/lib/VMCore/Function.cpp:1.46 llvm/lib/VMCore/Function.cpp:1.47 --- llvm/lib/VMCore/Function.cpp:1.46 Mon Aug 25 17:35:01 2003 +++ llvm/lib/VMCore/Function.cpp Mon Sep 8 14:44:26 2003 @@ -203,9 +203,6 @@ if (getName() == "llvm.sigsetjmp") return LLVMIntrinsic::sigsetjmp; if (getName() == "llvm.siglongjmp") return LLVMIntrinsic::siglongjmp; break; - case 'u': - if (getName() == "llvm.unwind") return LLVMIntrinsic::unwind; - break; case 'v': if (getName() == "llvm.va_copy") return LLVMIntrinsic::va_copy; if (getName() == "llvm.va_end") return LLVMIntrinsic::va_end; Index: llvm/lib/VMCore/Verifier.cpp diff -u llvm/lib/VMCore/Verifier.cpp:1.58 llvm/lib/VMCore/Verifier.cpp:1.59 --- llvm/lib/VMCore/Verifier.cpp:1.58 Mon Aug 25 17:35:01 2003 +++ llvm/lib/VMCore/Verifier.cpp Mon Sep 8 14:44:26 2003 @@ -522,8 +522,6 @@ case LLVMIntrinsic::va_end: NumArgs = 1; break; case LLVMIntrinsic::va_copy: NumArgs = 2; break; - case LLVMIntrinsic::unwind: NumArgs = 0; break; - case LLVMIntrinsic::setjmp: NumArgs = 1; break; case LLVMIntrinsic::longjmp: NumArgs = 2; break; case LLVMIntrinsic::sigsetjmp: NumArgs = 2; break; From lattner at cs.uiuc.edu Mon Sep 8 14:45:13 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Mon Sep 8 14:45:13 2003 Subject: [llvm-commits] CVS: llvm/include/llvm/Intrinsics.h Message-ID: <200309081944.OAA05046@apoc.cs.uiuc.edu> Changes in directory llvm/include/llvm: Intrinsics.h updated: 1.9 -> 1.10 --- Log message: Eliminate the unwind intrinsic, it is now an instruction --- Diffs of the changes: Index: llvm/include/llvm/Intrinsics.h diff -u llvm/include/llvm/Intrinsics.h:1.9 llvm/include/llvm/Intrinsics.h:1.10 --- llvm/include/llvm/Intrinsics.h:1.9 Mon Aug 25 17:34:59 2003 +++ llvm/include/llvm/Intrinsics.h Mon Sep 8 14:44:47 2003 @@ -22,8 +22,6 @@ va_end, // Used to represent a va_end call in C va_copy, // Used to represent a va_copy call in C - unwind, // Unwind stack until containing invoke is found - // Setjmp/Longjmp intrinsics... setjmp, // Used to represent a setjmp call in C longjmp, // Used to represent a longjmp call in C From lattner at cs.uiuc.edu Mon Sep 8 15:30:03 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Mon Sep 8 15:30:03 2003 Subject: [llvm-commits] CVS: llvm/lib/AsmParser/llvmAsmParser.y Message-ID: <200309082029.PAA09304@apoc.cs.uiuc.edu> Changes in directory llvm/lib/AsmParser: llvmAsmParser.y updated: 1.123 -> 1.124 --- Log message: Oops, look at the VOLATILE marker, not the opcode --- Diffs of the changes: Index: llvm/lib/AsmParser/llvmAsmParser.y diff -u llvm/lib/AsmParser/llvmAsmParser.y:1.123 llvm/lib/AsmParser/llvmAsmParser.y:1.124 --- llvm/lib/AsmParser/llvmAsmParser.y:1.123 Mon Sep 8 13:54:48 2003 +++ llvm/lib/AsmParser/llvmAsmParser.y Mon Sep 8 15:29:46 2003 @@ -1749,7 +1749,7 @@ if (!isa($3->get())) ThrowException("Can't load from nonpointer type: " + (*$3)->getDescription()); - $$ = new LoadInst(getVal(*$3, $4), "", $2); + $$ = new LoadInst(getVal(*$3, $4), "", $1); delete $3; } | OptVolatile STORE ResolvedVal ',' Types ValueRef { @@ -1762,7 +1762,7 @@ ThrowException("Can't store '" + $3->getType()->getDescription() + "' into space of type '" + ElTy->getDescription() + "'!"); - $$ = new StoreInst($3, getVal(*$5, $6), $2); + $$ = new StoreInst($3, getVal(*$5, $6), $1); delete $5; } | GETELEMENTPTR Types ValueRef IndexList { From gaeke at cs.uiuc.edu Mon Sep 8 16:00:02 2003 From: gaeke at cs.uiuc.edu (Brian Gaeke) Date: Mon Sep 8 16:00:02 2003 Subject: [llvm-commits] CVS: reopt/lib/LightWtProfiling/RuntimeOptimizations.cpp Message-ID: <200309082059.PAA11644@apoc.cs.uiuc.edu> Changes in directory reopt/lib/LightWtProfiling: RuntimeOptimizations.cpp updated: 1.6 -> 1.7 --- Log message: Take out debug message. Don't dump traces to file. Jot down some notes about code-generating the function (#if 0'd out). --- Diffs of the changes: Index: reopt/lib/LightWtProfiling/RuntimeOptimizations.cpp diff -u reopt/lib/LightWtProfiling/RuntimeOptimizations.cpp:1.6 reopt/lib/LightWtProfiling/RuntimeOptimizations.cpp:1.7 --- reopt/lib/LightWtProfiling/RuntimeOptimizations.cpp:1.6 Tue Sep 2 01:46:39 2003 +++ reopt/lib/LightWtProfiling/RuntimeOptimizations.cpp Mon Sep 8 15:58:59 2003 @@ -13,6 +13,7 @@ #include "Support/StringExtras.h" #include "llvm/PassManager.h" #include "llvm/BasicBlock.h" +#include "llvm/Analysis/Verifier.h" #include #include @@ -30,8 +31,7 @@ void optimizeTrace (std::vector &vBB, uint64_t a) { static std::set alreadyDone; if (alreadyDone.find (a) != alreadyDone.end ()) { - DEBUG(std::cerr << "In optimizeTrace; already did this trace! a = " - << a << "\n"); + // Used to have debug msg here, but it generated megabytes of spam. return; } else { alreadyDone.insert(a); @@ -51,14 +51,32 @@ // Create Trace object. Trace T (vBB); - static int count = 0; - count++; - std::string filename ("traceout" + itostr (count) + ".txt"); - DEBUG(std::cerr << "Dumping trace to file " << filename << "\n"); - std::ofstream o (filename.c_str ()); - T.print (o); // Try to turn it into a function Function *TF = runTraceToFunction (T); DEBUG(std::cerr << "Function created from trace: \n" << *TF); + + // Run some stuff on it + FunctionPassManager PM; + PM.add (createVerifierPass ()); + PM.run (*TF); + +#if 0 + + // Make the ExecutionEngine generate code for the function and give us + // a pointer to it. + // FIXME: Register allocation hints presumably would need to be added + // to the PassManager of the ExecutionEngine. + ExecutionEngine *EE = new ExecutionEngine (TF->getParent (), false, false); + void (*p)() = EE->getPointerToFunction (TF); + + // Generate basic block with fixup code for entry: + // Suppose we have a ValueToRegMap which maps values to machine registers + // at the entry to the first on-trace basic block. + // (How would we get this?) + // For each value V in the Trace's live-in set, + // We want to copy V from its register in the matrix function ... + + +#endif } From criswell at cs.uiuc.edu Mon Sep 8 16:27:03 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Mon Sep 8 16:27:03 2003 Subject: [llvm-commits] CVS: llvm/test/Makefile Message-ID: <200309082126.QAA00503@choi.cs.uiuc.edu> Changes in directory llvm/test: Makefile updated: 1.37 -> 1.38 --- Log message: Added the .t implicit rule. You can now run an individual set of QMTests by specifying "make .t" For example, make feature.t will run the feature tests. Removed the QMTESTS variable since it is no longer used. --- Diffs of the changes: Index: llvm/test/Makefile diff -u llvm/test/Makefile:1.37 llvm/test/Makefile:1.38 --- llvm/test/Makefile:1.37 Sat Sep 6 10:12:21 2003 +++ llvm/test/Makefile Mon Sep 8 16:25:35 2003 @@ -13,10 +13,6 @@ # will use QMTest by default. # -# List of the functioning QM Tests -QMTESTS=feature \ - regression - # QMTest option specifying the location of the QMTest database. QMDB= -D $(LLVM_SRC_ROOT)/test/QMTestDB @@ -46,6 +42,8 @@ qmtest:: $(LLVM_OBJ_ROOT)/test/tmp register $(QMTEST) run -O $(LLVM_SRC_ROOT)/test/QMTestDB/expectations.qmr $(CONTEXT) +%.t:: $(LLVM_OBJ_ROOT)/test/tmp register + $(QMTEST) run -O $(LLVM_SRC_ROOT)/test/QMTestDB/expectations.qmr $(CONTEXT) $* # # Create the temporary directory used by the test suite. From criswell at cs.uiuc.edu Tue Sep 9 09:38:01 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Tue Sep 9 09:38:01 2003 Subject: [llvm-commits] CVS: llvm/utils/TableGen/FileLexer.l Message-ID: <200309091437.JAA02568@choi.cs.uiuc.edu> Changes in directory llvm/utils/TableGen: FileLexer.l updated: 1.14 -> 1.15 --- Log message: Modified the code so that we exit() with a non-zero value instead of calling abort() when we can't open the input filename. The abort() function generates a core dump if possible and is meant for handling errors so grand that even the program knows that debugging is necessary. --- Diffs of the changes: Index: llvm/utils/TableGen/FileLexer.l diff -u llvm/utils/TableGen/FileLexer.l:1.14 llvm/utils/TableGen/FileLexer.l:1.15 --- llvm/utils/TableGen/FileLexer.l:1.14 Sun Sep 7 00:09:32 2003 +++ llvm/utils/TableGen/FileLexer.l Tue Sep 9 09:37:48 2003 @@ -82,7 +82,7 @@ if (F == 0) { std::cerr << "Could not open input file '" + Filename + "'!\n"; - abort(); + exit (1); } IncludeStack.push_back(IncludeRec(Filename, F)); } else { From criswell at cs.uiuc.edu Tue Sep 9 10:28:02 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Tue Sep 9 10:28:02 2003 Subject: [llvm-commits] CVS: llvm/utils/Burg/LOG_CHANGES Message-ID: <200309091527.KAA03274@choi.cs.uiuc.edu> Changes in directory llvm/utils/Burg: LOG_CHANGES updated: 1.1 -> 1.2 --- Log message: Updated the log of changes (as required by the Burg copyright) to give an overview of what we changed (which is probably all that the author was looking for). --- Diffs of the changes: Index: llvm/utils/Burg/LOG_CHANGES diff -u llvm/utils/Burg/LOG_CHANGES:1.1 llvm/utils/Burg/LOG_CHANGES:1.2 --- llvm/utils/Burg/LOG_CHANGES:1.1 Tue Sep 17 18:03:29 2002 +++ llvm/utils/Burg/LOG_CHANGES Tue Sep 9 10:27:40 2003 @@ -1,2 +1,10 @@ 8/20/02 -- Vikram Adve be.c: Replaced "char*" with "const char*" to avoid compiler warnings. + +9/9/03 -- John Criswell + b.h be.c fe.h gram.y lex.c main.c map.c nontermainl.c plan.c zalloc.c: + A cursory look through our logs and comments indicates that these are + the only modified files. No feature enhancements have been made; + rather, all changes either fix minor programming errors, get rid of + warnings, ANSI-ify the code, or integrate Burg into our build system. + From lattner at cs.uiuc.edu Tue Sep 9 11:24:03 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Tue Sep 9 11:24:03 2003 Subject: [llvm-commits] CVS: llvm/lib/Target/X86/Printer.cpp Message-ID: <200309091623.LAA19412@apoc.cs.uiuc.edu> Changes in directory llvm/lib/Target/X86: Printer.cpp updated: 1.59 -> 1.60 --- Log message: * Simplify printConstantValueOnly by moving the tail padding stuff directly into the struct case. * Extend printConstantValueOnly to print .zero's if the initializer is zero * Delete dead isConstantFunctionPointerRef function * Emit the appropriate assembly for the various linkage types! --- Diffs of the changes: Index: llvm/lib/Target/X86/Printer.cpp diff -u llvm/lib/Target/X86/Printer.cpp:1.59 llvm/lib/Target/X86/Printer.cpp:1.60 --- llvm/lib/Target/X86/Printer.cpp:1.59 Wed Aug 13 13:15:15 2003 +++ llvm/lib/Target/X86/Printer.cpp Tue Sep 9 11:23:36 2003 @@ -71,7 +71,7 @@ std::string valToExprString(const Value* V); bool doInitialization(Module &M); bool doFinalization(Module &M); - void printConstantValueOnly(const Constant* CV, int numPadBytesAfter = 0); + void printConstantValueOnly(const Constant* CV); void printSingleConstantValue(const Constant* CV); }; } // end of anonymous namespace @@ -318,50 +318,45 @@ // Print a constant value or values (it may be an aggregate). // Uses printSingleConstantValue() to print each individual value. -void -Printer::printConstantValueOnly(const Constant* CV, - int numPadBytesAfter /* = 0 */) -{ - const ConstantArray *CVA = dyn_cast(CV); +void Printer::printConstantValueOnly(const Constant *CV) { const TargetData &TD = TM.getTargetData(); - if (CVA && isStringCompatible(CVA)) - { // print the string alone and return + if (CV->isNullValue()) { + O << "\t.zero\t " << TD.getTypeSize(CV->getType()) << "\n"; + } else if (const ConstantArray *CVA = dyn_cast(CV)) { + if (isStringCompatible(CVA)) { + // print the string alone and return O << "\t.string\t" << getAsCString(CVA) << "\n"; - } - else if (CVA) - { // Not a string. Print the values in successive locations + } else { // Not a string. Print the values in successive locations const std::vector &constValues = CVA->getValues(); for (unsigned i=0; i < constValues.size(); i++) printConstantValueOnly(cast(constValues[i].get())); } - else if (const ConstantStruct *CVS = dyn_cast(CV)) - { // Print the fields in successive locations. Pad to align if needed! - const StructLayout *cvsLayout = - TD.getStructLayout(CVS->getType()); - const std::vector& constValues = CVS->getValues(); - unsigned sizeSoFar = 0; - for (unsigned i=0, N = constValues.size(); i < N; i++) - { - const Constant* field = cast(constValues[i].get()); - - // Check if padding is needed and insert one or more 0s. - unsigned fieldSize = TD.getTypeSize(field->getType()); - int padSize = ((i == N-1? cvsLayout->StructSize - : cvsLayout->MemberOffsets[i+1]) - - cvsLayout->MemberOffsets[i]) - fieldSize; - sizeSoFar += (fieldSize + padSize); - - // Now print the actual field value - printConstantValueOnly(field, padSize); - } - assert(sizeSoFar == cvsLayout->StructSize && - "Layout of constant struct may be incorrect!"); - } - else + } else if (const ConstantStruct *CVS = dyn_cast(CV)) { + // Print the fields in successive locations. Pad to align if needed! + const StructLayout *cvsLayout = TD.getStructLayout(CVS->getType()); + const std::vector& constValues = CVS->getValues(); + unsigned sizeSoFar = 0; + for (unsigned i=0, N = constValues.size(); i < N; i++) { + const Constant* field = cast(constValues[i].get()); + + // Check if padding is needed and insert one or more 0s. + unsigned fieldSize = TD.getTypeSize(field->getType()); + unsigned padSize = ((i == N-1? cvsLayout->StructSize + : cvsLayout->MemberOffsets[i+1]) + - cvsLayout->MemberOffsets[i]) - fieldSize; + sizeSoFar += fieldSize + padSize; + + // Now print the actual field value + printConstantValueOnly(field); + + // Insert the field padding unless it's zero bytes... + O << "\t.zero\t " << padSize << "\n"; + } + assert(sizeSoFar == cvsLayout->StructSize && + "Layout of constant struct may be incorrect!"); + } else printSingleConstantValue(CV); - - if (numPadBytesAfter) O << "\t.zero\t " << numPadBytesAfter << "\n"; } /// printConstantPool - Print to the current output stream assembly @@ -472,14 +467,13 @@ case MachineOperand::MO_UnextendedImmed: O << (int)MO.getImmedValue(); return; - case MachineOperand::MO_PCRelativeDisp: - { - ValueMapTy::const_iterator i = NumberForBB.find(MO.getVRegValue()); - assert (i != NumberForBB.end() - && "Could not find a BB I previously put in the NumberForBB map!"); - O << ".LBB" << i->second << " # PC rel: " << MO.getVRegValue()->getName(); - } + case MachineOperand::MO_PCRelativeDisp: { + ValueMapTy::const_iterator i = NumberForBB.find(MO.getVRegValue()); + assert (i != NumberForBB.end() + && "Could not find a BB in the NumberForBB map!"); + O << ".LBB" << i->second << " # PC rel: " << MO.getVRegValue()->getName(); return; + } case MachineOperand::MO_GlobalAddress: if (!elideOffsetKeyword) O << "OFFSET "; @@ -923,33 +917,69 @@ return false; // success } -static const Function *isConstantFunctionPointerRef(const Constant *C) { - if (const ConstantPointerRef *R = dyn_cast(C)) - if (const Function *F = dyn_cast(R->getValue())) - return F; - return 0; +// SwitchSection - Switch to the specified section of the executable if we are +// not already in it! +// +static void SwitchSection(std::ostream &OS, std::string &CurSection, + const char *NewSection) { + if (CurSection != NewSection) { + CurSection = NewSection; + if (!CurSection.empty()) + OS << "\t" << NewSection << "\n"; + } } -bool Printer::doFinalization(Module &M) -{ +bool Printer::doFinalization(Module &M) { const TargetData &TD = TM.getTargetData(); + std::string CurSection; + // Print out module-level global variables here. - for (Module::const_giterator I = M.gbegin(), E = M.gend(); I != E; ++I) { - std::string name(Mang->getValueName(I)); - if (I->hasInitializer()) { + for (Module::const_giterator I = M.gbegin(), E = M.gend(); I != E; ++I) + if (I->hasInitializer()) { // External global require no code + O << "\n\n"; + std::string name = Mang->getValueName(I); Constant *C = I->getInitializer(); - if (C->isNullValue()) { - O << "\n\n\t.comm " << name << "," << TD.getTypeSize(C->getType()) + unsigned Size = TD.getTypeSize(C->getType()); + unsigned Align = TD.getTypeAlignment(C->getType()); + + if (C->isNullValue() && + (I->hasLinkOnceLinkage() || I->hasInternalLinkage())) { + SwitchSection(O, CurSection, ".data"); + if (I->hasInternalLinkage()) + O << "\t.local " << name << "\n"; + + O << "\t.comm " << name << "," << TD.getTypeSize(C->getType()) << "," << (unsigned)TD.getTypeAlignment(C->getType()); O << "\t\t# "; WriteAsOperand(O, I, true, true, &M); O << "\n"; } else { - O << "\n\n\t.data\n"; - O << "\t.globl " << name << "\n"; + switch (I->getLinkage()) { + case GlobalValue::LinkOnceLinkage: + // Nonnull linkonce -> weak + O << "\t.weak " << name << "\n"; + SwitchSection(O, CurSection, ""); + O << "\t.section\t.llvm.linkonce.d." << name << ",\"aw\", at progbits\n"; + break; + + case GlobalValue::AppendingLinkage: + // FIXME: appending linkage variables should go into a section of + // their name or something. For now, just emit them as external. + case GlobalValue::ExternalLinkage: + // If external or appending, declare as a global symbol + O << "\t.globl " << name << "\n"; + // FALL THROUGH + case GlobalValue::InternalLinkage: + if (C->isNullValue()) + SwitchSection(O, CurSection, ".bss"); + else + SwitchSection(O, CurSection, ".data"); + break; + } + + O << "\t.align " << Align << "\n"; O << "\t.type " << name << ", at object\n"; - O << "\t.size " << name << "," << TD.getTypeSize(C->getType()) << "\n"; - O << "\t.align " << (unsigned)TD.getTypeAlignment(C->getType()) << "\n"; + O << "\t.size " << name << "," << Size << "\n"; O << name << ":\t\t\t\t# "; WriteAsOperand(O, I, true, true, &M); O << " = "; @@ -957,13 +987,8 @@ O << "\n"; printConstantValueOnly(C); } - } else { - O << "\t.globl " << name << "\n"; - O << "\t.comm " << name << ", " - << (unsigned)TD.getTypeSize(I->getType()) << ", " - << (unsigned)TD.getTypeAlignment(I->getType()) << "\n"; } - } + delete Mang; return false; // success } From criswell at cs.uiuc.edu Tue Sep 9 11:37:03 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Tue Sep 9 11:37:03 2003 Subject: [llvm-commits] CVS: llvm/lib/VMCore/Function.cpp Message-ID: <200309091636.LAA19154@choi.cs.uiuc.edu> Changes in directory llvm/lib/VMCore: Function.cpp updated: 1.47 -> 1.48 --- Log message: Modified the check for intrinsic functions. All intrinsic functions have to be at least 6 characters, since something must follow the "llvm." string in the function name. This seems to fix an assertion failure with the SingleSource tests, too. --- Diffs of the changes: Index: llvm/lib/VMCore/Function.cpp diff -u llvm/lib/VMCore/Function.cpp:1.47 llvm/lib/VMCore/Function.cpp:1.48 --- llvm/lib/VMCore/Function.cpp:1.47 Mon Sep 8 14:44:26 2003 +++ llvm/lib/VMCore/Function.cpp Tue Sep 9 11:36:09 2003 @@ -159,7 +159,7 @@ /// llvm/Intrinsics.h. /// unsigned Function::getIntrinsicID() const { - if (getName().size() <= 5 || getName()[4] != '.' || getName()[0] != 'l' || + if (getName().size() <= 6 || getName()[4] != '.' || getName()[0] != 'l' || getName()[1] != 'l' || getName()[2] != 'v' || getName()[3] != 'm') return 0; // All intrinsics start with 'llvm.' From criswell at cs.uiuc.edu Tue Sep 9 11:59:02 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Tue Sep 9 11:59:02 2003 Subject: [llvm-commits] CVS: llvm/lib/VMCore/Function.cpp Message-ID: <200309091658.LAA21940@choi.cs.uiuc.edu> Changes in directory llvm/lib/VMCore: Function.cpp updated: 1.48 -> 1.49 --- Log message: Reverting back to the previous revision. We want to check for length 5 because we might get the "llvm." string as the name. That string is in the LLVM namespace and should be checked as such. We also don't have to worry about garbage data because (I believe) the string class will return a valid value. So, the switch statement will work and we don't have to worry about the code wandering into segfault land. --- Diffs of the changes: Index: llvm/lib/VMCore/Function.cpp diff -u llvm/lib/VMCore/Function.cpp:1.48 llvm/lib/VMCore/Function.cpp:1.49 --- llvm/lib/VMCore/Function.cpp:1.48 Tue Sep 9 11:36:09 2003 +++ llvm/lib/VMCore/Function.cpp Tue Sep 9 11:58:41 2003 @@ -159,7 +159,7 @@ /// llvm/Intrinsics.h. /// unsigned Function::getIntrinsicID() const { - if (getName().size() <= 6 || getName()[4] != '.' || getName()[0] != 'l' || + if (getName().size() <= 5 || getName()[4] != '.' || getName()[0] != 'l' || getName()[1] != 'l' || getName()[2] != 'v' || getName()[3] != 'm') return 0; // All intrinsics start with 'llvm.' From sabre at nondot.org Tue Sep 9 12:03:02 2003 From: sabre at nondot.org (Chris Lattner) Date: Tue Sep 9 12:03:02 2003 Subject: [llvm-commits] CVS: llvm/lib/VMCore/Function.cpp In-Reply-To: <200309091658.LAA21940@choi.cs.uiuc.edu> Message-ID: > Reverting back to the previous revision. > We want to check for length 5 because we might get the "llvm." string as the > name. That string is in the LLVM namespace and should be checked as such. > We also don't have to worry about garbage data because (I believe) the string > class will return a valid value. So, the switch statement will work and we > don't have to worry about the code wandering into segfault land. I don't understand why we could ever get a segfault here. We only access portions of the string if we know it to be LONGER than 5 characters. In fact, the check should be size() < 5, to consider the "llvm." function as part of the name space. Am I missing something here? -Chris > Diffs of the changes: > > Index: llvm/lib/VMCore/Function.cpp > diff -u llvm/lib/VMCore/Function.cpp:1.48 llvm/lib/VMCore/Function.cpp:1.49 > --- llvm/lib/VMCore/Function.cpp:1.48 Tue Sep 9 11:36:09 2003 > +++ llvm/lib/VMCore/Function.cpp Tue Sep 9 11:58:41 2003 > @@ -159,7 +159,7 @@ > /// llvm/Intrinsics.h. > /// > unsigned Function::getIntrinsicID() const { > - if (getName().size() <= 6 || getName()[4] != '.' || getName()[0] != 'l' || > + if (getName().size() <= 5 || getName()[4] != '.' || getName()[0] != 'l' || > getName()[1] != 'l' || getName()[2] != 'v' || getName()[3] != 'm') > return 0; // All intrinsics start with 'llvm.' > > > > _______________________________________________ > llvm-commits mailing list > llvm-commits at cs.uiuc.edu > http://mail.cs.uiuc.edu/mailman/listinfo/llvm-commits > -Chris -- http://llvm.cs.uiuc.edu/ http://www.nondot.org/~sabre/Projects/ From lattner at cs.uiuc.edu Tue Sep 9 13:15:03 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Tue Sep 9 13:15:03 2003 Subject: [llvm-commits] CVS: llvm/test/Regression/LLC/constindices.ll negintconst.ll Message-ID: <200309091814.NAA25286@apoc.cs.uiuc.edu> Changes in directory llvm/test/Regression/LLC: constindices.ll updated: 1.3 -> 1.4 negintconst.ll updated: 1.1 -> 1.2 --- Log message: Update testcases to be more modern --- Diffs of the changes: Index: llvm/test/Regression/LLC/constindices.ll diff -u llvm/test/Regression/LLC/constindices.ll:1.3 llvm/test/Regression/LLC/constindices.ll:1.4 --- llvm/test/Regression/LLC/constindices.ll:1.3 Wed Aug 21 17:44:39 2002 +++ llvm/test/Regression/LLC/constindices.ll Tue Sep 9 13:14:37 2003 @@ -18,28 +18,28 @@ %ArrayA = alloca %MixedA, uint 4 %ArrayB = alloca %MixedB, uint 3 - %I1 = getelementptr %MixedA* %ScalarA, uint 0, ubyte 0 + %I1 = getelementptr %MixedA* %ScalarA, long 0, ubyte 0 store float 1.4142, float *%I1 - %I2 = getelementptr %MixedB* %ScalarB, uint 0, ubyte 1, ubyte 0 + %I2 = getelementptr %MixedB* %ScalarB, long 0, ubyte 1, ubyte 0 store float 2.7183, float *%I2 - %fptrA = getelementptr %MixedA* %ArrayA, uint 1, ubyte 0 - %fptrB = getelementptr %MixedB* %ArrayB, uint 2, ubyte 1, ubyte 0 + %fptrA = getelementptr %MixedA* %ArrayA, long 1, ubyte 0 + %fptrB = getelementptr %MixedB* %ArrayB, long 2, ubyte 1, ubyte 0 store float 3.1415, float* %fptrA store float 5.0, float* %fptrB ;; Test that a sequence of GEPs with constant indices are folded right - %fptrA1 = getelementptr %MixedA* %ArrayA, uint 3 ; &ArrayA[3] - %fptrA2 = getelementptr %MixedA* %fptrA1, uint 0, ubyte 1 ; &(*fptrA1).1 - %fptrA3 = getelementptr [15 x int]* %fptrA2, uint 0, uint 8 ; &(*fptrA2)[8] + %fptrA1 = getelementptr %MixedA* %ArrayA, long 3 ; &ArrayA[3] + %fptrA2 = getelementptr %MixedA* %fptrA1, long 0, ubyte 1 ; &(*fptrA1).1 + %fptrA3 = getelementptr [15 x int]* %fptrA2, long 0, long 8 ; &(*fptrA2)[8] store int 5, int* %fptrA3 ; ArrayA[3].1[8] = 5 %sqrtTwo = load float *%I1 %exp = load float *%I2 - %I3 = getelementptr %MixedA* %ArrayA, uint 1, ubyte 0 + %I3 = getelementptr %MixedA* %ArrayA, long 1, ubyte 0 %pi = load float* %I3 - %I4 = getelementptr %MixedB* %ArrayB, uint 2, ubyte 1, ubyte 0 + %I4 = getelementptr %MixedB* %ArrayB, long 2, ubyte 1, ubyte 0 %five = load float* %I4 %dsqrtTwo = cast float %sqrtTwo to double @@ -47,7 +47,7 @@ %dpi = cast float %pi to double %dfive = cast float %five to double - %castFmt = getelementptr [44 x sbyte]* %fmtArg, uint 0, uint 0 + %castFmt = getelementptr [44 x sbyte]* %fmtArg, long 0, long 0 call int (sbyte*, ...)* %printf(sbyte* %castFmt, double %dsqrtTwo, double %dexp, double %dpi, double %dfive) ret int 0 Index: llvm/test/Regression/LLC/negintconst.ll diff -u llvm/test/Regression/LLC/negintconst.ll:1.1 llvm/test/Regression/LLC/negintconst.ll:1.2 --- llvm/test/Regression/LLC/negintconst.ll:1.1 Wed Jul 10 16:54:04 2002 +++ llvm/test/Regression/LLC/negintconst.ll Tue Sep 9 13:14:37 2003 @@ -41,8 +41,9 @@ %i = add uint 1, 0 ; i = 1 %iscale = mul uint %i, 4294967295 ; i*-1 = -1 %ioff = add uint %iscale, 3 ; 3+(-i) = 2 - %fptr = getelementptr %Results* %fval, uint %ioff ; &fval[2] - %castFmt = getelementptr [39 x sbyte]* %fmtArg, uint 0, uint 0 + %ioff = cast uint %ioff to long + %fptr = getelementptr %Results* %fval, long %ioff ; &fval[2] + %castFmt = getelementptr [39 x sbyte]* %fmtArg, long 0, long 0 call int (sbyte*, ...)* %printf(sbyte* %castFmt, uint %ioff, %Results* %fval, %Results* %fptr) ret int 0 end From lattner at cs.uiuc.edu Tue Sep 9 13:16:02 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Tue Sep 9 13:16:02 2003 Subject: [llvm-commits] CVS: llvm/test/Regression/Transforms/InstCombine/2003-09-09-VolatileLoadElim.ll Message-ID: <200309091815.NAA26993@apoc.cs.uiuc.edu> Changes in directory llvm/test/Regression/Transforms/InstCombine: 2003-09-09-VolatileLoadElim.ll added (r1.1) --- Log message: New testcase: do not DCE volatile loads! --- Diffs of the changes: Index: llvm/test/Regression/Transforms/InstCombine/2003-09-09-VolatileLoadElim.ll diff -c /dev/null llvm/test/Regression/Transforms/InstCombine/2003-09-09-VolatileLoadElim.ll:1.1 *** /dev/null Tue Sep 9 13:15:56 2003 --- llvm/test/Regression/Transforms/InstCombine/2003-09-09-VolatileLoadElim.ll Tue Sep 9 13:15:45 2003 *************** *** 0 **** --- 1,5 ---- + ; RUN: as < %s | opt -instcombine | dis | grep load + void %test(int* %P) { + %X = volatile load int* %P ; Dead but not deletable! + ret void + } From lattner at cs.uiuc.edu Tue Sep 9 13:17:02 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Tue Sep 9 13:17:02 2003 Subject: [llvm-commits] CVS: llvm/include/llvm/iMemory.h Message-ID: <200309091816.NAA27114@apoc.cs.uiuc.edu> Changes in directory llvm/include/llvm: iMemory.h updated: 1.39 -> 1.40 --- Log message: Fix bug: InstCombine/2003-09-09-VolatileLoadElim.ll Loads "mayWriteToMemory" if they are volatile --- Diffs of the changes: Index: llvm/include/llvm/iMemory.h diff -u llvm/include/llvm/iMemory.h:1.39 llvm/include/llvm/iMemory.h:1.40 --- llvm/include/llvm/iMemory.h:1.39 Mon Sep 8 12:45:59 2003 +++ llvm/include/llvm/iMemory.h Tue Sep 9 13:16:08 2003 @@ -159,6 +159,8 @@ virtual Instruction *clone() const { return new LoadInst(*this); } + virtual bool mayWriteToMemory() const { return isVolatile(); } + Value *getPointerOperand() { return getOperand(0); } const Value *getPointerOperand() const { return getOperand(0); } static unsigned getPointerOperandIndex() { return 0U; } From criswell at cs.uiuc.edu Tue Sep 9 15:53:02 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Tue Sep 9 15:53:02 2003 Subject: [llvm-commits] CVS: llvm/autoconf/configure.ac Message-ID: <200309092052.PAA30018@choi.cs.uiuc.edu> Changes in directory llvm/autoconf: configure.ac updated: 1.7 -> 1.8 --- Log message: Removed Makefiles for directories that no longer exist. --- Diffs of the changes: Index: llvm/autoconf/configure.ac diff -u llvm/autoconf/configure.ac:1.7 llvm/autoconf/configure.ac:1.8 --- llvm/autoconf/configure.ac:1.7 Sat Sep 6 09:46:19 2003 +++ llvm/autoconf/configure.ac Tue Sep 9 15:52:17 2003 @@ -39,8 +39,6 @@ AC_CONFIG_MAKEFILE(lib/CodeGen/InstrSched/Makefile) AC_CONFIG_MAKEFILE(lib/CodeGen/InstrSelection/Makefile) AC_CONFIG_MAKEFILE(lib/CodeGen/ModuloScheduling/Makefile) -AC_CONFIG_MAKEFILE(lib/CodeGen/PostOpts/Makefile) -AC_CONFIG_MAKEFILE(lib/CodeGen/PreOpts/Makefile) AC_CONFIG_MAKEFILE(lib/CodeGen/RegAlloc/Makefile) AC_CONFIG_MAKEFILE(lib/CodeGen/SelectionDAG/Makefile) AC_CONFIG_MAKEFILE(lib/ExecutionEngine/Makefile) @@ -147,15 +145,6 @@ AC_CONFIG_MAKEFILE(test/Programs/NoSource/Larn/Makefile) AC_CONFIG_MAKEFILE(test/Programs/NoSource/Moria-5.5.2/Makefile) AC_CONFIG_MAKEFILE(test/Programs/NoSource/Povray31/Makefile) -AC_CONFIG_MAKEFILE(test/Programs/NoSource/SPEC/Makefile) -AC_CONFIG_MAKEFILE(test/Programs/NoSource/SPEC/CINT2000/Makefile) -AC_CONFIG_MAKEFILE(test/Programs/NoSource/SPEC/CINT2000/164.gzip/Makefile) -AC_CONFIG_MAKEFILE(test/Programs/NoSource/SPEC/CINT2000/181.mcf/Makefile) -AC_CONFIG_MAKEFILE(test/Programs/NoSource/SPEC/CINT2000/197.parser/Makefile) -AC_CONFIG_MAKEFILE(test/Programs/NoSource/SPEC/CINT2000/254.gap/Makefile) -AC_CONFIG_MAKEFILE(test/Programs/NoSource/SPEC/CINT2000/255.vortex/Makefile) -AC_CONFIG_MAKEFILE(test/Programs/NoSource/SPEC/CINT2000/256.bzip2/Makefile) -AC_CONFIG_MAKEFILE(test/Programs/NoSource/SPEC/CINT2000/300.twolf/Makefile) AC_CONFIG_MAKEFILE(test/Programs/NoSource/m4/Makefile) AC_CONFIG_MAKEFILE(test/Programs/SingleSource/Makefile) AC_CONFIG_MAKEFILE(test/Programs/SingleSource/Makefile.singlesrc) From criswell at cs.uiuc.edu Tue Sep 9 15:53:06 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Tue Sep 9 15:53:06 2003 Subject: [llvm-commits] CVS: llvm/configure Message-ID: <200309092052.PAA30011@choi.cs.uiuc.edu> Changes in directory llvm: configure updated: 1.14 -> 1.15 --- Log message: Removed Makefiles for directories that no longer exist. --- Diffs of the changes: Index: llvm/configure diff -u llvm/configure:1.14 llvm/configure:1.15 --- llvm/configure:1.14 Sat Sep 6 10:17:13 2003 +++ llvm/configure Tue Sep 9 15:52:15 2003 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.57 for [LLVM] [1.0]. +# Generated by GNU Autoconf 2.53 for [LLVM] [1.0]. # # Report bugs to . # @@ -8,6 +8,168 @@ # Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. + + +# Check that we are running under the correct shell. +SHELL=${CONFIG_SHELL-/bin/sh} + +case X$ECHO in +X*--fallback-echo) + # Remove one level of quotation (which was required for Make). + ECHO=`echo "$ECHO" | sed 's,\\\\\$\\$0,'$0','` + ;; +esac + +echo=${ECHO-echo} +if test "X$1" = X--no-reexec; then + # Discard the --no-reexec flag, and continue. + shift +elif test "X$1" = X--fallback-echo; then + # Avoid inline document here, it may be left over + : +elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then + # Yippee, $echo works! + : +else + # Restart under the correct shell. + exec $SHELL "$0" --no-reexec ${1+"$@"} +fi + +if test "X$1" = X--fallback-echo; then + # used as fallback echo + shift + cat </dev/null && + echo_test_string="`eval $cmd`" && + (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null + then + break + fi + done +fi + +if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && + echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + : +else + # The Solaris, AIX, and Digital Unix default echo programs unquote + # backslashes. This makes it impossible to quote backslashes using + # echo "$something" | sed 's/\\/\\\\/g' + # + # So, first we look for a working echo in the user's PATH. + + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for dir in $PATH /usr/ucb; do + IFS="$lt_save_ifs" + if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && + test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && + echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + echo="$dir/echo" + break + fi + done + IFS="$lt_save_ifs" + + if test "X$echo" = Xecho; then + # We didn't find a better echo, so look for alternatives. + if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' && + echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + # This shell has a builtin print -r that does the trick. + echo='print -r' + elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) && + test "X$CONFIG_SHELL" != X/bin/ksh; then + # If we have ksh, try running configure again with it. + ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} + export ORIGINAL_CONFIG_SHELL + CONFIG_SHELL=/bin/ksh + export CONFIG_SHELL + exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"} + else + # Try using printf. + echo='printf %s\n' + if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && + echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + # Cool, printf works + : + elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && + test "X$echo_testing_string" = 'X\t' && + echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL + export CONFIG_SHELL + SHELL="$CONFIG_SHELL" + export SHELL + echo="$CONFIG_SHELL $0 --fallback-echo" + elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && + test "X$echo_testing_string" = 'X\t' && + echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + echo="$CONFIG_SHELL $0 --fallback-echo" + else + # maybe with a smaller string... + prev=: + + for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do + if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null + then + break + fi + prev="$cmd" + done + + if test "$prev" != 'sed 50q "$0"'; then + echo_test_string=`eval $prev` + export echo_test_string + exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"} + else + # Oops. We lost completely, so just stick with echo. + echo=echo + fi + fi + fi + fi +fi +fi + +# Copy echo and quote the copy suitably for passing to libtool from +# the Makefile, instead of quoting the original, which is used later. +ECHO=$echo +if test "X$ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then + ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo" +fi + + + + +tagnames=`echo "$tagnames,CXX" | sed 's/^,//'` + +tagnames=`echo "$tagnames,F77" | sed 's/^,//'` + +if expr a : '\(a\)' >/dev/null 2>&1; then + as_expr=expr +else + as_expr=false +fi + + ## --------------------- ## ## M4sh Initialization. ## ## --------------------- ## @@ -16,13 +178,11 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then set -o posix fi +# NLS nuisances. # Support unset when possible. if (FOO=FOO; unset FOO) >/dev/null 2>&1; then as_unset=unset @@ -30,42 +190,34 @@ as_unset=false fi - -# Work around bugs in pre-3.0 UWIN ksh. -$as_unset ENV MAIL MAILPATH -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -for as_var in \ - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ - LC_TELEPHONE LC_TIME -do - if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else - $as_unset $as_var - fi -done - -# Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1; then - as_expr=expr -else - as_expr=false -fi - -if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then - as_basename=basename -else - as_basename=false -fi +(set +x; test -n "`(LANG=C; export LANG) 2>&1`") && + { $as_unset LANG || test "${LANG+set}" != set; } || + { LANG=C; export LANG; } +(set +x; test -n "`(LC_ALL=C; export LC_ALL) 2>&1`") && + { $as_unset LC_ALL || test "${LC_ALL+set}" != set; } || + { LC_ALL=C; export LC_ALL; } +(set +x; test -n "`(LC_TIME=C; export LC_TIME) 2>&1`") && + { $as_unset LC_TIME || test "${LC_TIME+set}" != set; } || + { LC_TIME=C; export LC_TIME; } +(set +x; test -n "`(LC_CTYPE=C; export LC_CTYPE) 2>&1`") && + { $as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set; } || + { LC_CTYPE=C; export LC_CTYPE; } +(set +x; test -n "`(LANGUAGE=C; export LANGUAGE) 2>&1`") && + { $as_unset LANGUAGE || test "${LANGUAGE+set}" != set; } || + { LANGUAGE=C; export LANGUAGE; } +(set +x; test -n "`(LC_COLLATE=C; export LC_COLLATE) 2>&1`") && + { $as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set; } || + { LC_COLLATE=C; export LC_COLLATE; } +(set +x; test -n "`(LC_NUMERIC=C; export LC_NUMERIC) 2>&1`") && + { $as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set; } || + { LC_NUMERIC=C; export LC_NUMERIC; } +(set +x; test -n "`(LC_MESSAGES=C; export LC_MESSAGES) 2>&1`") && + { $as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set; } || + { LC_MESSAGES=C; export LC_MESSAGES; } # Name of the executable. -as_me=`$as_basename "$0" || +as_me=`(basename "$0") 2>/dev/null || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)$' \| \ @@ -76,7 +228,6 @@ /^X\/\(\/\).*/{ s//\1/; q; } s/.*/./; q'` - # PATH needs CR, and LINENO needs CR and PATH. # Avoid depending upon Character Ranges. as_cr_letters='abcdefghijklmnopqrstuvwxyz' @@ -87,15 +238,15 @@ # The user is always right. if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + echo "#! /bin/sh" >conftest.sh + echo "exit 0" >>conftest.sh + chmod +x conftest.sh + if (PATH=".;."; conftest.sh) >/dev/null 2>&1; then PATH_SEPARATOR=';' else PATH_SEPARATOR=: fi - rm -f conf$$.sh + rm -f conftest.sh fi @@ -143,8 +294,6 @@ as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` test "x$as_lineno_1" != "x$as_lineno_2" && test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then - $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } - $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } CONFIG_SHELL=$as_dir/$as_base export CONFIG_SHELL exec "$CONFIG_SHELL" "$0" ${1+"$@"} @@ -217,12 +366,6 @@ fi rm -f conf$$ conf$$.exe conf$$.file -if mkdir -p . 2>/dev/null; then - as_mkdir_p=: -else - as_mkdir_p=false -fi - as_executable_p="test -f" # Sed expression to map a string onto a valid CPP name. @@ -239,162 +382,8 @@ IFS=" $as_nl" # CDPATH. -$as_unset CDPATH - - - -# Check that we are running under the correct shell. -SHELL=${CONFIG_SHELL-/bin/sh} - -case X$ECHO in -X*--fallback-echo) - # Remove one level of quotation (which was required for Make). - ECHO=`echo "$ECHO" | sed 's,\\\\\$\\$0,'$0','` - ;; -esac - -echo=${ECHO-echo} -if test "X$1" = X--no-reexec; then - # Discard the --no-reexec flag, and continue. - shift -elif test "X$1" = X--fallback-echo; then - # Avoid inline document here, it may be left over - : -elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then - # Yippee, $echo works! - : -else - # Restart under the correct shell. - exec $SHELL "$0" --no-reexec ${1+"$@"} -fi - -if test "X$1" = X--fallback-echo; then - # used as fallback echo - shift - cat </dev/null && - echo_test_string="`eval $cmd`" && - (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null - then - break - fi - done -fi +$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=$PATH_SEPARATOR; export CDPATH; } -if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - : -else - # The Solaris, AIX, and Digital Unix default echo programs unquote - # backslashes. This makes it impossible to quote backslashes using - # echo "$something" | sed 's/\\/\\\\/g' - # - # So, first we look for a working echo in the user's PATH. - - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for dir in $PATH /usr/ucb; do - IFS="$lt_save_ifs" - if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && - test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - echo="$dir/echo" - break - fi - done - IFS="$lt_save_ifs" - - if test "X$echo" = Xecho; then - # We didn't find a better echo, so look for alternatives. - if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - # This shell has a builtin print -r that does the trick. - echo='print -r' - elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) && - test "X$CONFIG_SHELL" != X/bin/ksh; then - # If we have ksh, try running configure again with it. - ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} - export ORIGINAL_CONFIG_SHELL - CONFIG_SHELL=/bin/ksh - export CONFIG_SHELL - exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"} - else - # Try using printf. - echo='printf %s\n' - if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - # Cool, printf works - : - elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && - test "X$echo_testing_string" = 'X\t' && - echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL - export CONFIG_SHELL - SHELL="$CONFIG_SHELL" - export SHELL - echo="$CONFIG_SHELL $0 --fallback-echo" - elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && - test "X$echo_testing_string" = 'X\t' && - echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - echo="$CONFIG_SHELL $0 --fallback-echo" - else - # maybe with a smaller string... - prev=: - - for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do - if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null - then - break - fi - prev="$cmd" - done - - if test "$prev" != 'sed 50q "$0"'; then - echo_test_string=`eval $prev` - export echo_test_string - exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"} - else - # Oops. We lost completely, so just stick with echo. - echo=echo - fi - fi - fi - fi -fi -fi - -# Copy echo and quote the copy suitably for passing to libtool from -# the Makefile, instead of quoting the original, which is used later. -ECHO=$echo -if test "X$ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then - ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo" -fi - - - - -tagnames=`echo "$tagnames,CXX" | sed 's/^,//'` - -tagnames=`echo "$tagnames,F77" | sed 's/^,//'` # Name of the host. # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, @@ -407,7 +396,6 @@ # Initializations. # ac_default_prefix=/usr/local -ac_config_libobj_dir=. cross_compiling=no subdirs= MFLAGS= @@ -464,8 +452,6 @@ #endif" ac_unique_file=""Makefile.config.in"" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os OS LLVMGCCDIR ARCH CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT CC CFLAGS ac_ct_CC CPP ifGNUmake LEX LEXLIB LEX_OUTPUT_ROOT YACC EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL RPWD SED RM MKDIR DATE MV DOT ETAGS PURIFY PYTHON QMTEST ALLOCA LIBOBJS MMAP_FILE ENABLE_PURIFY ENABLE_OPTIMIZED USE_SPEC UPB DISABLE_LLC_DIFFS JIT SPEC_ROOT BCR PAPIDIR LTLIBOBJS' -ac_subst_files='' # Initialize some variables set by options. ac_init_help= @@ -889,9 +875,6 @@ { (exit 1); exit 1; }; } fi fi -(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || - { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 - { (exit 1); exit 1; }; } srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` ac_env_build_alias_set=${build_alias+set} ac_env_build_alias_value=$build_alias @@ -1105,7 +1088,7 @@ # Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be # absolute. ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` -ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` +ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd` ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` @@ -1132,7 +1115,7 @@ if $ac_init_version; then cat <<\_ACEOF [LLVM] configure [1.0] -generated by GNU Autoconf 2.57 +generated by GNU Autoconf 2.53 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. @@ -1147,7 +1130,7 @@ running configure, to aid debugging if configure makes a mistake. It was created by [LLVM] $as_me [1.0], which was -generated by GNU Autoconf 2.57. Invocation command line was +generated by GNU Autoconf 2.53. Invocation command line was $ $0 $@ @@ -1199,54 +1182,27 @@ # Keep a trace of the command line. # Strip out --no-create and --no-recursion so they do not pile up. -# Strip out --silent because we don't want to record it for future runs. # Also quote any args containing shell meta-characters. -# Make two passes to allow for proper duplicate-argument suppression. ac_configure_args= -ac_configure_args0= -ac_configure_args1= ac_sep= -ac_must_keep_next=false -for ac_pass in 1 2 +for ac_arg do - for ac_arg - do - case $ac_arg in - -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - continue ;; - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) - ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - case $ac_pass in - 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; - 2) - ac_configure_args1="$ac_configure_args1 '$ac_arg'" - if test $ac_must_keep_next = true; then - ac_must_keep_next=false # Got value, back to normal. - else - case $ac_arg in - *=* | --config-cache | -C | -disable-* | --disable-* \ - | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ - | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ - | -with-* | --with-* | -without-* | --without-* | --x) - case "$ac_configure_args0 " in - "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; - esac - ;; - -* ) ac_must_keep_next=true ;; - esac - fi - ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" - # Get rid of the leading space. - ac_sep=" " - ;; - esac - done + case $ac_arg in + -no-create | --no-create | --no-creat | --no-crea | --no-cre \ + | --no-cr | --no-c | -n ) continue ;; + -no-recursion | --no-recursion | --no-recursio | --no-recursi \ + | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) + continue ;; + *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) + ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + case " $ac_configure_args " in + *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. + *) ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" + ac_sep=" " ;; + esac + # Get rid of the leading space. done -$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } -$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } # When interrupted or exit'd, cleanup temporary files, and complete # config.log. We remove comments because anyway the quotes in there @@ -1257,7 +1213,6 @@ # Save into config.log some information that might help in debugging. { echo - cat <<\_ASBOX ## ---------------- ## ## Cache variables. ## @@ -1277,38 +1232,9 @@ sed -n \ "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" ;; - esac; -} - echo - - cat <<\_ASBOX -## ----------------- ## -## Output variables. ## -## ----------------- ## -_ASBOX - echo - for ac_var in $ac_subst_vars - do - eval ac_val=$`echo $ac_var` - echo "$ac_var='"'"'$ac_val'"'"'" - done | sort + esac; +} echo - - if test -n "$ac_subst_files"; then - cat <<\_ASBOX -## ------------- ## -## Output files. ## -## ------------- ## -_ASBOX - echo - for ac_var in $ac_subst_files - do - eval ac_val=$`echo $ac_var` - echo "$ac_var='"'"'$ac_val'"'"'" - done | sort - echo - fi - if test -s confdefs.h; then cat <<\_ASBOX ## ----------- ## @@ -1316,7 +1242,7 @@ ## ----------- ## _ASBOX echo - sed "/^$/d" confdefs.h | sort + sed "/^$/d" confdefs.h echo fi test "$ac_signal" != 0 && @@ -1482,7 +1408,6 @@ - ac_aux_dir= for ac_dir in autoconf $srcdir/autoconf; do if test -f $ac_dir/install-sh; then @@ -1509,525 +1434,492 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. - ac_config_headers="$ac_config_headers include/Config/config.h" - - ac_config_commands="$ac_config_commands Makefile" - - - ac_config_commands="$ac_config_commands Makefile.common" - - - ac_config_commands="$ac_config_commands Makefile.rules" - - - ac_config_commands="$ac_config_commands lib/Makefile" - - - ac_config_commands="$ac_config_commands lib/Analysis/Makefile" - - - ac_config_commands="$ac_config_commands lib/Analysis/DataStructure/Makefile" - - - ac_config_commands="$ac_config_commands lib/Analysis/IPA/Makefile" - - - ac_config_commands="$ac_config_commands lib/Analysis/LiveVar/Makefile" - - - ac_config_commands="$ac_config_commands lib/AsmParser/Makefile" - - - ac_config_commands="$ac_config_commands lib/Bytecode/Makefile" - - - ac_config_commands="$ac_config_commands lib/Bytecode/Reader/Makefile" - +ac_config_headers="$ac_config_headers include/Config/config.h" - ac_config_commands="$ac_config_commands lib/Bytecode/Writer/Makefile" +ac_config_commands="$ac_config_commands Makefile" - ac_config_commands="$ac_config_commands lib/CWriter/Makefile" +ac_config_commands="$ac_config_commands Makefile.common" - ac_config_commands="$ac_config_commands lib/CodeGen/Makefile" +ac_config_commands="$ac_config_commands Makefile.rules" - ac_config_commands="$ac_config_commands lib/CodeGen/InstrSched/Makefile" +ac_config_commands="$ac_config_commands lib/Makefile" - ac_config_commands="$ac_config_commands lib/CodeGen/InstrSelection/Makefile" +ac_config_commands="$ac_config_commands lib/Analysis/Makefile" - ac_config_commands="$ac_config_commands lib/CodeGen/ModuloScheduling/Makefile" +ac_config_commands="$ac_config_commands lib/Analysis/DataStructure/Makefile" - ac_config_commands="$ac_config_commands lib/CodeGen/PostOpts/Makefile" +ac_config_commands="$ac_config_commands lib/Analysis/IPA/Makefile" - ac_config_commands="$ac_config_commands lib/CodeGen/PreOpts/Makefile" +ac_config_commands="$ac_config_commands lib/Analysis/LiveVar/Makefile" - ac_config_commands="$ac_config_commands lib/CodeGen/RegAlloc/Makefile" +ac_config_commands="$ac_config_commands lib/AsmParser/Makefile" - ac_config_commands="$ac_config_commands lib/CodeGen/SelectionDAG/Makefile" +ac_config_commands="$ac_config_commands lib/Bytecode/Makefile" - ac_config_commands="$ac_config_commands lib/ExecutionEngine/Makefile" +ac_config_commands="$ac_config_commands lib/Bytecode/Reader/Makefile" - ac_config_commands="$ac_config_commands lib/ExecutionEngine/Interpreter/Makefile" +ac_config_commands="$ac_config_commands lib/Bytecode/Writer/Makefile" - ac_config_commands="$ac_config_commands lib/ExecutionEngine/JIT/Makefile" +ac_config_commands="$ac_config_commands lib/CWriter/Makefile" - ac_config_commands="$ac_config_commands lib/Support/Makefile" +ac_config_commands="$ac_config_commands lib/CodeGen/Makefile" - ac_config_commands="$ac_config_commands lib/Target/Makefile" +ac_config_commands="$ac_config_commands lib/CodeGen/InstrSched/Makefile" - ac_config_commands="$ac_config_commands lib/Target/Sparc/Makefile" +ac_config_commands="$ac_config_commands lib/CodeGen/InstrSelection/Makefile" - ac_config_commands="$ac_config_commands lib/Target/X86/Makefile" +ac_config_commands="$ac_config_commands lib/CodeGen/ModuloScheduling/Makefile" - ac_config_commands="$ac_config_commands lib/Transforms/Makefile" +ac_config_commands="$ac_config_commands lib/CodeGen/RegAlloc/Makefile" - ac_config_commands="$ac_config_commands lib/Transforms/Hello/Makefile" +ac_config_commands="$ac_config_commands lib/CodeGen/SelectionDAG/Makefile" - ac_config_commands="$ac_config_commands lib/Transforms/IPO/Makefile" +ac_config_commands="$ac_config_commands lib/ExecutionEngine/Makefile" - ac_config_commands="$ac_config_commands lib/Transforms/Instrumentation/Makefile" +ac_config_commands="$ac_config_commands lib/ExecutionEngine/Interpreter/Makefile" - ac_config_commands="$ac_config_commands lib/Transforms/Instrumentation/ProfilePaths/Makefile" +ac_config_commands="$ac_config_commands lib/ExecutionEngine/JIT/Makefile" - ac_config_commands="$ac_config_commands lib/Transforms/Scalar/Makefile" +ac_config_commands="$ac_config_commands lib/Support/Makefile" - ac_config_commands="$ac_config_commands lib/Transforms/Utils/Makefile" +ac_config_commands="$ac_config_commands lib/Target/Makefile" - ac_config_commands="$ac_config_commands lib/VMCore/Makefile" +ac_config_commands="$ac_config_commands lib/Target/Sparc/Makefile" - ac_config_commands="$ac_config_commands runtime/Makefile" +ac_config_commands="$ac_config_commands lib/Target/X86/Makefile" - ac_config_commands="$ac_config_commands runtime/GCCLibraries/Makefile" +ac_config_commands="$ac_config_commands lib/Transforms/Makefile" - ac_config_commands="$ac_config_commands runtime/GCCLibraries/crtend/Makefile" +ac_config_commands="$ac_config_commands lib/Transforms/Hello/Makefile" - ac_config_commands="$ac_config_commands runtime/GCCLibraries/libc/Makefile" +ac_config_commands="$ac_config_commands lib/Transforms/IPO/Makefile" - ac_config_commands="$ac_config_commands runtime/GCCLibraries/libg/Makefile" +ac_config_commands="$ac_config_commands lib/Transforms/Instrumentation/Makefile" - ac_config_commands="$ac_config_commands runtime/GCCLibraries/libgcc/Makefile" +ac_config_commands="$ac_config_commands lib/Transforms/Instrumentation/ProfilePaths/Makefile" - ac_config_commands="$ac_config_commands runtime/GCCLibraries/libm/Makefile" +ac_config_commands="$ac_config_commands lib/Transforms/Scalar/Makefile" - ac_config_commands="$ac_config_commands runtime/GCCLibraries/libmalloc/Makefile" +ac_config_commands="$ac_config_commands lib/Transforms/Utils/Makefile" - ac_config_commands="$ac_config_commands runtime/GCCLibraries/libucb/Makefile" +ac_config_commands="$ac_config_commands lib/VMCore/Makefile" - ac_config_commands="$ac_config_commands runtime/libdummy/Makefile" +ac_config_commands="$ac_config_commands runtime/Makefile" - ac_config_commands="$ac_config_commands runtime/libtrace/Makefile" +ac_config_commands="$ac_config_commands runtime/GCCLibraries/Makefile" - ac_config_commands="$ac_config_commands test/Makefile" +ac_config_commands="$ac_config_commands runtime/GCCLibraries/crtend/Makefile" - ac_config_commands="$ac_config_commands test/Makefile.tests" +ac_config_commands="$ac_config_commands runtime/GCCLibraries/libc/Makefile" - ac_config_commands="$ac_config_commands test/Programs/Makefile" +ac_config_commands="$ac_config_commands runtime/GCCLibraries/libg/Makefile" - ac_config_commands="$ac_config_commands test/Programs/Makefile.programs" +ac_config_commands="$ac_config_commands runtime/GCCLibraries/libgcc/Makefile" - ac_config_commands="$ac_config_commands test/Programs/TEST.aa.Makefile" +ac_config_commands="$ac_config_commands runtime/GCCLibraries/libm/Makefile" - ac_config_commands="$ac_config_commands test/Programs/TEST.dsgraph.report" +ac_config_commands="$ac_config_commands runtime/GCCLibraries/libmalloc/Makefile" - ac_config_commands="$ac_config_commands test/Programs/TEST.micro.report" +ac_config_commands="$ac_config_commands runtime/GCCLibraries/libucb/Makefile" - ac_config_commands="$ac_config_commands test/Programs/TEST.aa.report" +ac_config_commands="$ac_config_commands runtime/libdummy/Makefile" - ac_config_commands="$ac_config_commands test/Programs/TEST.example.Makefile" +ac_config_commands="$ac_config_commands runtime/libtrace/Makefile" - ac_config_commands="$ac_config_commands test/Programs/TEST.nightly.Makefile" +ac_config_commands="$ac_config_commands test/Makefile" - ac_config_commands="$ac_config_commands test/Programs/TEST.buildrepo.Makefile" +ac_config_commands="$ac_config_commands test/Makefile.tests" - ac_config_commands="$ac_config_commands test/Programs/TEST.jit.Makefile" +ac_config_commands="$ac_config_commands test/Programs/Makefile" - ac_config_commands="$ac_config_commands test/Programs/TEST.nightly.report" +ac_config_commands="$ac_config_commands test/Programs/Makefile.programs" - ac_config_commands="$ac_config_commands test/Programs/TEST.dsgraph.Makefile" +ac_config_commands="$ac_config_commands test/Programs/TEST.aa.Makefile" - ac_config_commands="$ac_config_commands test/Programs/TEST.jit.report" +ac_config_commands="$ac_config_commands test/Programs/TEST.dsgraph.report" - ac_config_commands="$ac_config_commands test/Programs/TEST.typesafe.Makefile" +ac_config_commands="$ac_config_commands test/Programs/TEST.micro.report" - ac_config_commands="$ac_config_commands test/Programs/TEST.dsgraph.gnuplot" +ac_config_commands="$ac_config_commands test/Programs/TEST.aa.report" - ac_config_commands="$ac_config_commands test/Programs/TEST.micro.Makefile" +ac_config_commands="$ac_config_commands test/Programs/TEST.example.Makefile" - ac_config_commands="$ac_config_commands test/Programs/External/Makefile" +ac_config_commands="$ac_config_commands test/Programs/TEST.nightly.Makefile" - ac_config_commands="$ac_config_commands test/Programs/External/SPEC/Makefile" +ac_config_commands="$ac_config_commands test/Programs/TEST.buildrepo.Makefile" - ac_config_commands="$ac_config_commands test/Programs/External/SPEC/CFP2000/Makefile" +ac_config_commands="$ac_config_commands test/Programs/TEST.jit.Makefile" - ac_config_commands="$ac_config_commands test/Programs/External/SPEC/CFP2000/179.art/Makefile" +ac_config_commands="$ac_config_commands test/Programs/TEST.nightly.report" - ac_config_commands="$ac_config_commands test/Programs/External/SPEC/CFP2000/183.equake/Makefile" +ac_config_commands="$ac_config_commands test/Programs/TEST.dsgraph.Makefile" - ac_config_commands="$ac_config_commands test/Programs/External/SPEC/CFP2000/188.ammp/Makefile" +ac_config_commands="$ac_config_commands test/Programs/TEST.jit.report" - ac_config_commands="$ac_config_commands test/Programs/External/SPEC/CINT2000/Makefile" +ac_config_commands="$ac_config_commands test/Programs/TEST.typesafe.Makefile" - ac_config_commands="$ac_config_commands test/Programs/External/SPEC/CINT2000/164.gzip/Makefile" +ac_config_commands="$ac_config_commands test/Programs/TEST.dsgraph.gnuplot" - ac_config_commands="$ac_config_commands test/Programs/External/SPEC/CINT2000/175.vpr/Makefile" +ac_config_commands="$ac_config_commands test/Programs/TEST.micro.Makefile" - ac_config_commands="$ac_config_commands test/Programs/External/SPEC/CINT2000/176.gcc/Makefile" +ac_config_commands="$ac_config_commands test/Programs/External/Makefile" - ac_config_commands="$ac_config_commands test/Programs/External/SPEC/CINT2000/181.mcf/Makefile" +ac_config_commands="$ac_config_commands test/Programs/External/SPEC/Makefile" - ac_config_commands="$ac_config_commands test/Programs/External/SPEC/CINT2000/186.crafty/Makefile" +ac_config_commands="$ac_config_commands test/Programs/External/SPEC/CFP2000/Makefile" - ac_config_commands="$ac_config_commands test/Programs/External/SPEC/CINT2000/197.parser/Makefile" +ac_config_commands="$ac_config_commands test/Programs/External/SPEC/CFP2000/179.art/Makefile" - ac_config_commands="$ac_config_commands test/Programs/External/SPEC/CINT2000/254.gap/Makefile" +ac_config_commands="$ac_config_commands test/Programs/External/SPEC/CFP2000/183.equake/Makefile" - ac_config_commands="$ac_config_commands test/Programs/External/SPEC/CINT2000/255.vortex/Makefile" +ac_config_commands="$ac_config_commands test/Programs/External/SPEC/CFP2000/188.ammp/Makefile" - ac_config_commands="$ac_config_commands test/Programs/External/SPEC/CINT2000/256.bzip2/Makefile" +ac_config_commands="$ac_config_commands test/Programs/External/SPEC/CINT2000/Makefile" - ac_config_commands="$ac_config_commands test/Programs/External/SPEC/CINT2000/300.twolf/Makefile" +ac_config_commands="$ac_config_commands test/Programs/External/SPEC/CINT2000/164.gzip/Makefile" - ac_config_commands="$ac_config_commands test/Programs/LLVMSource/Makefile" +ac_config_commands="$ac_config_commands test/Programs/External/SPEC/CINT2000/175.vpr/Makefile" - ac_config_commands="$ac_config_commands test/Programs/MultiSource/Makefile" +ac_config_commands="$ac_config_commands test/Programs/External/SPEC/CINT2000/176.gcc/Makefile" - ac_config_commands="$ac_config_commands test/Programs/MultiSource/Makefile.multisrc" +ac_config_commands="$ac_config_commands test/Programs/External/SPEC/CINT2000/181.mcf/Makefile" - ac_config_commands="$ac_config_commands test/Programs/MultiSource/Burg/Makefile" +ac_config_commands="$ac_config_commands test/Programs/External/SPEC/CINT2000/186.crafty/Makefile" - ac_config_commands="$ac_config_commands test/Programs/MultiSource/Fhourstones/Makefile" +ac_config_commands="$ac_config_commands test/Programs/External/SPEC/CINT2000/197.parser/Makefile" - ac_config_commands="$ac_config_commands test/Programs/MultiSource/McCat/Makefile" +ac_config_commands="$ac_config_commands test/Programs/External/SPEC/CINT2000/254.gap/Makefile" - ac_config_commands="$ac_config_commands test/Programs/MultiSource/McCat/01-qbsort/Makefile" +ac_config_commands="$ac_config_commands test/Programs/External/SPEC/CINT2000/255.vortex/Makefile" - ac_config_commands="$ac_config_commands test/Programs/MultiSource/McCat/03-testtrie/Makefile" +ac_config_commands="$ac_config_commands test/Programs/External/SPEC/CINT2000/256.bzip2/Makefile" - ac_config_commands="$ac_config_commands test/Programs/MultiSource/McCat/04-bisect/Makefile" +ac_config_commands="$ac_config_commands test/Programs/External/SPEC/CINT2000/300.twolf/Makefile" - ac_config_commands="$ac_config_commands test/Programs/MultiSource/McCat/05-eks/Makefile" +ac_config_commands="$ac_config_commands test/Programs/LLVMSource/Makefile" - ac_config_commands="$ac_config_commands test/Programs/MultiSource/McCat/08-main/Makefile" +ac_config_commands="$ac_config_commands test/Programs/MultiSource/Makefile" - ac_config_commands="$ac_config_commands test/Programs/MultiSource/McCat/09-vor/Makefile" +ac_config_commands="$ac_config_commands test/Programs/MultiSource/Makefile.multisrc" - ac_config_commands="$ac_config_commands test/Programs/MultiSource/McCat/12-IOtest/Makefile" +ac_config_commands="$ac_config_commands test/Programs/MultiSource/Burg/Makefile" - ac_config_commands="$ac_config_commands test/Programs/MultiSource/McCat/15-trie/Makefile" +ac_config_commands="$ac_config_commands test/Programs/MultiSource/Fhourstones/Makefile" - ac_config_commands="$ac_config_commands test/Programs/MultiSource/McCat/17-bintr/Makefile" +ac_config_commands="$ac_config_commands test/Programs/MultiSource/McCat/Makefile" - ac_config_commands="$ac_config_commands test/Programs/MultiSource/McCat/18-imp/Makefile" +ac_config_commands="$ac_config_commands test/Programs/MultiSource/McCat/01-qbsort/Makefile" - ac_config_commands="$ac_config_commands test/Programs/MultiSource/Olden/Makefile" +ac_config_commands="$ac_config_commands test/Programs/MultiSource/McCat/03-testtrie/Makefile" - ac_config_commands="$ac_config_commands test/Programs/MultiSource/Olden/bh/Makefile" +ac_config_commands="$ac_config_commands test/Programs/MultiSource/McCat/04-bisect/Makefile" - ac_config_commands="$ac_config_commands test/Programs/MultiSource/Olden/bisort/Makefile" +ac_config_commands="$ac_config_commands test/Programs/MultiSource/McCat/05-eks/Makefile" - ac_config_commands="$ac_config_commands test/Programs/MultiSource/Olden/em3d/Makefile" +ac_config_commands="$ac_config_commands test/Programs/MultiSource/McCat/08-main/Makefile" - ac_config_commands="$ac_config_commands test/Programs/MultiSource/Olden/health/Makefile" +ac_config_commands="$ac_config_commands test/Programs/MultiSource/McCat/09-vor/Makefile" - ac_config_commands="$ac_config_commands test/Programs/MultiSource/Olden/mst/Makefile" +ac_config_commands="$ac_config_commands test/Programs/MultiSource/McCat/12-IOtest/Makefile" - ac_config_commands="$ac_config_commands test/Programs/MultiSource/Olden/perimeter/Makefile" +ac_config_commands="$ac_config_commands test/Programs/MultiSource/McCat/15-trie/Makefile" - ac_config_commands="$ac_config_commands test/Programs/MultiSource/Olden/power/Makefile" +ac_config_commands="$ac_config_commands test/Programs/MultiSource/McCat/17-bintr/Makefile" - ac_config_commands="$ac_config_commands test/Programs/MultiSource/Olden/treeadd/Makefile" +ac_config_commands="$ac_config_commands test/Programs/MultiSource/McCat/18-imp/Makefile" - ac_config_commands="$ac_config_commands test/Programs/MultiSource/Olden/tsp/Makefile" +ac_config_commands="$ac_config_commands test/Programs/MultiSource/Olden/Makefile" - ac_config_commands="$ac_config_commands test/Programs/MultiSource/Olden/voronoi/Makefile" +ac_config_commands="$ac_config_commands test/Programs/MultiSource/Olden/bh/Makefile" - ac_config_commands="$ac_config_commands test/Programs/MultiSource/OptimizerEval/Makefile" +ac_config_commands="$ac_config_commands test/Programs/MultiSource/Olden/bisort/Makefile" - ac_config_commands="$ac_config_commands test/Programs/MultiSource/Ptrdist/Makefile" +ac_config_commands="$ac_config_commands test/Programs/MultiSource/Olden/em3d/Makefile" - ac_config_commands="$ac_config_commands test/Programs/MultiSource/Ptrdist/anagram/Makefile" +ac_config_commands="$ac_config_commands test/Programs/MultiSource/Olden/health/Makefile" - ac_config_commands="$ac_config_commands test/Programs/MultiSource/Ptrdist/bc/Makefile" +ac_config_commands="$ac_config_commands test/Programs/MultiSource/Olden/mst/Makefile" - ac_config_commands="$ac_config_commands test/Programs/MultiSource/Ptrdist/ft/Makefile" +ac_config_commands="$ac_config_commands test/Programs/MultiSource/Olden/perimeter/Makefile" - ac_config_commands="$ac_config_commands test/Programs/MultiSource/Ptrdist/ks/Makefile" +ac_config_commands="$ac_config_commands test/Programs/MultiSource/Olden/power/Makefile" - ac_config_commands="$ac_config_commands test/Programs/MultiSource/Ptrdist/yacr2/Makefile" +ac_config_commands="$ac_config_commands test/Programs/MultiSource/Olden/treeadd/Makefile" - ac_config_commands="$ac_config_commands test/Programs/MultiSource/aha/Makefile" +ac_config_commands="$ac_config_commands test/Programs/MultiSource/Olden/tsp/Makefile" - ac_config_commands="$ac_config_commands test/Programs/MultiSource/llubenchmark/Makefile" +ac_config_commands="$ac_config_commands test/Programs/MultiSource/Olden/voronoi/Makefile" - ac_config_commands="$ac_config_commands test/Programs/MultiSource/sgefa/Makefile" +ac_config_commands="$ac_config_commands test/Programs/MultiSource/OptimizerEval/Makefile" - ac_config_commands="$ac_config_commands test/Programs/MultiSource/sim/Makefile" +ac_config_commands="$ac_config_commands test/Programs/MultiSource/Ptrdist/Makefile" - ac_config_commands="$ac_config_commands test/Programs/NoSource/Makefile" +ac_config_commands="$ac_config_commands test/Programs/MultiSource/Ptrdist/anagram/Makefile" - ac_config_commands="$ac_config_commands test/Programs/NoSource/Flex/Makefile" +ac_config_commands="$ac_config_commands test/Programs/MultiSource/Ptrdist/bc/Makefile" - ac_config_commands="$ac_config_commands test/Programs/NoSource/Larn/Makefile" +ac_config_commands="$ac_config_commands test/Programs/MultiSource/Ptrdist/ft/Makefile" - ac_config_commands="$ac_config_commands test/Programs/NoSource/Moria-5.5.2/Makefile" +ac_config_commands="$ac_config_commands test/Programs/MultiSource/Ptrdist/ks/Makefile" - ac_config_commands="$ac_config_commands test/Programs/NoSource/Povray31/Makefile" +ac_config_commands="$ac_config_commands test/Programs/MultiSource/Ptrdist/yacr2/Makefile" - ac_config_commands="$ac_config_commands test/Programs/NoSource/SPEC/Makefile" +ac_config_commands="$ac_config_commands test/Programs/MultiSource/aha/Makefile" - ac_config_commands="$ac_config_commands test/Programs/NoSource/SPEC/CINT2000/Makefile" +ac_config_commands="$ac_config_commands test/Programs/MultiSource/llubenchmark/Makefile" - ac_config_commands="$ac_config_commands test/Programs/NoSource/SPEC/CINT2000/164.gzip/Makefile" +ac_config_commands="$ac_config_commands test/Programs/MultiSource/sgefa/Makefile" - ac_config_commands="$ac_config_commands test/Programs/NoSource/SPEC/CINT2000/181.mcf/Makefile" +ac_config_commands="$ac_config_commands test/Programs/MultiSource/sim/Makefile" - ac_config_commands="$ac_config_commands test/Programs/NoSource/SPEC/CINT2000/197.parser/Makefile" +ac_config_commands="$ac_config_commands test/Programs/NoSource/Makefile" - ac_config_commands="$ac_config_commands test/Programs/NoSource/SPEC/CINT2000/254.gap/Makefile" +ac_config_commands="$ac_config_commands test/Programs/NoSource/Flex/Makefile" - ac_config_commands="$ac_config_commands test/Programs/NoSource/SPEC/CINT2000/255.vortex/Makefile" +ac_config_commands="$ac_config_commands test/Programs/NoSource/Larn/Makefile" - ac_config_commands="$ac_config_commands test/Programs/NoSource/SPEC/CINT2000/256.bzip2/Makefile" +ac_config_commands="$ac_config_commands test/Programs/NoSource/Moria-5.5.2/Makefile" - ac_config_commands="$ac_config_commands test/Programs/NoSource/SPEC/CINT2000/300.twolf/Makefile" +ac_config_commands="$ac_config_commands test/Programs/NoSource/Povray31/Makefile" - ac_config_commands="$ac_config_commands test/Programs/NoSource/m4/Makefile" +ac_config_commands="$ac_config_commands test/Programs/NoSource/m4/Makefile" - ac_config_commands="$ac_config_commands test/Programs/SingleSource/Makefile" +ac_config_commands="$ac_config_commands test/Programs/SingleSource/Makefile" - ac_config_commands="$ac_config_commands test/Programs/SingleSource/Makefile.singlesrc" +ac_config_commands="$ac_config_commands test/Programs/SingleSource/Makefile.singlesrc" - ac_config_commands="$ac_config_commands test/Programs/SingleSource/CustomChecked/Makefile" +ac_config_commands="$ac_config_commands test/Programs/SingleSource/CustomChecked/Makefile" - ac_config_commands="$ac_config_commands test/Programs/SingleSource/Shootout/Makefile" +ac_config_commands="$ac_config_commands test/Programs/SingleSource/Shootout/Makefile" - ac_config_commands="$ac_config_commands test/Programs/SingleSource/Stanford/Makefile" +ac_config_commands="$ac_config_commands test/Programs/SingleSource/Stanford/Makefile" - ac_config_commands="$ac_config_commands test/Programs/SingleSource/UnitTests/Makefile" +ac_config_commands="$ac_config_commands test/Programs/SingleSource/UnitTests/Makefile" - ac_config_commands="$ac_config_commands tools/Makefile" +ac_config_commands="$ac_config_commands tools/Makefile" - ac_config_commands="$ac_config_commands tools/analyze/Makefile" +ac_config_commands="$ac_config_commands tools/analyze/Makefile" - ac_config_commands="$ac_config_commands tools/as/Makefile" +ac_config_commands="$ac_config_commands tools/as/Makefile" - ac_config_commands="$ac_config_commands tools/bugpoint/Makefile" +ac_config_commands="$ac_config_commands tools/bugpoint/Makefile" - ac_config_commands="$ac_config_commands tools/dis/Makefile" +ac_config_commands="$ac_config_commands tools/dis/Makefile" - ac_config_commands="$ac_config_commands tools/extract/Makefile" +ac_config_commands="$ac_config_commands tools/extract/Makefile" - ac_config_commands="$ac_config_commands tools/gccas/Makefile" +ac_config_commands="$ac_config_commands tools/gccas/Makefile" - ac_config_commands="$ac_config_commands tools/gccld/Makefile" +ac_config_commands="$ac_config_commands tools/gccld/Makefile" - ac_config_commands="$ac_config_commands tools/link/Makefile" +ac_config_commands="$ac_config_commands tools/link/Makefile" - ac_config_commands="$ac_config_commands tools/llc/Makefile" +ac_config_commands="$ac_config_commands tools/llc/Makefile" - ac_config_commands="$ac_config_commands tools/lli/Makefile" +ac_config_commands="$ac_config_commands tools/lli/Makefile" - ac_config_commands="$ac_config_commands tools/opt/Makefile" +ac_config_commands="$ac_config_commands tools/opt/Makefile" - ac_config_commands="$ac_config_commands tools/llee/Makefile" +ac_config_commands="$ac_config_commands tools/llee/Makefile" - ac_config_commands="$ac_config_commands tools/llvm-as/Makefile" +ac_config_commands="$ac_config_commands tools/llvm-as/Makefile" - ac_config_commands="$ac_config_commands tools/llvm-dis/Makefile" +ac_config_commands="$ac_config_commands tools/llvm-dis/Makefile" - ac_config_commands="$ac_config_commands utils/Makefile" +ac_config_commands="$ac_config_commands utils/Makefile" - ac_config_commands="$ac_config_commands utils/Burg/Makefile" +ac_config_commands="$ac_config_commands utils/Burg/Makefile" - ac_config_commands="$ac_config_commands utils/Burg/Doc/Makefile" +ac_config_commands="$ac_config_commands utils/Burg/Doc/Makefile" - ac_config_commands="$ac_config_commands utils/TableGen/Makefile" +ac_config_commands="$ac_config_commands utils/TableGen/Makefile" - ac_config_commands="$ac_config_commands www/docs/Makefile" +ac_config_commands="$ac_config_commands www/docs/Makefile" - ac_config_commands="$ac_config_commands projects/Makefile" +ac_config_commands="$ac_config_commands projects/Makefile" - ac_config_commands="$ac_config_commands projects/sample/Makefile" +ac_config_commands="$ac_config_commands projects/sample/Makefile" - ac_config_commands="$ac_config_commands projects/sample/Makefile.common" +ac_config_commands="$ac_config_commands projects/sample/Makefile.common" - ac_config_commands="$ac_config_commands projects/sample/Makefile.config" +ac_config_commands="$ac_config_commands projects/sample/Makefile.config" - ac_config_commands="$ac_config_commands projects/sample/lib/Makefile" +ac_config_commands="$ac_config_commands projects/sample/lib/Makefile" - ac_config_commands="$ac_config_commands projects/sample/lib/sample/Makefile" +ac_config_commands="$ac_config_commands projects/sample/lib/sample/Makefile" - ac_config_commands="$ac_config_commands projects/sample/tools/Makefile" +ac_config_commands="$ac_config_commands projects/sample/tools/Makefile" - ac_config_commands="$ac_config_commands projects/sample/tools/sample/Makefile" +ac_config_commands="$ac_config_commands projects/sample/tools/sample/Makefile" - ac_config_commands="$ac_config_commands projects/ModuleMaker/Makefile" +ac_config_commands="$ac_config_commands projects/ModuleMaker/Makefile" - ac_config_commands="$ac_config_commands projects/ModuleMaker/Makefile.common" +ac_config_commands="$ac_config_commands projects/ModuleMaker/Makefile.common" - ac_config_commands="$ac_config_commands projects/ModuleMaker/tools/Makefile" +ac_config_commands="$ac_config_commands projects/ModuleMaker/tools/Makefile" - ac_config_commands="$ac_config_commands projects/ModuleMaker/tools/ModuleMaker/Makefile" +ac_config_commands="$ac_config_commands projects/ModuleMaker/tools/ModuleMaker/Makefile" @@ -2342,12 +2234,14 @@ cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -2357,7 +2251,7 @@ } _ACEOF ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files a.out a.exe b.out" +ac_clean_files="$ac_clean_files a.out a.exe" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. @@ -2376,39 +2270,26 @@ # Be careful to initialize this variable, since it used to be cached. # Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. ac_cv_exeext= -# b.out is created by i960 compilers. -for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out -do - test -f "$ac_file" || continue +for ac_file in `ls a_out.exe a.exe conftest.exe 2>/dev/null; + ls a.out conftest 2>/dev/null; + ls a.* conftest.* 2>/dev/null`; do case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) - ;; - conftest.$ac_ext ) - # This is the source file. - ;; - [ab].out ) - # We found the default executable, but exeext='' is most - # certainly right. - break;; - *.* ) - ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - # FIXME: I believe we export ac_cv_exeext for Libtool, - # but it would be cool to find out if it's true. Does anybody - # maintain Libtool? --akim. - export ac_cv_exeext - break;; - * ) - break;; + *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb | *.xSYM ) ;; + a.out ) # We found the default executable, but exeext='' is most + # certainly right. + break;; + *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + # FIXME: I believe we export ac_cv_exeext for Libtool --akim. + export ac_cv_exeext + break;; + * ) break;; esac done else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -{ { echo "$as_me:$LINENO: error: C++ compiler cannot create executables -See \`config.log' for more details." >&5 -echo "$as_me: error: C++ compiler cannot create executables -See \`config.log' for more details." >&2;} +cat conftest.$ac_ext >&5 +{ { echo "$as_me:$LINENO: error: C++ compiler cannot create executables" >&5 +echo "$as_me: error: C++ compiler cannot create executables" >&2;} { (exit 77); exit 77; }; } fi @@ -2435,11 +2316,9 @@ cross_compiling=yes else { { echo "$as_me:$LINENO: error: cannot run C++ compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." >&5 +If you meant to cross compile, use \`--host'." >&5 echo "$as_me: error: cannot run C++ compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." >&2;} +If you meant to cross compile, use \`--host'." >&2;} { (exit 1); exit 1; }; } fi fi @@ -2447,7 +2326,7 @@ echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 -rm -f a.out a.exe conftest$ac_cv_exeext b.out +rm -f a.out a.exe conftest$ac_cv_exeext ac_clean_files=$ac_clean_files_save # Check the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. @@ -2467,10 +2346,9 @@ # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will # work properly (i.e., refer to `conftest.exe'), while it won't with # `rm'. -for ac_file in conftest.exe conftest conftest.*; do - test -f "$ac_file" || continue +for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; + *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;; *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` export ac_cv_exeext break;; @@ -2478,10 +2356,8 @@ esac done else - { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." >&2;} + { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link" >&5 +echo "$as_me: error: cannot compute suffix of executables: cannot compile and link" >&2;} { (exit 1); exit 1; }; } fi @@ -2499,12 +2375,14 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -2521,19 +2399,16 @@ (exit $ac_status); }; then for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb ) ;; *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` break;; esac done else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute suffix of object files: cannot compile -See \`config.log' for more details." >&2;} +cat conftest.$ac_ext >&5 +{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile" >&5 +echo "$as_me: error: cannot compute suffix of object files: cannot compile" >&2;} { (exit 1); exit 1; }; } fi @@ -2550,12 +2425,14 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -2582,8 +2459,7 @@ ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 ac_compiler_gnu=no fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -2603,12 +2479,14 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -2632,8 +2510,7 @@ ac_cv_prog_cxx_g=yes else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 ac_cv_prog_cxx_g=no fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -2666,13 +2543,15 @@ do cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" #include $ac_declaration +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -2696,19 +2575,20 @@ : else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 continue fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" $ac_declaration +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -2732,8 +2612,7 @@ break else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext done @@ -2842,10 +2721,8 @@ fi -test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&5 -echo "$as_me: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&2;} +test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH" >&5 +echo "$as_me: error: no acceptable C compiler found in \$PATH" >&2;} { (exit 1); exit 1; }; } # Provide some information about the compiler. @@ -2875,12 +2752,14 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -2907,8 +2786,7 @@ ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 ac_compiler_gnu=no fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -2928,12 +2806,14 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -2957,8 +2837,7 @@ ac_cv_prog_cc_g=yes else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 ac_cv_prog_cc_g=no fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -2980,102 +2859,6 @@ CFLAGS= fi fi -echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 -echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 -if test "${ac_cv_prog_cc_stdc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_prog_cc_stdc=no -ac_save_CC=$CC -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include -#include -#include -/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ -struct buf { int x; }; -FILE * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; -{ - return p[i]; -} -static char *f (char * (*g) (char **, int), char **p, ...) -{ - char *s; - va_list v; - va_start (v,p); - s = g (p, va_arg (v,int)); - va_end (v); - return s; -} -int test (int i, double x); -struct s1 {int (*f) (int a);}; -struct s2 {int (*f) (double a);}; -int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); -int argc; -char **argv; -int -main () -{ -return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; - ; - return 0; -} -_ACEOF -# Don't try gcc -ansi; that turns off useful extensions and -# breaks some systems' header files. -# AIX -qlanglvl=ansi -# Ultrix and OSF/1 -std1 -# HP-UX 10.20 and later -Ae -# HP-UX older versions -Aa -D_HPUX_SOURCE -# SVR4 -Xc -D__EXTENSIONS__ -for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" -do - CC="$ac_save_CC $ac_arg" - rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_prog_cc_stdc=$ac_arg -break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.$ac_objext -done -rm -f conftest.$ac_ext conftest.$ac_objext -CC=$ac_save_CC - -fi - -case "x$ac_cv_prog_cc_stdc" in - x|xno) - echo "$as_me:$LINENO: result: none needed" >&5 -echo "${ECHO_T}none needed" >&6 ;; - *) - echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 - CC="$CC $ac_cv_prog_cc_stdc" ;; -esac - # Some people use a C++ compiler to compile C. Since we use `exit', # in C++ we need to declare it. In case someone uses the same compiler # for both compiling C and C++ we need to have the C++ compiler decide @@ -3108,13 +2891,15 @@ do cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" #include $ac_declaration +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -3138,19 +2923,20 @@ : else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 continue fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" $ac_declaration +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -3174,8 +2960,7 @@ break else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext done @@ -3188,8 +2973,7 @@ else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext ac_ext=c @@ -3221,28 +3005,18 @@ do # Use a header file that comes with gcc, so configuring glibc # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif +#include "confdefs.h" +#include Syntax error _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err + egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -3259,8 +3033,7 @@ : else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - + cat conftest.$ac_ext >&5 # Broken: fails on valid input. continue fi @@ -3270,17 +3043,13 @@ # can be detected and how. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" #include _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err + egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -3298,8 +3067,7 @@ continue else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - + cat conftest.$ac_ext >&5 # Passes both tests. ac_preproc_ok=: break @@ -3328,28 +3096,18 @@ do # Use a header file that comes with gcc, so configuring glibc # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif +#include "confdefs.h" +#include Syntax error _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err + egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -3366,8 +3124,7 @@ : else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - + cat conftest.$ac_ext >&5 # Broken: fails on valid input. continue fi @@ -3377,17 +3134,13 @@ # can be detected and how. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" #include _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err + egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -3405,8 +3158,7 @@ continue else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - + cat conftest.$ac_ext >&5 # Passes both tests. ac_preproc_ok=: break @@ -3419,10 +3171,8 @@ if $ac_preproc_ok; then : else - { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&5 -echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&2;} + { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check" >&5 +echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} { (exit 1); exit 1; }; } fi @@ -3546,11 +3296,7 @@ LIBS="-lfl $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -3559,6 +3305,12 @@ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char yywrap (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -3582,8 +3334,7 @@ ac_cv_lib_fl_yywrap=yes else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 ac_cv_lib_fl_yywrap=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -3603,11 +3354,7 @@ LIBS="-ll $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -3616,6 +3363,12 @@ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char yywrap (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -3639,8 +3392,7 @@ ac_cv_lib_l_yywrap=yes else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 ac_cv_lib_l_yywrap=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -3718,8 +3470,7 @@ ac_cv_prog_lex_yytext_pointer=yes else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_save_LIBS @@ -4377,7 +4128,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4380 "configure"' > conftest.$ac_ext + echo '#line 4131 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -4475,12 +4226,14 @@ cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -4504,8 +4257,7 @@ lt_cv_cc_needs_belf=yes else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 lt_cv_cc_needs_belf=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -4537,59 +4289,48 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" #include #include #include #include -int -main () -{ - - ; - return 0; -} _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then ac_cv_header_stdc=yes else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_header_stdc=no + cat conftest.$ac_ext >&5 + ac_cv_header_stdc=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" #include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then + egrep "memchr" >/dev/null 2>&1; then : else ac_cv_header_stdc=no @@ -4602,16 +4343,12 @@ # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" #include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then + egrep "free" >/dev/null 2>&1; then : else ac_cv_header_stdc=no @@ -4627,18 +4364,13 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" #include #if ((' ' & 0x0FF) == 0x020) # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) #else -# define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ +# define ISLOWER(c) (('a' <= (c) && (c) <= 'i') \ || ('j' <= (c) && (c) <= 'r') \ || ('s' <= (c) && (c) <= 'z')) # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) @@ -4671,12 +4403,11 @@ else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 ( exit $ac_status ) ac_cv_header_stdc=no fi -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi fi @@ -4711,11 +4442,7 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" $ac_includes_default #include <$ac_header> @@ -4735,8 +4462,7 @@ eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 eval "$as_ac_Header=no" fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -4771,11 +4497,7 @@ echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" $ac_includes_default #include <$ac_header> _ACEOF @@ -4794,8 +4516,7 @@ ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 ac_header_compiler=no fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -4807,17 +4528,13 @@ echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" #include <$ac_header> _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err + egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -4834,8 +4551,7 @@ ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - + cat conftest.$ac_ext >&5 ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext @@ -4848,32 +4564,14 @@ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf at gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; no:yes ) { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf at gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; esac echo "$as_me:$LINENO: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 @@ -4914,28 +4612,18 @@ do # Use a header file that comes with gcc, so configuring glibc # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif +#include "confdefs.h" +#include Syntax error _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err + egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -4952,8 +4640,7 @@ : else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - + cat conftest.$ac_ext >&5 # Broken: fails on valid input. continue fi @@ -4963,17 +4650,13 @@ # can be detected and how. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" #include _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err + egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -4991,8 +4674,7 @@ continue else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - + cat conftest.$ac_ext >&5 # Passes both tests. ac_preproc_ok=: break @@ -5021,28 +4703,18 @@ do # Use a header file that comes with gcc, so configuring glibc # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif +#include "confdefs.h" +#include Syntax error _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err + egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -5059,8 +4731,7 @@ : else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - + cat conftest.$ac_ext >&5 # Broken: fails on valid input. continue fi @@ -5070,17 +4741,13 @@ # can be detected and how. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" #include _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err + egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -5098,8 +4765,7 @@ continue else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - + cat conftest.$ac_ext >&5 # Passes both tests. ac_preproc_ok=: break @@ -5112,10 +4778,8 @@ if $ac_preproc_ok; then : else - { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check -See \`config.log' for more details." >&5 -echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check -See \`config.log' for more details." >&2;} + { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5 +echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;} { (exit 1); exit 1; }; } fi @@ -5131,7 +4795,7 @@ ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_f77_compiler_gnu if test -n "$ac_tool_prefix"; then - for ac_prog in g77 f77 xlf frt pgf77 fl32 af77 fort77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 lf95 g95 + for ac_prog in g77 f77 xlf cf77 cft77 frt pgf77 fl32 af77 fort77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 lf95 g95 fc do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 @@ -5173,7 +4837,7 @@ fi if test -z "$F77"; then ac_ct_F77=$F77 - for ac_prog in g77 f77 xlf frt pgf77 fl32 af77 fort77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 lf95 g95 + for ac_prog in g77 f77 xlf cf77 cft77 frt pgf77 fl32 af77 fort77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 lf95 g95 fc do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -5218,7 +4882,7 @@ # Provide some information about the compiler. -echo "$as_me:5221:" \ +echo "$as_me:4885:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 @@ -5269,8 +4933,7 @@ ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 ac_compiler_gnu=no fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -5310,8 +4973,7 @@ ac_cv_prog_f77_g=yes else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 ac_cv_prog_f77_g=no fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -6227,11 +5889,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6230: $lt_compile\"" >&5) + (eval echo "\"\$as_me:5892: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6234: \$? = $ac_status" >&5 + echo "$as_me:5896: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -6459,11 +6121,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6462: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6124: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6466: \$? = $ac_status" >&5 + echo "$as_me:6128: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -6526,11 +6188,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6529: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6191: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:6533: \$? = $ac_status" >&5 + echo "$as_me:6195: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -6867,12 +6529,14 @@ # Determine the default libpath from the value encoded in an empty executable. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -6901,8 +6565,7 @@ }'`; fi else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -6918,12 +6581,14 @@ # Determine the default libpath from the value encoded in an empty executable. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -6952,8 +6617,7 @@ }'`; fi else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -8055,11 +7719,7 @@ LIBS="-ldl $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -8068,6 +7728,12 @@ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char dlopen (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -8091,8 +7757,7 @@ ac_cv_lib_dl_dlopen=yes else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 ac_cv_lib_dl_dlopen=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -8120,44 +7785,37 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char shl_load (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -#ifdef __STDC__ -# include -#else -# include -#endif + which can conflict with char shl_load (); below. */ +#include /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" -{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char shl_load (); +char (*f) (); + +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_shl_load) || defined (__stub___shl_load) choke me #else -char (*f) () = shl_load; -#endif -#ifdef __cplusplus -} +f = shl_load; #endif -int -main () -{ -return f != shl_load; ; return 0; } @@ -8177,8 +7835,7 @@ ac_cv_func_shl_load=yes else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 ac_cv_func_shl_load=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -8197,11 +7854,7 @@ LIBS="-ldld $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -8210,6 +7863,12 @@ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char shl_load (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -8233,8 +7892,7 @@ ac_cv_lib_dld_shl_load=yes else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 ac_cv_lib_dld_shl_load=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -8252,44 +7910,37 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char dlopen (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -#ifdef __STDC__ -# include -#else -# include -#endif + which can conflict with char dlopen (); below. */ +#include /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" -{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char dlopen (); +char (*f) (); + +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_dlopen) || defined (__stub___dlopen) choke me #else -char (*f) () = dlopen; -#endif -#ifdef __cplusplus -} +f = dlopen; #endif -int -main () -{ -return f != dlopen; ; return 0; } @@ -8309,8 +7960,7 @@ ac_cv_func_dlopen=yes else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 ac_cv_func_dlopen=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -8329,11 +7979,7 @@ LIBS="-ldl $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -8342,6 +7988,12 @@ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char dlopen (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -8365,8 +8017,7 @@ ac_cv_lib_dl_dlopen=yes else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 ac_cv_lib_dl_dlopen=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -8386,11 +8037,7 @@ LIBS="-lsvld $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -8399,6 +8046,12 @@ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char dlopen (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -8422,8 +8075,7 @@ ac_cv_lib_svld_dlopen=yes else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 ac_cv_lib_svld_dlopen=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -8443,11 +8095,7 @@ LIBS="-ldld $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -8456,6 +8104,12 @@ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char dld_link (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -8479,8 +8133,7 @@ ac_cv_lib_dld_dld_link=yes else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 ac_cv_lib_dld_dld_link=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -8538,7 +8191,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -9707,8 +9362,7 @@ }'`; fi else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -9725,12 +9379,14 @@ # Determine the default libpath from the value encoded in an empty executable. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -9759,8 +9415,7 @@ }'`; fi else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -10772,11 +10427,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10775: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10430: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:10779: \$? = $ac_status" >&5 + echo "$as_me:10434: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -10839,11 +10494,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10842: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10497: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:10846: \$? = $ac_status" >&5 + echo "$as_me:10501: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -11599,11 +11254,7 @@ LIBS="-ldl $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -11612,6 +11263,12 @@ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char dlopen (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -11635,8 +11292,7 @@ ac_cv_lib_dl_dlopen=yes else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 ac_cv_lib_dl_dlopen=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -11664,44 +11320,37 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char shl_load (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -#ifdef __STDC__ -# include -#else -# include -#endif + which can conflict with char shl_load (); below. */ +#include /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" -{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char shl_load (); +char (*f) (); + +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_shl_load) || defined (__stub___shl_load) choke me #else -char (*f) () = shl_load; -#endif -#ifdef __cplusplus -} +f = shl_load; #endif -int -main () -{ -return f != shl_load; ; return 0; } @@ -11721,8 +11370,7 @@ ac_cv_func_shl_load=yes else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 ac_cv_func_shl_load=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -11741,11 +11389,7 @@ LIBS="-ldld $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -11754,6 +11398,12 @@ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char shl_load (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -11777,8 +11427,7 @@ ac_cv_lib_dld_shl_load=yes else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 ac_cv_lib_dld_shl_load=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -11796,44 +11445,37 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char dlopen (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -#ifdef __STDC__ -# include -#else -# include -#endif + which can conflict with char dlopen (); below. */ +#include /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" -{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char dlopen (); +char (*f) (); + +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_dlopen) || defined (__stub___dlopen) choke me #else -char (*f) () = dlopen; -#endif -#ifdef __cplusplus -} +f = dlopen; #endif -int -main () -{ -return f != dlopen; ; return 0; } @@ -11853,8 +11495,7 @@ ac_cv_func_dlopen=yes else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 ac_cv_func_dlopen=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -11873,11 +11514,7 @@ LIBS="-ldl $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -11886,6 +11523,12 @@ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char dlopen (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -11909,8 +11552,7 @@ ac_cv_lib_dl_dlopen=yes else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 ac_cv_lib_dl_dlopen=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -11930,11 +11572,7 @@ LIBS="-lsvld $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -11943,6 +11581,12 @@ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char dlopen (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -11966,8 +11610,7 @@ ac_cv_lib_svld_dlopen=yes else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 ac_cv_lib_svld_dlopen=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -11987,11 +11630,7 @@ LIBS="-ldld $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -12000,6 +11639,12 @@ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char dld_link (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -12023,8 +11668,7 @@ ac_cv_lib_dld_dld_link=yes else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 ac_cv_lib_dld_dld_link=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -12082,7 +11726,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:12649: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13009: \$? = $ac_status" >&5 + echo "$as_me:12653: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -13069,11 +12713,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13072: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12716: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13076: \$? = $ac_status" >&5 + echo "$as_me:12720: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -13433,8 +13077,7 @@ }'`; fi else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -13473,8 +13116,7 @@ }'`; fi else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -15013,11 +14655,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15016: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14658: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15020: \$? = $ac_status" >&5 + echo "$as_me:14662: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -15245,11 +14887,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15248: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14890: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15252: \$? = $ac_status" >&5 + echo "$as_me:14894: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -15312,11 +14954,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15315: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14957: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15319: \$? = $ac_status" >&5 + echo "$as_me:14961: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -15653,12 +15295,14 @@ # Determine the default libpath from the value encoded in an empty executable. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -15687,8 +15331,7 @@ }'`; fi else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -15704,12 +15347,14 @@ # Determine the default libpath from the value encoded in an empty executable. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -15738,8 +15383,7 @@ }'`; fi else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -16841,11 +16485,7 @@ LIBS="-ldl $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -16854,6 +16494,12 @@ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char dlopen (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -16877,8 +16523,7 @@ ac_cv_lib_dl_dlopen=yes else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 ac_cv_lib_dl_dlopen=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -16906,44 +16551,37 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char shl_load (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -#ifdef __STDC__ -# include -#else -# include -#endif + which can conflict with char shl_load (); below. */ +#include /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" -{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char shl_load (); +char (*f) (); + +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_shl_load) || defined (__stub___shl_load) choke me #else -char (*f) () = shl_load; -#endif -#ifdef __cplusplus -} +f = shl_load; #endif -int -main () -{ -return f != shl_load; ; return 0; } @@ -16963,8 +16601,7 @@ ac_cv_func_shl_load=yes else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 ac_cv_func_shl_load=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -16983,11 +16620,7 @@ LIBS="-ldld $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -16996,6 +16629,12 @@ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char shl_load (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -17019,8 +16658,7 @@ ac_cv_lib_dld_shl_load=yes else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 ac_cv_lib_dld_shl_load=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -17038,44 +16676,37 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char dlopen (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -#ifdef __STDC__ -# include -#else -# include -#endif + which can conflict with char dlopen (); below. */ +#include /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" -{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char dlopen (); +char (*f) (); + +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_dlopen) || defined (__stub___dlopen) choke me #else -char (*f) () = dlopen; -#endif -#ifdef __cplusplus -} +f = dlopen; #endif -int -main () -{ -return f != dlopen; ; return 0; } @@ -17095,8 +16726,7 @@ ac_cv_func_dlopen=yes else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 ac_cv_func_dlopen=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -17115,11 +16745,7 @@ LIBS="-ldl $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -17128,6 +16754,12 @@ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char dlopen (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -17151,8 +16783,7 @@ ac_cv_lib_dl_dlopen=yes else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 ac_cv_lib_dl_dlopen=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -17172,11 +16803,7 @@ LIBS="-lsvld $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -17185,6 +16812,12 @@ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char dlopen (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -17208,8 +16841,7 @@ ac_cv_lib_svld_dlopen=yes else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 ac_cv_lib_svld_dlopen=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -17229,11 +16861,7 @@ LIBS="-ldld $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -17242,6 +16870,12 @@ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char dld_link (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -17265,8 +16899,7 @@ ac_cv_lib_dld_dld_link=yes else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 ac_cv_lib_dld_dld_link=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -17324,7 +16957,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -18984,6 +18613,12 @@ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char elf_begin (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -19007,8 +18642,7 @@ ac_cv_lib_elf_elf_begin=yes else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 ac_cv_lib_elf_elf_begin=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -19035,11 +18669,7 @@ ac_cv_search_dlopen=no cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -19048,6 +18678,12 @@ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char dlopen (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -19071,8 +18707,7 @@ ac_cv_search_dlopen="none required" else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test "$ac_cv_search_dlopen" = no; then @@ -19080,11 +18715,7 @@ LIBS="-l$ac_lib $ac_func_search_save_LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -19093,6 +18724,12 @@ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char dlopen (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -19117,8 +18754,7 @@ break else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext done @@ -19146,11 +18782,7 @@ ac_cv_search_mallinfo=no cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -19159,6 +18791,12 @@ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char mallinfo (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -19182,8 +18820,7 @@ ac_cv_search_mallinfo="none required" else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test "$ac_cv_search_mallinfo" = no; then @@ -19191,11 +18828,7 @@ LIBS="-l$ac_lib $ac_func_search_save_LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -19204,6 +18837,12 @@ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char mallinfo (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -19228,8 +18867,7 @@ break else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext done @@ -19255,59 +18893,48 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" #include #include #include #include -int -main () -{ - - ; - return 0; -} _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then ac_cv_header_stdc=yes else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_header_stdc=no + cat conftest.$ac_ext >&5 + ac_cv_header_stdc=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" #include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then + egrep "memchr" >/dev/null 2>&1; then : else ac_cv_header_stdc=no @@ -19320,16 +18947,12 @@ # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" #include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then + egrep "free" >/dev/null 2>&1; then : else ac_cv_header_stdc=no @@ -19345,18 +18968,13 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" #include #if ((' ' & 0x0FF) == 0x020) # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) #else -# define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ +# define ISLOWER(c) (('a' <= (c) && (c) <= 'i') \ || ('j' <= (c) && (c) <= 'r') \ || ('s' <= (c) && (c) <= 'z')) # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) @@ -19389,12 +19007,11 @@ else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 ( exit $ac_status ) ac_cv_header_stdc=no fi -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi fi @@ -19415,11 +19032,7 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" #include #include #ifndef WEXITSTATUS @@ -19429,6 +19042,12 @@ # define WIFEXITED(stat_val) (((stat_val) & 255) == 0) #endif +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -19454,8 +19073,7 @@ ac_cv_header_sys_wait_h=yes else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 ac_cv_header_sys_wait_h=no fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -19496,11 +19114,7 @@ echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" $ac_includes_default #include <$ac_header> _ACEOF @@ -19519,8 +19133,7 @@ ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 ac_header_compiler=no fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -19532,17 +19145,13 @@ echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" #include <$ac_header> _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err + egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -19559,8 +19168,7 @@ ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - + cat conftest.$ac_ext >&5 ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext @@ -19573,32 +19181,14 @@ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf at gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; no:yes ) { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf at gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; esac echo "$as_me:$LINENO: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 @@ -19642,11 +19232,7 @@ echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" $ac_includes_default #include <$ac_header> _ACEOF @@ -19665,8 +19251,7 @@ ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 ac_header_compiler=no fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -19678,17 +19263,13 @@ echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" #include <$ac_header> _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err + egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -19705,8 +19286,7 @@ ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - + cat conftest.$ac_ext >&5 ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext @@ -19719,32 +19299,14 @@ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf at gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; no:yes ) { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf at gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; esac echo "$as_me:$LINENO: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 @@ -19786,11 +19348,7 @@ echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" $ac_includes_default #include <$ac_header> _ACEOF @@ -19809,8 +19367,7 @@ ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 ac_header_compiler=no fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -19822,17 +19379,13 @@ echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" #include <$ac_header> _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err + egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -19849,8 +19402,7 @@ ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - + cat conftest.$ac_ext >&5 ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext @@ -19863,32 +19415,14 @@ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf at gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; no:yes ) { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf at gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; esac echo "$as_me:$LINENO: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 @@ -19912,6 +19446,103 @@ +echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 +echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 +if test "${ac_cv_prog_cc_stdc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_prog_cc_stdc=no +ac_save_CC=$CC +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +#include "confdefs.h" +#include +#include +#include +#include +/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ +struct buf { int x; }; +FILE * (*rcsopen) (struct buf *, struct stat *, int); +static char *e (p, i) + char **p; + int i; +{ + return p[i]; +} +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; +} +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +int argc; +char **argv; +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ +return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; + ; + return 0; +} +_ACEOF +# Don't try gcc -ansi; that turns off useful extensions and +# breaks some systems' header files. +# AIX -qlanglvl=ansi +# Ultrix and OSF/1 -std1 +# HP-UX 10.20 and later -Ae +# HP-UX older versions -Aa -D_HPUX_SOURCE +# SVR4 -Xc -D__EXTENSIONS__ +for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +do + CC="$ac_save_CC $ac_arg" + rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_prog_cc_stdc=$ac_arg +break +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +fi +rm -f conftest.$ac_objext +done +rm -f conftest.$ac_ext conftest.$ac_objext +CC=$ac_save_CC + +fi + +case "x$ac_cv_prog_cc_stdc" in + x|xno) + echo "$as_me:$LINENO: result: none needed" >&5 +echo "${ECHO_T}none needed" >&6 ;; + *) + echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 +echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 + CC="$CC $ac_cv_prog_cc_stdc" ;; +esac + echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 if test "${ac_cv_c_const+set}" = set; then @@ -19919,12 +19550,14 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -19994,8 +19627,7 @@ ac_cv_c_const=yes else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 ac_cv_c_const=no fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -20019,15 +19651,10 @@ for ac_kw in inline __inline__ __inline; do cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" #ifndef __cplusplus -typedef int foo_t; -static $ac_kw foo_t static_foo () {return 0; } -$ac_kw foo_t foo () {return 0; } +static $ac_kw int static_foo () {return 0; } +$ac_kw int foo () {return 0; } #endif _ACEOF @@ -20046,8 +19673,7 @@ ac_cv_c_inline=$ac_kw; break else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext done @@ -20077,14 +19703,16 @@ # See if sys/param.h defines the BYTE_ORDER macro. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" #include #include +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -20111,14 +19739,16 @@ # It does; now see whether it defined to BIG_ENDIAN or not. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" #include #include +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -20145,32 +19775,32 @@ ac_cv_c_bigendian=yes else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 ac_cv_c_bigendian=no fi rm -f conftest.$ac_objext conftest.$ac_ext else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 # It does not; compile a test program. if test "$cross_compiling" = yes; then - # try to guess the endianness by grepping values into an object file + # try to guess the endianess by grep'ing values into an object file ac_cv_c_bigendian=unknown cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; } short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; } +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -20191,10 +19821,10 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then + if fgrep BIGenDianSyS conftest.$ac_objext >/dev/null ; then ac_cv_c_bigendian=yes fi -if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then +if fgrep LiTTleEnDian conftest.$ac_objext >/dev/null ; then if test "$ac_cv_c_bigendian" = unknown; then ac_cv_c_bigendian=no else @@ -20204,18 +19834,13 @@ fi else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" int main () { @@ -20244,12 +19869,11 @@ else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 ( exit $ac_status ) ac_cv_c_bigendian=yes fi -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -20268,9 +19892,9 @@ _ACEOF ;; *) - { { echo "$as_me:$LINENO: error: unknown endianness + { { echo "$as_me:$LINENO: error: unknown endianess presetting ac_cv_c_bigendian=no (or yes) will help" >&5 -echo "$as_me: error: unknown endianness +echo "$as_me: error: unknown endianess presetting ac_cv_c_bigendian=no (or yes) will help" >&2;} { (exit 1); exit 1; }; } ;; esac @@ -20283,12 +19907,14 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" $ac_includes_default +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -20315,8 +19941,7 @@ ac_cv_type_pid_t=yes else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 ac_cv_type_pid_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -20340,12 +19965,14 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" $ac_includes_default +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -20372,8 +19999,7 @@ ac_cv_type_size_t=yes else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 ac_cv_type_size_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -20397,12 +20023,14 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" $ac_includes_default +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -20429,8 +20057,7 @@ ac_cv_type_int64_t=yes else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 ac_cv_type_int64_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -20457,12 +20084,14 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" $ac_includes_default +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -20489,8 +20118,7 @@ ac_cv_type_uint64_t=yes else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 ac_cv_type_uint64_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -20517,15 +20145,17 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" #include #include #include +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -20550,8 +20180,7 @@ ac_cv_header_time=yes else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 ac_cv_header_time=no fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -20573,14 +20202,16 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" #include #include +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -20604,8 +20235,7 @@ ac_cv_struct_tm=time.h else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 ac_cv_struct_tm=sys/time.h fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -20636,12 +20266,14 @@ cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" namespace Outer { namespace Inner { int i = 0; }} +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -20665,8 +20297,7 @@ ac_cv_cxx_namespaces=yes else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 ac_cv_cxx_namespaces=no fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -20704,15 +20335,17 @@ cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" #include #ifdef HAVE_NAMESPACES using namespace std; #endif +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -20736,22 +20369,23 @@ ac_cv_cxx_have_ext_hash_map=std else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 ac_cv_cxx_have_ext_hash_map=no fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" #include #ifdef HAVE_NAMESPACES using namespace __gnu_cxx; #endif +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -20775,8 +20409,7 @@ ac_cv_cxx_have_ext_hash_map=gnu else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 ac_cv_cxx_have_ext_hash_map=no fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -20821,15 +20454,17 @@ cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" #include #ifdef HAVE_NAMESPACES using namespace std; #endif +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -20853,22 +20488,23 @@ ac_cv_cxx_have_ext_hash_set=std else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 ac_cv_cxx_have_ext_hash_set=no fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" #include #ifdef HAVE_NAMESPACES using namespace __gnu_cxx; #endif +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -20892,8 +20528,7 @@ ac_cv_cxx_have_ext_hash_set=gnu else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 ac_cv_cxx_have_ext_hash_set=no fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -20938,15 +20573,17 @@ cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" #include #ifdef HAVE_NAMESPACES using namespace std; #endif +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -20970,22 +20607,23 @@ ac_cv_cxx_have_ext_slist=std else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 ac_cv_cxx_have_ext_slist=no fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" #include #ifdef HAVE_NAMESPACES using namespace __gnu_cxx; #endif +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -21009,8 +20647,7 @@ ac_cv_cxx_have_ext_slist=gnu else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 ac_cv_cxx_have_ext_slist=no fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -21056,15 +20693,17 @@ cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" #include #ifdef HAVE_NAMESPACES using namespace std; #endif +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -21088,8 +20727,7 @@ ac_cv_cxx_have_std_iterator=yes else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 ac_cv_cxx_have_std_iterator=no fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -21127,15 +20765,17 @@ cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" #include #ifdef HAVE_NAMESPACES using namespace std; #endif +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -21159,8 +20799,7 @@ ac_cv_cxx_have_bi_iterator=yes else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 ac_cv_cxx_have_bi_iterator=no fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -21198,15 +20837,17 @@ cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" #include #ifdef HAVE_NAMESPACES using namespace std; #endif +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -21230,8 +20871,7 @@ ac_cv_cxx_have_fwd_iterator=yes else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 ac_cv_cxx_have_fwd_iterator=no fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -21263,12 +20903,14 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" #include +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -21292,8 +20934,7 @@ ac_cv_working_alloca_h=yes else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 ac_cv_working_alloca_h=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -21315,11 +20956,7 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" #ifdef __GNUC__ # define alloca __builtin_alloca #else @@ -21341,6 +20978,12 @@ # endif #endif +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -21364,8 +21007,7 @@ ac_cv_func_alloca_works=yes else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 ac_cv_func_alloca_works=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -21399,11 +21041,7 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" #if defined(CRAY) && ! defined(CRAY2) webecray #else @@ -21412,7 +21050,7 @@ _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "webecray" >/dev/null 2>&1; then + egrep "webecray" >/dev/null 2>&1; then ac_cv_os_cray=yes else ac_cv_os_cray=no @@ -21432,44 +21070,37 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -#ifdef __STDC__ -# include -#else -# include -#endif + which can conflict with char $ac_func (); below. */ +#include /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" -{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func (); +char (*f) (); + +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -char (*f) () = $ac_func; -#endif -#ifdef __cplusplus -} +f = $ac_func; #endif -int -main () -{ -return f != $ac_func; ; return 0; } @@ -21489,8 +21120,7 @@ eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -21519,11 +21149,7 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" int find_stack_direction () { @@ -21559,12 +21185,11 @@ else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 ( exit $ac_status ) ac_cv_c_stack_direction=-1 fi -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5 @@ -21586,16 +21211,12 @@ ac_pattern="Autoconf.*'x'" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" #include Autoconf TIOCGETP _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "$ac_pattern" >/dev/null 2>&1; then + egrep "$ac_pattern" >/dev/null 2>&1; then ac_cv_prog_gcc_traditional=yes else ac_cv_prog_gcc_traditional=no @@ -21606,16 +21227,12 @@ if test $ac_cv_prog_gcc_traditional = no; then cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" #include Autoconf TCGETA _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "$ac_pattern" >/dev/null 2>&1; then + egrep "$ac_pattern" >/dev/null 2>&1; then ac_cv_prog_gcc_traditional=yes fi rm -f conftest* @@ -21639,12 +21256,14 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -21692,12 +21311,11 @@ else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 ( exit $ac_status ) ac_cv_func_memcmp_working=no fi -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi echo "$as_me:$LINENO: result: $ac_cv_func_memcmp_working" >&5 @@ -21723,11 +21341,7 @@ echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" $ac_includes_default #include <$ac_header> _ACEOF @@ -21746,8 +21360,7 @@ ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 ac_header_compiler=no fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -21759,17 +21372,13 @@ echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" #include <$ac_header> _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err + egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -21786,8 +21395,7 @@ ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - + cat conftest.$ac_ext >&5 ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext @@ -21800,32 +21408,14 @@ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf at gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; no:yes ) { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf at gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; esac echo "$as_me:$LINENO: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 @@ -21858,44 +21448,37 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -#ifdef __STDC__ -# include -#else -# include -#endif + which can conflict with char $ac_func (); below. */ +#include /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" -{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func (); +char (*f) (); + +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -char (*f) () = $ac_func; -#endif -#ifdef __cplusplus -} +f = $ac_func; #endif -int -main () -{ -return f != $ac_func; ; return 0; } @@ -21915,8 +21498,7 @@ eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -21941,11 +21523,7 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" $ac_includes_default /* malloc might have been renamed as rpl_malloc. */ #undef malloc @@ -22088,12 +21666,11 @@ else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 ( exit $ac_status ) ac_cv_func_mmap_fixed_mapped=no fi -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5 @@ -22121,19 +21698,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test "$cross_compiling" = yes; then - { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot run test program while cross compiling -See \`config.log' for more details." >&2;} + { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling" >&5 +echo "$as_me: error: cannot run test program while cross compiling" >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" #ifdef HAVE_SYS_MMAN_H #include @@ -22166,12 +21737,11 @@ else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 ( exit $ac_status ) ac_cv_func_mmap_file=no fi -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -22213,14 +21783,16 @@ cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" #include #include #include +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -22244,8 +21816,7 @@ ac_cv_header_mmap_anon=yes else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 ac_cv_header_mmap_anon=no fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -22273,11 +21844,7 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" #include #include #ifdef signal @@ -22289,6 +21856,12 @@ void (*signal ()) (); #endif +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -22312,8 +21885,7 @@ ac_cv_type_signal=void else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 ac_cv_type_signal=int fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -22345,44 +21917,37 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -#ifdef __STDC__ -# include -#else -# include -#endif + which can conflict with char $ac_func (); below. */ +#include /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" -{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func (); +char (*f) (); + +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -char (*f) () = $ac_func; -#endif -#ifdef __cplusplus -} +f = $ac_func; #endif -int -main () -{ -return f != $ac_func; ; return 0; } @@ -22402,8 +21967,7 @@ eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -22427,44 +21991,37 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char mmap (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -#ifdef __STDC__ -# include -#else -# include -#endif + which can conflict with char mmap (); below. */ +#include /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" -{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char mmap (); +char (*f) (); + +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_mmap) || defined (__stub___mmap) choke me #else -char (*f) () = mmap; -#endif -#ifdef __cplusplus -} +f = mmap; #endif -int -main () -{ -return f != mmap; ; return 0; } @@ -22484,8 +22041,7 @@ ac_cv_func_mmap=yes else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 ac_cv_func_mmap=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -22507,44 +22063,37 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +#include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char mprotect (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -#ifdef __STDC__ -# include -#else -# include -#endif + which can conflict with char mprotect (); below. */ +#include /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" -{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char mprotect (); +char (*f) (); + +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_mprotect) || defined (__stub___mprotect) choke me #else -char (*f) () = mprotect; -#endif -#ifdef __cplusplus -} +f = mprotect; #endif -int -main () -{ -return f != mprotect; ; return 0; } @@ -22564,8 +22113,7 @@ ac_cv_func_mprotect=yes else echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +cat conftest.$ac_ext >&5 ac_cv_func_mprotect=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -22743,7 +22291,7 @@ fi; - ac_config_files="$ac_config_files Makefile.config" +ac_config_files="$ac_config_files Makefile.config" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -22754,7 +22302,7 @@ # config.status only pays attention to the cache file if you give it # the --recheck option to rerun configure. # -# `ac_cv_env_foo' variables (set or unset) will be overridden when +# `ac_cv_env_foo' variables (set or unset) will be overriden when # loading this file, other *unset* `ac_cv_foo' will be assigned the # following values. @@ -22789,7 +22337,7 @@ t end /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ : end' >>confcache -if diff $cache_file confcache >/dev/null 2>&1; then :; else +if cmp -s $cache_file confcache; then :; else if test -w $cache_file; then test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" cat confcache >$cache_file @@ -22820,21 +22368,6 @@ DEFS=-DHAVE_CONFIG_H -ac_libobjs= -ac_ltlibobjs= -for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue - # 1. Remove the extension, and $U if already installed. - ac_i=`echo "$ac_i" | - sed 's/\$U\././;s/\.o$//;s/\.obj$//'` - # 2. Add them. - ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" - ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' -done -LIBOBJS=$ac_libobjs - -LTLIBOBJS=$ac_ltlibobjs - - : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files @@ -22849,12 +22382,11 @@ # configure, is in config.log if it exists. debug=false -ac_cs_recheck=false -ac_cs_silent=false SHELL=\${CONFIG_SHELL-$SHELL} _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF + ## --------------------- ## ## M4sh Initialization. ## ## --------------------- ## @@ -22863,13 +22395,11 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then set -o posix fi +# NLS nuisances. # Support unset when possible. if (FOO=FOO; unset FOO) >/dev/null 2>&1; then as_unset=unset @@ -22877,42 +22407,34 @@ as_unset=false fi - -# Work around bugs in pre-3.0 UWIN ksh. -$as_unset ENV MAIL MAILPATH -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -for as_var in \ - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ - LC_TELEPHONE LC_TIME -do - if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else - $as_unset $as_var - fi -done - -# Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1; then - as_expr=expr -else - as_expr=false -fi - -if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then - as_basename=basename -else - as_basename=false -fi +(set +x; test -n "`(LANG=C; export LANG) 2>&1`") && + { $as_unset LANG || test "${LANG+set}" != set; } || + { LANG=C; export LANG; } +(set +x; test -n "`(LC_ALL=C; export LC_ALL) 2>&1`") && + { $as_unset LC_ALL || test "${LC_ALL+set}" != set; } || + { LC_ALL=C; export LC_ALL; } +(set +x; test -n "`(LC_TIME=C; export LC_TIME) 2>&1`") && + { $as_unset LC_TIME || test "${LC_TIME+set}" != set; } || + { LC_TIME=C; export LC_TIME; } +(set +x; test -n "`(LC_CTYPE=C; export LC_CTYPE) 2>&1`") && + { $as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set; } || + { LC_CTYPE=C; export LC_CTYPE; } +(set +x; test -n "`(LANGUAGE=C; export LANGUAGE) 2>&1`") && + { $as_unset LANGUAGE || test "${LANGUAGE+set}" != set; } || + { LANGUAGE=C; export LANGUAGE; } +(set +x; test -n "`(LC_COLLATE=C; export LC_COLLATE) 2>&1`") && + { $as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set; } || + { LC_COLLATE=C; export LC_COLLATE; } +(set +x; test -n "`(LC_NUMERIC=C; export LC_NUMERIC) 2>&1`") && + { $as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set; } || + { LC_NUMERIC=C; export LC_NUMERIC; } +(set +x; test -n "`(LC_MESSAGES=C; export LC_MESSAGES) 2>&1`") && + { $as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set; } || + { LC_MESSAGES=C; export LC_MESSAGES; } # Name of the executable. -as_me=`$as_basename "$0" || +as_me=`(basename "$0") 2>/dev/null || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)$' \| \ @@ -22923,7 +22445,6 @@ /^X\/\(\/\).*/{ s//\1/; q; } s/.*/./; q'` - # PATH needs CR, and LINENO needs CR and PATH. # Avoid depending upon Character Ranges. as_cr_letters='abcdefghijklmnopqrstuvwxyz' @@ -22934,15 +22455,15 @@ # The user is always right. if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + echo "#! /bin/sh" >conftest.sh + echo "exit 0" >>conftest.sh + chmod +x conftest.sh + if (PATH=".;."; conftest.sh) >/dev/null 2>&1; then PATH_SEPARATOR=';' else PATH_SEPARATOR=: fi - rm -f conf$$.sh + rm -f conftest.sh fi @@ -22991,8 +22512,6 @@ as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` test "x$as_lineno_1" != "x$as_lineno_2" && test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then - $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } - $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } CONFIG_SHELL=$as_dir/$as_base export CONFIG_SHELL exec "$CONFIG_SHELL" "$0" ${1+"$@"} @@ -23066,12 +22585,6 @@ fi rm -f conf$$ conf$$.exe conf$$.file -if mkdir -p . 2>/dev/null; then - as_mkdir_p=: -else - as_mkdir_p=false -fi - as_executable_p="test -f" # Sed expression to map a string onto a valid CPP name. @@ -23088,7 +22601,7 @@ IFS=" $as_nl" # CDPATH. -$as_unset CDPATH +$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=$PATH_SEPARATOR; export CDPATH; } exec 6>&1 @@ -23105,7 +22618,7 @@ cat >&5 <<_CSEOF This file was extended by [LLVM] $as_me [1.0], which was -generated by GNU Autoconf 2.57. Invocation command line was +generated by GNU Autoconf 2.53. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -23145,7 +22658,6 @@ -h, --help print this help, then exit -V, --version print version number, then exit - -q, --quiet do not print progress messages -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions --file=FILE[:TEMPLATE] @@ -23168,7 +22680,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ [LLVM] config.status [1.0] -configured by $0, generated by GNU Autoconf 2.57, +configured by $0, generated by GNU Autoconf 2.53, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 @@ -23189,25 +22701,25 @@ --*=*) ac_option=`expr "x$1" : 'x\([^=]*\)='` ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` - ac_shift=: - ;; - -*) - ac_option=$1 - ac_optarg=$2 - ac_shift=shift + shift + set dummy "$ac_option" "$ac_optarg" ${1+"$@"} + shift ;; + -*);; *) # This is not an option, so the user has probably given explicit # arguments. - ac_option=$1 ac_need_defaults=false;; esac - case $ac_option in + case $1 in # Handling of the options. _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - ac_cs_recheck=: ;; + echo "running $SHELL $0 " $ac_configure_args " --no-create --no-recursion" + exec $SHELL $0 $ac_configure_args --no-create --no-recursion ;; +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF --version | --vers* | -V ) echo "$ac_cs_version"; exit 0 ;; --he | --h) @@ -23222,16 +22734,13 @@ --debug | --d* | -d ) debug=: ;; --file | --fil | --fi | --f ) - $ac_shift - CONFIG_FILES="$CONFIG_FILES $ac_optarg" + shift + CONFIG_FILES="$CONFIG_FILES $1" ac_need_defaults=false;; --header | --heade | --head | --hea ) - $ac_shift - CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" + shift + CONFIG_HEADERS="$CONFIG_HEADERS $1" ac_need_defaults=false;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil | --si | --s) - ac_cs_silent=: ;; # This is an error. -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 @@ -23246,20 +22755,6 @@ shift done -ac_configure_extra_args= - -if $ac_cs_silent; then - exec 6>/dev/null - ac_configure_extra_args="$ac_configure_extra_args --silent" -fi - -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF -if \$ac_cs_recheck; then - echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 - exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion -fi - _ACEOF cat >>$CONFIG_STATUS <<_ACEOF @@ -23284,8 +22779,6 @@ ${srcdir}/autoconf/mkinstalldirs `dirname lib/CodeGen/InstrSched/Makefile` ${srcdir}/autoconf/mkinstalldirs `dirname lib/CodeGen/InstrSelection/Makefile` ${srcdir}/autoconf/mkinstalldirs `dirname lib/CodeGen/ModuloScheduling/Makefile` -${srcdir}/autoconf/mkinstalldirs `dirname lib/CodeGen/PostOpts/Makefile` -${srcdir}/autoconf/mkinstalldirs `dirname lib/CodeGen/PreOpts/Makefile` ${srcdir}/autoconf/mkinstalldirs `dirname lib/CodeGen/RegAlloc/Makefile` ${srcdir}/autoconf/mkinstalldirs `dirname lib/CodeGen/SelectionDAG/Makefile` ${srcdir}/autoconf/mkinstalldirs `dirname lib/ExecutionEngine/Makefile` @@ -23392,15 +22885,6 @@ ${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/NoSource/Larn/Makefile` ${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/NoSource/Moria-5.5.2/Makefile` ${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/NoSource/Povray31/Makefile` -${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/NoSource/SPEC/Makefile` -${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/NoSource/SPEC/CINT2000/Makefile` -${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/NoSource/SPEC/CINT2000/164.gzip/Makefile` -${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/NoSource/SPEC/CINT2000/181.mcf/Makefile` -${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/NoSource/SPEC/CINT2000/197.parser/Makefile` -${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/NoSource/SPEC/CINT2000/254.gap/Makefile` -${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/NoSource/SPEC/CINT2000/255.vortex/Makefile` -${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/NoSource/SPEC/CINT2000/256.bzip2/Makefile` -${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/NoSource/SPEC/CINT2000/300.twolf/Makefile` ${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/NoSource/m4/Makefile` ${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/SingleSource/Makefile` ${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/SingleSource/Makefile.singlesrc` @@ -23468,8 +22952,6 @@ "lib/CodeGen/InstrSched/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS lib/CodeGen/InstrSched/Makefile" ;; "lib/CodeGen/InstrSelection/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS lib/CodeGen/InstrSelection/Makefile" ;; "lib/CodeGen/ModuloScheduling/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS lib/CodeGen/ModuloScheduling/Makefile" ;; - "lib/CodeGen/PostOpts/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS lib/CodeGen/PostOpts/Makefile" ;; - "lib/CodeGen/PreOpts/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS lib/CodeGen/PreOpts/Makefile" ;; "lib/CodeGen/RegAlloc/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS lib/CodeGen/RegAlloc/Makefile" ;; "lib/CodeGen/SelectionDAG/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS lib/CodeGen/SelectionDAG/Makefile" ;; "lib/ExecutionEngine/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS lib/ExecutionEngine/Makefile" ;; @@ -23576,15 +23058,6 @@ "test/Programs/NoSource/Larn/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/NoSource/Larn/Makefile" ;; "test/Programs/NoSource/Moria-5.5.2/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/NoSource/Moria-5.5.2/Makefile" ;; "test/Programs/NoSource/Povray31/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/NoSource/Povray31/Makefile" ;; - "test/Programs/NoSource/SPEC/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/NoSource/SPEC/Makefile" ;; - "test/Programs/NoSource/SPEC/CINT2000/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/NoSource/SPEC/CINT2000/Makefile" ;; - "test/Programs/NoSource/SPEC/CINT2000/164.gzip/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/NoSource/SPEC/CINT2000/164.gzip/Makefile" ;; - "test/Programs/NoSource/SPEC/CINT2000/181.mcf/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/NoSource/SPEC/CINT2000/181.mcf/Makefile" ;; - "test/Programs/NoSource/SPEC/CINT2000/197.parser/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/NoSource/SPEC/CINT2000/197.parser/Makefile" ;; - "test/Programs/NoSource/SPEC/CINT2000/254.gap/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/NoSource/SPEC/CINT2000/254.gap/Makefile" ;; - "test/Programs/NoSource/SPEC/CINT2000/255.vortex/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/NoSource/SPEC/CINT2000/255.vortex/Makefile" ;; - "test/Programs/NoSource/SPEC/CINT2000/256.bzip2/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/NoSource/SPEC/CINT2000/256.bzip2/Makefile" ;; - "test/Programs/NoSource/SPEC/CINT2000/300.twolf/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/NoSource/SPEC/CINT2000/300.twolf/Makefile" ;; "test/Programs/NoSource/m4/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/NoSource/m4/Makefile" ;; "test/Programs/SingleSource/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/SingleSource/Makefile" ;; "test/Programs/SingleSource/Makefile.singlesrc" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/SingleSource/Makefile.singlesrc" ;; @@ -23641,9 +23114,6 @@ test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands fi -# Have a temporary directory for convenience. Make it in the build tree -# simply because there is no reason to put it here, and in addition, -# creating and moving files from /tmp can sometimes cause problems. # Create a temporary directory, and hook for its removal unless debugging. $debug || { @@ -23652,17 +23122,17 @@ } # Create a (secure) tmp directory for tmp files. - +: ${TMPDIR=/tmp} { - tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` && + tmp=`(umask 077 && mktemp -d -q "$TMPDIR/csXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" } || { - tmp=./confstat$$-$RANDOM + tmp=$TMPDIR/cs$$-$RANDOM (umask 077 && mkdir $tmp) } || { - echo "$me: cannot create a temporary directory in ." >&2 + echo "$me: cannot create a temporary directory in $TMPDIR" >&2 { (exit 1); exit 1; } } @@ -23781,7 +23251,6 @@ s, at SPEC_ROOT@,$SPEC_ROOT,;t t s, at BCR@,$BCR,;t t s, at PAPIDIR@,$PAPIDIR,;t t -s, at LTLIBOBJS@,$LTLIBOBJS,;t t CEOF _ACEOF @@ -23852,30 +23321,25 @@ /^X\(\/\/\)$/{ s//\1/; q; } /^X\(\/\).*/{ s//\1/; q; } s/.*/./; q'` - { if $as_mkdir_p; then - mkdir -p "$ac_dir" - else - as_dir="$ac_dir" - as_dirs= - while test ! -d "$as_dir"; do - as_dirs="$as_dir $as_dirs" - as_dir=`(dirname "$as_dir") 2>/dev/null || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - done - test ! -n "$as_dirs" || mkdir $as_dirs - fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} - { (exit 1); exit 1; }; }; } + { case "$ac_dir" in + [\\/]* | ?:[\\/]* ) as_incr_dir=;; + *) as_incr_dir=.;; +esac +as_dummy="$ac_dir" +for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do + case $as_mkdir_dir in + # Skip DOS drivespec + ?:) as_incr_dir=$as_mkdir_dir ;; + *) + as_incr_dir=$as_incr_dir/$as_mkdir_dir + test -d "$as_incr_dir" || + mkdir "$as_incr_dir" || + { { echo "$as_me:$LINENO: error: cannot create \"$ac_dir\"" >&5 +echo "$as_me: error: cannot create \"$ac_dir\"" >&2;} + { (exit 1); exit 1; }; } + ;; + esac +done; } ac_builddir=. @@ -23905,7 +23369,7 @@ # Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be # absolute. ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` -ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` +ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd` ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` @@ -24095,7 +23559,7 @@ # Break up conftest.defines because some shells have a limit on the size # of here documents, and old seds have small limits too (100 cmds). echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS -echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS +echo ' if egrep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS echo ' :' >>$CONFIG_STATUS rm -f conftest.tail @@ -24119,7 +23583,7 @@ mv conftest.tail conftest.defines done rm -f conftest.defines -echo ' fi # grep' >>$CONFIG_STATUS +echo ' fi # egrep' >>$CONFIG_STATUS echo >>$CONFIG_STATUS # Break up conftest.undefs because some shells have a limit on the size @@ -24159,7 +23623,7 @@ cat $tmp/in >>$tmp/config.h rm -f $tmp/in if test x"$ac_file" != x-; then - if diff $ac_file $tmp/config.h >/dev/null 2>&1; then + if cmp -s $ac_file $tmp/config.h 2>/dev/null; then { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else @@ -24175,30 +23639,25 @@ /^X\(\/\/\)$/{ s//\1/; q; } /^X\(\/\).*/{ s//\1/; q; } s/.*/./; q'` - { if $as_mkdir_p; then - mkdir -p "$ac_dir" - else - as_dir="$ac_dir" - as_dirs= - while test ! -d "$as_dir"; do - as_dirs="$as_dir $as_dirs" - as_dir=`(dirname "$as_dir") 2>/dev/null || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - done - test ! -n "$as_dirs" || mkdir $as_dirs - fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} - { (exit 1); exit 1; }; }; } + { case "$ac_dir" in + [\\/]* | ?:[\\/]* ) as_incr_dir=;; + *) as_incr_dir=.;; +esac +as_dummy="$ac_dir" +for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do + case $as_mkdir_dir in + # Skip DOS drivespec + ?:) as_incr_dir=$as_mkdir_dir ;; + *) + as_incr_dir=$as_incr_dir/$as_mkdir_dir + test -d "$as_incr_dir" || + mkdir "$as_incr_dir" || + { { echo "$as_me:$LINENO: error: cannot create \"$ac_dir\"" >&5 +echo "$as_me: error: cannot create \"$ac_dir\"" >&2;} + { (exit 1); exit 1; }; } + ;; + esac +done; } rm -f $ac_file mv $tmp/config.h $ac_file @@ -24257,7 +23716,7 @@ # Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be # absolute. ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` -ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` +ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd` ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` @@ -24282,8 +23741,6 @@ lib/CodeGen/InstrSched/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/lib/CodeGen/InstrSched/Makefile lib/CodeGen/InstrSched/Makefile ;; lib/CodeGen/InstrSelection/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/lib/CodeGen/InstrSelection/Makefile lib/CodeGen/InstrSelection/Makefile ;; lib/CodeGen/ModuloScheduling/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/lib/CodeGen/ModuloScheduling/Makefile lib/CodeGen/ModuloScheduling/Makefile ;; - lib/CodeGen/PostOpts/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/lib/CodeGen/PostOpts/Makefile lib/CodeGen/PostOpts/Makefile ;; - lib/CodeGen/PreOpts/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/lib/CodeGen/PreOpts/Makefile lib/CodeGen/PreOpts/Makefile ;; lib/CodeGen/RegAlloc/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/lib/CodeGen/RegAlloc/Makefile lib/CodeGen/RegAlloc/Makefile ;; lib/CodeGen/SelectionDAG/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/lib/CodeGen/SelectionDAG/Makefile lib/CodeGen/SelectionDAG/Makefile ;; lib/ExecutionEngine/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/lib/ExecutionEngine/Makefile lib/ExecutionEngine/Makefile ;; @@ -24390,15 +23847,6 @@ test/Programs/NoSource/Larn/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/NoSource/Larn/Makefile test/Programs/NoSource/Larn/Makefile ;; test/Programs/NoSource/Moria-5.5.2/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/NoSource/Moria-5.5.2/Makefile test/Programs/NoSource/Moria-5.5.2/Makefile ;; test/Programs/NoSource/Povray31/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/NoSource/Povray31/Makefile test/Programs/NoSource/Povray31/Makefile ;; - test/Programs/NoSource/SPEC/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/NoSource/SPEC/Makefile test/Programs/NoSource/SPEC/Makefile ;; - test/Programs/NoSource/SPEC/CINT2000/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/NoSource/SPEC/CINT2000/Makefile test/Programs/NoSource/SPEC/CINT2000/Makefile ;; - test/Programs/NoSource/SPEC/CINT2000/164.gzip/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/NoSource/SPEC/CINT2000/164.gzip/Makefile test/Programs/NoSource/SPEC/CINT2000/164.gzip/Makefile ;; - test/Programs/NoSource/SPEC/CINT2000/181.mcf/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/NoSource/SPEC/CINT2000/181.mcf/Makefile test/Programs/NoSource/SPEC/CINT2000/181.mcf/Makefile ;; - test/Programs/NoSource/SPEC/CINT2000/197.parser/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/NoSource/SPEC/CINT2000/197.parser/Makefile test/Programs/NoSource/SPEC/CINT2000/197.parser/Makefile ;; - test/Programs/NoSource/SPEC/CINT2000/254.gap/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/NoSource/SPEC/CINT2000/254.gap/Makefile test/Programs/NoSource/SPEC/CINT2000/254.gap/Makefile ;; - test/Programs/NoSource/SPEC/CINT2000/255.vortex/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/NoSource/SPEC/CINT2000/255.vortex/Makefile test/Programs/NoSource/SPEC/CINT2000/255.vortex/Makefile ;; - test/Programs/NoSource/SPEC/CINT2000/256.bzip2/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/NoSource/SPEC/CINT2000/256.bzip2/Makefile test/Programs/NoSource/SPEC/CINT2000/256.bzip2/Makefile ;; - test/Programs/NoSource/SPEC/CINT2000/300.twolf/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/NoSource/SPEC/CINT2000/300.twolf/Makefile test/Programs/NoSource/SPEC/CINT2000/300.twolf/Makefile ;; test/Programs/NoSource/m4/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/NoSource/m4/Makefile test/Programs/NoSource/m4/Makefile ;; test/Programs/SingleSource/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/SingleSource/Makefile test/Programs/SingleSource/Makefile ;; test/Programs/SingleSource/Makefile.singlesrc ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/SingleSource/Makefile.singlesrc test/Programs/SingleSource/Makefile.singlesrc ;; @@ -24460,11 +23908,8 @@ # need to make the FD available again. if test "$no_create" != yes; then ac_cs_success=: - ac_config_status_args= - test "$silent" = yes && - ac_config_status_args="$ac_config_status_args --quiet" exec 5>/dev/null - $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false + $SHELL $CONFIG_STATUS || ac_cs_success=false exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. From criswell at cs.uiuc.edu Tue Sep 9 15:58:02 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Tue Sep 9 15:58:02 2003 Subject: [llvm-commits] CVS: llvm/Makefile.rules Message-ID: <200309092057.PAA30080@choi.cs.uiuc.edu> Changes in directory llvm: Makefile.rules updated: 1.132 -> 1.133 --- Log message: Updated to find source files using VPATH. This makes writing build rules much cleaner and easier. Labeled .td as a suffix for tblgen files in Makefile.rules. Modified build rules so that source files generated during the build are placed in the build directory and not the source directory (and not in a Debug directory). This makes the system cleaner and allows us to have a read-only source tree. --- Diffs of the changes: Index: llvm/Makefile.rules diff -u llvm/Makefile.rules:1.132 llvm/Makefile.rules:1.133 --- llvm/Makefile.rules:1.132 Sat Sep 6 09:44:17 2003 +++ llvm/Makefile.rules Tue Sep 9 15:56:56 2003 @@ -100,7 +100,7 @@ ########################################################################### .SUFFIXES: .SUFFIXES: .c .cpp .h .hpp .y .l -.SUFFIXES: .lo .o .a .so .bc +.SUFFIXES: .lo .o .a .so .bc .td .SUFFIXES: .ps .dot .d # @@ -344,13 +344,13 @@ # The local Makefile can list other Source files via ExtraSource = ... # ifndef Source -Source := $(ExtraSource) $(wildcard $(SourceDir)/*.cpp $(SourceDir)/*.c $(SourceDir)/*.y $(SourceDir)/*.l) +Source := $(notdir $(ExtraSource) $(wildcard $(SourceDir)/*.cpp $(SourceDir)/*.c $(SourceDir)/*.y $(SourceDir)/*.l)) endif # # Libtool Objects # -Srcs := $(sort $(notdir $(basename $(Source)))) +Srcs := $(sort $(basename $(Source))) Objs := $(addsuffix .lo, $(Srcs)) ObjectsO := $(addprefix $(BUILD_OBJ_DIR)/Release/,$(Objs)) ObjectsP := $(addprefix $(BUILD_OBJ_DIR)/Profile/,$(Objs)) @@ -360,7 +360,7 @@ # # The real objects underlying the libtool objects # -RObjs := $(sort $(patsubst Debug/%.o, %.o, $(addsuffix .o,$(notdir $(basename $(Source)))))) +RObjs := $(sort $(patsubst Debug/%.o, %.o, $(addsuffix .o,$(basename $(Source))))) RObjectsO := $(addprefix $(BUILD_OBJ_DIR)/Release/,$(RObjs)) RObjectsP := $(addprefix $(BUILD_OBJ_DIR)/Profile/,$(RObjs)) RObjectsG := $(addprefix $(BUILD_OBJ_DIR)/Debug/,$(RObjs)) @@ -641,39 +641,39 @@ .PRECIOUS: $(BUILD_OBJ_DIR)/Debug/.dir $(BUILD_OBJ_DIR)/Release/.dir # Create .lo files in the ObjectFiles directory from the .cpp and .c files... -$(BUILD_OBJ_DIR)/Release/%.lo: $(SourceDir)/%.cpp $(BUILD_OBJ_DIR)/Release/.dir +$(BUILD_OBJ_DIR)/Release/%.lo: %.cpp $(BUILD_OBJ_DIR)/Release/.dir @echo "Compiling $<" $(VERB) $(CompileO) $< -o $@ -$(BUILD_OBJ_DIR)/Release/%.lo: $(SourceDir)/%.c $(BUILD_OBJ_DIR)/Release/.dir +$(BUILD_OBJ_DIR)/Release/%.lo: %.c $(BUILD_OBJ_DIR)/Release/.dir @echo "Compiling $<" $(VERB) $(CompileCO) $< -o $@ -$(BUILD_OBJ_DIR)/Profile/%.lo: $(SourceDir)/%.cpp $(BUILD_OBJ_DIR)/Profile/.dir +$(BUILD_OBJ_DIR)/Profile/%.lo: %.cpp $(BUILD_OBJ_DIR)/Profile/.dir @echo "Compiling $<" $(VERB) $(CompileP) $< -o $@ -$(BUILD_OBJ_DIR)/Profile/%.lo: $(SourceDir)/%.c $(BUILD_OBJ_DIR)/Profile/.dir +$(BUILD_OBJ_DIR)/Profile/%.lo: %.c $(BUILD_OBJ_DIR)/Profile/.dir @echo "Compiling $<" $(VERB) $(CompileCP) $< -o $@ -$(BUILD_OBJ_DIR)/Debug/%.lo: $(SourceDir)/%.cpp $(BUILD_OBJ_DIR)/Debug/.dir +$(BUILD_OBJ_DIR)/Debug/%.lo: %.cpp $(BUILD_OBJ_DIR)/Debug/.dir @echo "Compiling $<" $(VERB) $(CompileG) $< -o $@ -$(BUILD_OBJ_DIR)/Debug/%.lo: $(SourceDir)/%.c $(BUILD_OBJ_DIR)/Debug/.dir +$(BUILD_OBJ_DIR)/Debug/%.lo: %.c $(BUILD_OBJ_DIR)/Debug/.dir @echo "Compiling $<" $(VERB) $(CompileCG) $< -o $@ -$(BUILD_OBJ_DIR)/Bytecode/%.bc: $(SourceDir)/%.cpp $(BUILD_OBJ_DIR)/Bytecode/.dir $(LCC1XX) +$(BUILD_OBJ_DIR)/Bytecode/%.bc: %.cpp $(BUILD_OBJ_DIR)/Bytecode/.dir $(LCC1XX) @echo "Compiling $< to bytecode" $(VERB) $(LLVMGXX) $(CompileWarnings) $(CPPFLAGS) -c $< -o $@ -$(BUILD_OBJ_DIR)/Bytecode/%.bc: $(SourceDir)/%.c $(BUILD_OBJ_DIR)/Bytecode/.dir $(LCC1) +$(BUILD_OBJ_DIR)/Bytecode/%.bc: %.c $(BUILD_OBJ_DIR)/Bytecode/.dir $(LCC1) @echo "Compiling $< to bytecode" $(VERB) $(LLVMGCC) $(CompileWarnings) $(CPPFLAGS) -c $< -o $@ -$(BUILD_OBJ_DIR)/Bytecode/%.bc: $(SourceDir)/%.ll $(BUILD_OBJ_DIR)/Bytecode/.dir $(LLVMAS) +$(BUILD_OBJ_DIR)/Bytecode/%.bc: %.ll $(BUILD_OBJ_DIR)/Bytecode/.dir $(LLVMAS) @echo "Compiling $< to bytecode" $(VERB) $(LLVMAS) $< -f -o $@ @@ -712,7 +712,7 @@ %.h: %.y # Cancel built-in rules for yacc %.cpp %.h : %.y @echo Bison\'ing $<... - $(VERB) $(BISON) -v -d -p $( /dev/null || ${MV} -f $*.tab.c $*.cpp $(VERB) cmp -s $*.tab.h $*.h > /dev/null || ${MV} -f $*.tab.h $*.h @# If the files were not updated, don't leave them lying around... @@ -758,15 +758,15 @@ # If dependencies were generated for the file that included this file, # include the dependencies now... # -SourceBaseNames := $(basename $(notdir $(filter-out $(SourceDir)/$(CONFIGURATION)/%, $(Source)))) +SourceBaseNames := $(basename $(Source)) SourceDepend := $(SourceBaseNames:%=$(BUILD_OBJ_DIR)/Depend/%.d) # Create dependencies for the *.cpp files... -$(BUILD_OBJ_DIR)/Depend/%.d: $(SourceDir)/%.cpp $(BUILD_OBJ_DIR)/Depend/.dir +$(BUILD_OBJ_DIR)/Depend/%.d: %.cpp $(BUILD_OBJ_DIR)/Depend/.dir $(VERB) $(Depend) $< | $(SED) 's|\.o|\.lo|' | $(SED) 's|$*\.lo *|$(BUILD_OBJ_DIR)/Release/& $(BUILD_OBJ_DIR)/Profile/& $(BUILD_OBJ_DIR)/Debug/& $(BUILD_OBJ_DIR)/Depend/$(@F)|g' > $@ # Create dependencies for the *.c files... -$(BUILD_OBJ_DIR)/Depend/%.d: $(SourceDir)/%.c $(BUILD_OBJ_DIR)/Depend/.dir +$(BUILD_OBJ_DIR)/Depend/%.d: %.c $(BUILD_OBJ_DIR)/Depend/.dir $(VERB) $(DependC) -o $@ $< | $(SED) 's|\.o|\.lo|' | $(SED) 's|$*\.lo *|$(BUILD_OBJ_DIR)/Release/& $(BUILD_OBJ_DIR)/Profile/& $(BUILD_OBJ_DIR)/Debug/& $(BUILD_OBJ_DIR)/Depend/$(@F)|g' > $@ # From criswell at cs.uiuc.edu Tue Sep 9 15:58:07 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Tue Sep 9 15:58:07 2003 Subject: [llvm-commits] CVS: llvm/lib/Target/Sparc/Makefile Message-ID: <200309092057.PAA30087@choi.cs.uiuc.edu> Changes in directory llvm/lib/Target/Sparc: Makefile updated: 1.30 -> 1.31 --- Log message: Updated to find source files using VPATH. This makes writing build rules much cleaner and easier. Labeled .td as a suffix for tblgen files in Makefile.rules. Modified build rules so that source files generated during the build are placed in the build directory and not the source directory (and not in a Debug directory). This makes the system cleaner and allows us to have a read-only source tree. --- Diffs of the changes: Index: llvm/lib/Target/Sparc/Makefile diff -u llvm/lib/Target/Sparc/Makefile:1.30 llvm/lib/Target/Sparc/Makefile:1.31 --- llvm/lib/Target/Sparc/Makefile:1.30 Sat Sep 6 09:50:07 2003 +++ llvm/lib/Target/Sparc/Makefile Tue Sep 9 15:56:59 2003 @@ -1,7 +1,7 @@ LEVEL = ../../.. LIBRARYNAME = sparc -ExtraSource = Debug/Sparc.burm.cpp +ExtraSource = Sparc.burm.cpp include $(LEVEL)/Makefile.common @@ -11,22 +11,23 @@ DEBUG_FLAG = -D_DEBUG endif -Debug/Sparc.burg.in1 : $(SourceDir)/Sparc.burg.in Debug/.dir +Sparc.burg.in1 : Sparc.burg.in $(CXX) -E -I$(LLVM_SRC_ROOT)/include $(DEBUG_FLAG) -x c++ $< | ${SED} '/^# /d' | ${SED} 's/Ydefine/#define/' > $@ -Debug/Sparc.burm : Debug/Sparc.burg.in1 +Sparc.burm : Sparc.burg.in1 $(CXX) -E -I$(LLVM_SRC_ROOT)/include $(DEBUG_FLAG) -x c++ $< | ${SED} '/^# /d' | ${SED} 's/Xinclude/#include/g' | ${SED} 's/Xdefine/#define/g' > $@ -Debug/Sparc.burm.cpp: Debug/Sparc.burm Debug/.dir +Sparc.burm.cpp: Sparc.burm + @echo "Burging $<" $(RunBurg) $< -o $@ -$(BUILD_OBJ_DIR)/Debug/Sparc.burm.lo: Debug/Sparc.burm.cpp +$(BUILD_OBJ_DIR)/Debug/Sparc.burm.lo: Sparc.burm.cpp $(CompileG) $< -o $@ -$(BUILD_OBJ_DIR)/Release/Sparc.burm.lo: Debug/Sparc.burm.cpp +$(BUILD_OBJ_DIR)/Release/Sparc.burm.lo: Sparc.burm.cpp $(CompileO) $< -o $@ -$(BUILD_OBJ_DIR)/Profile/Sparc.burm.lo: Debug/Sparc.burm.cpp +$(BUILD_OBJ_DIR)/Profile/Sparc.burm.lo: Sparc.burm.cpp $(CompileP) $< -o $@ $(BUILD_OBJ_DIR)/Depend/Sparc.burm.d: $(BUILD_OBJ_DIR)/Depend/.dir @@ -34,12 +35,14 @@ TARGET_NAME := SparcV9 -TABLEGEN_FILES := $(wildcard $(SourceDir)/*.td) +TABLEGEN_FILES := $(notdir $(wildcard $(SourceDir)/*.td)) $(SourceDir)/$(TARGET_NAME)CodeEmitter.cpp:: $(TARGET_NAME)CodeEmitter.inc $(TARGET_NAME)CodeEmitter.inc:: $(TABLEGEN_FILES) $(TBLGEN) + @echo "Tblgen'ing $(TARGET_NAME).td" $(TBLGEN) -I $(SourceDir) $(SourceDir)/$(TARGET_NAME).td -gen-emitter -o $@ clean:: - ${RM} -f $(TARGET_NAME)CodeEmitter.inc + ${RM} -f $(TARGET_NAME)CodeEmitter.inc Sparc.burg.in1 Sparc.burm Sparc.burm.cpp + From criswell at cs.uiuc.edu Tue Sep 9 15:58:12 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Tue Sep 9 15:58:12 2003 Subject: [llvm-commits] CVS: llvm/lib/Target/X86/Makefile Message-ID: <200309092057.PAA30096@choi.cs.uiuc.edu> Changes in directory llvm/lib/Target/X86: Makefile updated: 1.10 -> 1.11 --- Log message: Updated to find source files using VPATH. This makes writing build rules much cleaner and easier. Labeled .td as a suffix for tblgen files in Makefile.rules. Modified build rules so that source files generated during the build are placed in the build directory and not the source directory (and not in a Debug directory). This makes the system cleaner and allows us to have a read-only source tree. --- Diffs of the changes: Index: llvm/lib/Target/X86/Makefile diff -u llvm/lib/Target/X86/Makefile:1.10 llvm/lib/Target/X86/Makefile:1.11 --- llvm/lib/Target/X86/Makefile:1.10 Sat Sep 6 09:50:22 2003 +++ llvm/lib/Target/X86/Makefile Tue Sep 9 15:57:00 2003 @@ -8,21 +8,27 @@ X86GenInstrInfo.inc X86GenInstrSelector.inc X86GenRegisterNames.inc:: X86.td X86RegisterInfo.td ../Target.td $(TBLGEN) + @echo "Tblgen'ing $<" $(TBLGEN) -I $(BUILD_SRC_DIR) $< -gen-register-enums -o $@ X86GenRegisterInfo.h.inc:: X86.td X86RegisterInfo.td ../Target.td $(TBLGEN) + @echo "Tblgen'ing $<" $(TBLGEN) -I $(BUILD_SRC_DIR) $< -gen-register-desc-header -o $@ X86GenRegisterInfo.inc:: X86.td X86RegisterInfo.td ../Target.td $(TBLGEN) + @echo "Tblgen'ing $<" $(TBLGEN) -I $(BUILD_SRC_DIR) $< -gen-register-desc -o $@ X86GenInstrNames.inc:: X86.td X86InstrInfo.td ../Target.td $(TBLGEN) + @echo "Tblgen'ing $<" $(TBLGEN) -I $(BUILD_SRC_DIR) $< -gen-instr-enums -o $@ X86GenInstrInfo.inc:: X86.td X86InstrInfo.td ../Target.td $(TBLGEN) + @echo "Tblgen'ing $<" $(TBLGEN) -I $(BUILD_SRC_DIR) $< -gen-instr-desc -o $@ X86GenInstrSelector.inc:: X86.td X86InstrInfo.td ../Target.td $(TBLGEN) + @echo "Tblgen'ing $<" $(TBLGEN) -I $(BUILD_SRC_DIR) $< -gen-instr-selector -o $@ clean:: From criswell at cs.uiuc.edu Tue Sep 9 15:58:16 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Tue Sep 9 15:58:16 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/SingleSource/CustomChecked/Makefile Message-ID: <200309092057.PAA30103@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/SingleSource/CustomChecked: Makefile updated: 1.5 -> 1.6 --- Log message: Updated to find source files using VPATH. This makes writing build rules much cleaner and easier. Labeled .td as a suffix for tblgen files in Makefile.rules. Modified build rules so that source files generated during the build are placed in the build directory and not the source directory (and not in a Debug directory). This makes the system cleaner and allows us to have a read-only source tree. --- Diffs of the changes: Index: llvm/test/Programs/SingleSource/CustomChecked/Makefile diff -u llvm/test/Programs/SingleSource/CustomChecked/Makefile:1.5 llvm/test/Programs/SingleSource/CustomChecked/Makefile:1.6 --- llvm/test/Programs/SingleSource/CustomChecked/Makefile:1.5 Sat Sep 6 10:13:45 2003 +++ llvm/test/Programs/SingleSource/CustomChecked/Makefile Tue Sep 9 15:57:02 2003 @@ -34,19 +34,19 @@ $(PROGRAMS_TO_TEST:%=Output/%.run-lli): \ Output/%.run-lli: Output/%.llvm.bc $(LLI) - -$(TESTRUNR) $(filter $(SourceDir)$*.%, $(Source)) "$(LLI) $(LLI_OPTS) $<" $@ + -$(TESTRUNR) $(filter $*.%, $(Source)) "$(LLI) $(LLI_OPTS) $<" $@ $(PROGRAMS_TO_TEST:%=Output/%.run-jit): \ Output/%.run-jit: Output/%.llvm.bc $(LLI) - -$(TESTRUNR) $(filter $(SourceDir)$*.%, $(Source)) "$(LLI) $(JIT_OPTS) $<" $@ + -$(TESTRUNR) $(filter $*.%, $(Source)) "$(LLI) $(JIT_OPTS) $<" $@ $(PROGRAMS_TO_TEST:%=Output/%.run-llc): \ Output/%.run-llc: Output/%.llc - -$(TESTRUNR) $(filter $(SourceDir)$*.%, $(Source)) "$< $(RUN_OPTIONS)" $@ + -$(TESTRUNR) $(filter $*.%, $(Source)) "$< $(RUN_OPTIONS)" $@ $(PROGRAMS_TO_TEST:%=Output/%.run-cbe): \ Output/%.run-cbe: Output/%.cbe - -$(TESTRUNR) $(filter $(SourceDir)$*.%, $(Source)) "$< $(RUN_OPTIONS)" $@ + -$(TESTRUNR) $(filter $*.%, $(Source)) "$< $(RUN_OPTIONS)" $@ $(PROGRAMS_TO_TEST:%=Output/%.exe-lli): \ From criswell at cs.uiuc.edu Tue Sep 9 15:58:20 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Tue Sep 9 15:58:20 2003 Subject: [llvm-commits] CVS: llvm/utils/Burg/Makefile Message-ID: <200309092057.PAA30110@choi.cs.uiuc.edu> Changes in directory llvm/utils/Burg: Makefile updated: 1.18 -> 1.19 --- Log message: Updated to find source files using VPATH. This makes writing build rules much cleaner and easier. Labeled .td as a suffix for tblgen files in Makefile.rules. Modified build rules so that source files generated during the build are placed in the build directory and not the source directory (and not in a Debug directory). This makes the system cleaner and allows us to have a read-only source tree. --- Diffs of the changes: Index: llvm/utils/Burg/Makefile diff -u llvm/utils/Burg/Makefile:1.18 llvm/utils/Burg/Makefile:1.19 --- llvm/utils/Burg/Makefile:1.18 Sat Sep 6 10:20:15 2003 +++ llvm/utils/Burg/Makefile Tue Sep 9 15:57:03 2003 @@ -1,20 +1,18 @@ LEVEL = ../.. TOOLNAME = burg -ExtraSource = $(SourceDir)/gram.tab.c +ExtraSource = gram.tab.c include $(LEVEL)/Makefile.common -VPATH=$(SourceDir) +gram.tab.c gram.tab.h:: gram.yc + $(VERB) $(BISON) -o gram.tab.c -d $< -$(SourceDir)/gram.tab.c $(SourceDir)/gram.tab.h:: gram.yc - $(VERB) $(BISON) -o $(SourceDir)/gram.tab.c -d $< - -$(SourceDir)/lex.c: $(SourceDir)/gram.tab.h +$(SourceDir)/lex.c: gram.tab.h clean:: rm -ff gram.tab.h gram.tab.c core* *.aux *.log *.dvi sample sample.c tmp -$(BUILD_OBJ_DIR)/Release/lex.o $(BUILD_OBJ_DIR)/Profile/lex.o $(BUILD_OBJ_DIR)/Debug/lex.o: gram.tab.h +#$(BUILD_OBJ_DIR)/Release/lex.o $(BUILD_OBJ_DIR)/Profile/lex.o $(BUILD_OBJ_DIR)/Debug/lex.o: gram.tab.h doc.dvi: doc.tex latex doc; latex doc From brukman at cs.uiuc.edu Tue Sep 9 16:55:02 2003 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Tue Sep 9 16:55:02 2003 Subject: [llvm-commits] CVS: llvm/lib/Transforms/Scalar/LoopPreheaders.cpp PRE.cpp Message-ID: <200309092154.QAA01658@zion.cs.uiuc.edu> Changes in directory llvm/lib/Transforms/Scalar: LoopPreheaders.cpp updated: 1.14 -> 1.15 PRE.cpp updated: 1.3 -> 1.4 --- Log message: Spell `occurrence' correctly. --- Diffs of the changes: Index: llvm/lib/Transforms/Scalar/LoopPreheaders.cpp diff -u llvm/lib/Transforms/Scalar/LoopPreheaders.cpp:1.14 llvm/lib/Transforms/Scalar/LoopPreheaders.cpp:1.15 --- llvm/lib/Transforms/Scalar/LoopPreheaders.cpp:1.14 Mon Aug 18 17:54:06 2003 +++ llvm/lib/Transforms/Scalar/LoopPreheaders.cpp Tue Sep 9 16:54:45 2003 @@ -276,7 +276,7 @@ DF->addBasicBlock(NewBB, NewDFSet); // Now we must loop over all of the dominance frontiers in the function, - // replacing occurances of Header with NewBB in some cases. If a block + // replacing occurrences of Header with NewBB in some cases. If a block // dominates a (now) predecessor of NewBB, but did not strictly dominate // Header, it will have Header in it's DF set, but should now have NewBB in // its set. @@ -385,7 +385,7 @@ DF->addBasicBlock(NewBB, NewDFSet); // Now we must loop over all of the dominance frontiers in the function, - // replacing occurances of Exit with NewBB in some cases. If a block + // replacing occurrences of Exit with NewBB in some cases. If a block // dominates a (now) predecessor of NewBB, but did not strictly dominate // Exit, it will have Exit in it's DF set, but should now have NewBB in its // set. Index: llvm/lib/Transforms/Scalar/PRE.cpp diff -u llvm/lib/Transforms/Scalar/PRE.cpp:1.3 llvm/lib/Transforms/Scalar/PRE.cpp:1.4 --- llvm/lib/Transforms/Scalar/PRE.cpp:1.3 Fri Aug 1 17:15:03 2003 +++ llvm/lib/Transforms/Scalar/PRE.cpp Tue Sep 9 16:54:45 2003 @@ -1,6 +1,6 @@ //===- PRE.cpp - Partial Redundancy Elimination ---------------------------===// // -// This file implements the well known Partial Redundancy Elimination +// This file implements the well-known Partial Redundancy Elimination // optimization, using an SSA formulation based on e-paths. See this paper for // more information: // @@ -76,18 +76,18 @@ // Anticipatibility calculation... void MarkPostDominatingBlocksAnticipatible(PostDominatorTree::Node *N, std::vector &AntBlocks, - Instruction *Occurance); - void CalculateAnticipatiblityForOccurance(unsigned BlockNo, + Instruction *Occurrence); + void CalculateAnticipatiblityForOccurrence(unsigned BlockNo, std::vector &AntBlocks, - Instruction *Occurance); + Instruction *Occurrence); void CalculateAnticipatibleBlocks(const std::map &D, std::vector &AnticipatibleBlocks); // PRE for an expression - void MarkOccuranceAvailableInAllDominatedBlocks(Instruction *Occurance, - BasicBlock *StartBlock); - void ReplaceDominatedAvailableOccurancesWith(Instruction *NewOcc, - DominatorTree::Node *N); + void MarkOccurrenceAvailableInAllDominatedBlocks(Instruction *Occurrence, + BasicBlock *StartBlock); + void ReplaceDominatedAvailableOccurrencesWith(Instruction *NewOcc, + DominatorTree::Node *N); bool ProcessExpression(Instruction *I); }; @@ -164,7 +164,7 @@ void PRE::MarkPostDominatingBlocksAnticipatible(PostDominatorTree::Node *N, std::vector &AntBlocks, - Instruction *Occurance) { + Instruction *Occurrence) { unsigned BlockNo = BlockNumbering[N->getNode()]; if (AntBlocks[BlockNo]) return; // Already known to be anticipatible?? @@ -172,12 +172,12 @@ // Check to see if any of the operands are defined in this block, if so, the // entry of this block does not anticipate the expression. This computes // "transparency". - for (unsigned i = 0, e = Occurance->getNumOperands(); i != e; ++i) - if (Instruction *I = dyn_cast(Occurance->getOperand(i))) + for (unsigned i = 0, e = Occurrence->getNumOperands(); i != e; ++i) + if (Instruction *I = dyn_cast(Occurrence->getOperand(i))) if (I->getParent() == N->getNode()) // Operand is defined in this block! return; - if (isa(Occurance)) + if (isa(Occurrence)) return; // FIXME: compute transparency for load instructions using AA // Insert block into AntBlocks list... @@ -185,19 +185,19 @@ for (PostDominatorTree::Node::iterator I = N->begin(), E = N->end(); I != E; ++I) - MarkPostDominatingBlocksAnticipatible(*I, AntBlocks, Occurance); + MarkPostDominatingBlocksAnticipatible(*I, AntBlocks, Occurrence); } -void PRE::CalculateAnticipatiblityForOccurance(unsigned BlockNo, - std::vector &AntBlocks, - Instruction *Occurance) { +void PRE::CalculateAnticipatiblityForOccurrence(unsigned BlockNo, + std::vector &AntBlocks, + Instruction *Occurrence) { if (AntBlocks[BlockNo]) return; // Block already anticipatible! BasicBlock *BB = BlockMapping[BlockNo]; - // For each occurance, mark all post-dominated blocks as anticipatible... + // For each occurrence, mark all post-dominated blocks as anticipatible... MarkPostDominatingBlocksAnticipatible(PDT->getNode(BB), AntBlocks, - Occurance); + Occurrence); // Next, mark any blocks in the post-dominance frontier as anticipatible iff // all successors are anticipatible. @@ -216,8 +216,8 @@ } if (AllSuccessorsAnticipatible) - CalculateAnticipatiblityForOccurance(BlockNumbering[PDFBlock], - AntBlocks, Occurance); + CalculateAnticipatiblityForOccurrence(BlockNumbering[PDFBlock], + AntBlocks, Occurrence); } } @@ -231,28 +231,28 @@ // Loop over all of the expressions... for (std::map::const_iterator I = Defs.begin(), E = Defs.end(); I != E; ++I) - CalculateAnticipatiblityForOccurance(I->first, AntBlocks, I->second); + CalculateAnticipatiblityForOccurrence(I->first, AntBlocks, I->second); } -/// MarkOccuranceAvailableInAllDominatedBlocks - Add entries to AvailableBlocks -/// for all nodes dominated by the occurance to indicate that it is now the -/// available occurance to use in any of these blocks. +/// MarkOccurrenceAvailableInAllDominatedBlocks - Add entries to AvailableBlocks +/// for all nodes dominated by the occurrence to indicate that it is now the +/// available occurrence to use in any of these blocks. /// -void PRE::MarkOccuranceAvailableInAllDominatedBlocks(Instruction *Occurance, - BasicBlock *BB) { +void PRE::MarkOccurrenceAvailableInAllDominatedBlocks(Instruction *Occurrence, + BasicBlock *BB) { // FIXME: There are much more efficient ways to get the blocks dominated // by a block. Use them. // - DominatorTree::Node *N = DT->getNode(Occurance->getParent()); + DominatorTree::Node *N = DT->getNode(Occurrence->getParent()); for (df_iterator DI = df_begin(N), E = df_end(N); DI != E; ++DI) - AvailableBlocks[(*DI)->getNode()] = Occurance; + AvailableBlocks[(*DI)->getNode()] = Occurrence; } -/// ReplaceDominatedAvailableOccurancesWith - This loops over the region +/// ReplaceDominatedAvailableOccurrencesWith - This loops over the region /// dominated by N, replacing any available expressions with NewOcc. -void PRE::ReplaceDominatedAvailableOccurancesWith(Instruction *NewOcc, - DominatorTree::Node *N) { +void PRE::ReplaceDominatedAvailableOccurrencesWith(Instruction *NewOcc, + DominatorTree::Node *N) { BasicBlock *BB = N->getNode(); Instruction *&ExistingAvailableVal = AvailableBlocks[BB]; @@ -262,7 +262,7 @@ ExistingAvailableVal = NewOcc; for (DominatorTree::Node::iterator I = N->begin(), E = N->end(); I != E;++I) - ReplaceDominatedAvailableOccurancesWith(NewOcc, *I); + ReplaceDominatedAvailableOccurrencesWith(NewOcc, *I); } else { // If there is already an active definition in this block, replace it with // NewOcc, and force it into all dominated blocks. @@ -313,9 +313,9 @@ // consider expressions of the following form equivalent to this set of // expressions: // - // If an operand is a PHI node, add any occurances of the expression with the + // If an operand is a PHI node, add any occurrences of the expression with the // PHI operand replaced with the PHI node operands. This is only valid if the - // PHI operand occurances exist in blocks post-dominated by the incoming edge + // PHI operand occurrences exist in blocks post-dominated by the incoming edge // of the PHI node. #endif @@ -407,40 +407,39 @@ // definition of the expression. hash_set AvailabilityFrontier; - Instruction *NonPHIOccurance = 0; + Instruction *NonPHIOccurrence = 0; while (!Definitions.empty() || !AvailabilityFrontier.empty()) { if (!Definitions.empty() && (AvailabilityFrontier.empty() || Definitions.begin()->first < *AvailabilityFrontier.begin())) { - Instruction *Occurance = Definitions.begin()->second; - BasicBlock *BB = Occurance->getParent(); + Instruction *Occurrence = Definitions.begin()->second; + BasicBlock *BB = Occurrence->getParent(); Definitions.erase(Definitions.begin()); - DEBUG(std::cerr << "PROCESSING Occurance: " << Occurance); + DEBUG(std::cerr << "PROCESSING Occurrence: " << Occurrence); // Check to see if there is already an incoming value for this block... AvailableBlocksTy::iterator LBI = AvailableBlocks.find(BB); if (LBI != AvailableBlocks.end()) { // Yes, there is a dominating definition for this block. Replace this - // occurance with the incoming value. - if (LBI->second != Occurance) { + // occurrence with the incoming value. + if (LBI->second != Occurrence) { DEBUG(std::cerr << " replacing with: " << LBI->second); - Occurance->replaceAllUsesWith(LBI->second); - BB->getInstList().erase(Occurance); // Delete instruction + Occurrence->replaceAllUsesWith(LBI->second); + BB->getInstList().erase(Occurrence); // Delete instruction ++NumRedundant; } - } else { - ProcessedExpressions.insert(Occurance); - if (!isa(Occurance)) - NonPHIOccurance = Occurance; // Keep an occurance of this expr + ProcessedExpressions.insert(Occurrence); + if (!isa(Occurrence)) + NonPHIOccurrence = Occurrence; // Keep an occurrence of this expr // Okay, there is no incoming value for this block, so this expression // is a new definition that is good for this block and all blocks // dominated by it. Add this information to the AvailableBlocks map. // - MarkOccuranceAvailableInAllDominatedBlocks(Occurance, BB); + MarkOccurrenceAvailableInAllDominatedBlocks(Occurrence, BB); // Update the dominance frontier for the definitions so far... if a node // in the dominator frontier now has all of its predecessors available, @@ -494,7 +493,7 @@ Instruction *&BlockOcc = Definitions[DFBlockID]; if (BlockOcc) { - DEBUG(std::cerr <<" PHI superceeds occurance: "<replaceAllUsesWith(PN); BlockOcc->getParent()->getInstList().erase(BlockOcc); ++NumRedundant; @@ -523,15 +522,15 @@ AFBlock->begin()); DEBUG(std::cerr << "INSERTING PHI for PR: " << PN); - // If there is a pending occurance in this block, make sure to replace it + // If there is a pending occurrence in this block, make sure to replace it // with the PHI node... std::map::iterator EDFI = Definitions.find(AFBlockID); if (EDFI != Definitions.end()) { - // There is already an occurance in this block. Replace it with PN and + // There is already an occurrence in this block. Replace it with PN and // remove it. Instruction *OldOcc = EDFI->second; - DEBUG(std::cerr << " Replaces occurance: " << OldOcc); + DEBUG(std::cerr << " Replaces occurrence: " << OldOcc); OldOcc->replaceAllUsesWith(PN); AFBlock->getInstList().erase(OldOcc); Definitions.erase(EDFI); @@ -555,12 +554,12 @@ } else { // No, we must insert a new computation into this block and add it // to the definitions list... - assert(NonPHIOccurance && "No non-phi occurances seen so far???"); - Instruction *New = NonPHIOccurance->clone(); - New->setName(NonPHIOccurance->getName() + ".PRE-inserted"); + assert(NonPHIOccurrence && "No non-phi occurrences seen so far???"); + Instruction *New = NonPHIOccurrence->clone(); + New->setName(NonPHIOccurrence->getName() + ".PRE-inserted"); ProcessedExpressions.insert(New); - DEBUG(std::cerr << " INSERTING OCCURANCE: " << New); + DEBUG(std::cerr << " INSERTING OCCURRRENCE: " << New); // Insert it into the bottom of the predecessor, right before the // terminator instruction... @@ -572,11 +571,11 @@ // header. In all other cases, because we don't have critical // edges, the node is guaranteed to only dominate itself. // - ReplaceDominatedAvailableOccurancesWith(New, DT->getNode(Pred)); + ReplaceDominatedAvailableOccurrencesWith(New, DT->getNode(Pred)); // Add it as an incoming value on this edge to the PHI node PN->addIncoming(New, Pred); - NonPHIOccurance = New; + NonPHIOccurrence = New; NumInserted++; } } @@ -599,7 +598,7 @@ // Loop over all of the blocks dominated by this PHI node, and change // the AvailableBlocks entries to be the PHI node instead of the old // instruction. - MarkOccuranceAvailableInAllDominatedBlocks(PN, AFBlock); + MarkOccurrenceAvailableInAllDominatedBlocks(PN, AFBlock); AFBlock->getInstList().erase(OldVal); // Delete old instruction! @@ -607,7 +606,7 @@ Definitions.insert(std::make_pair(AFBlockID, PN)); } else { // If the value is not defined in this block, that means that an - // inserted occurance in a predecessor is now the live value for the + // inserted occurrence in a predecessor is now the live value for the // region (occurs when hoisting loop invariants, f.e.). In this case, // the PHI node should actually just be removed. assert(PN->use_empty() && "No uses should exist for dead PHI node!"); From lattner at cs.uiuc.edu Tue Sep 9 23:50:02 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Tue Sep 9 23:50:02 2003 Subject: [llvm-commits] CVS: llvm/lib/Analysis/InductionVariable.cpp Message-ID: <200309100449.XAA08793@apoc.cs.uiuc.edu> Changes in directory llvm/lib/Analysis: InductionVariable.cpp updated: 1.24 -> 1.25 --- Log message: Simplify some code --- Diffs of the changes: Index: llvm/lib/Analysis/InductionVariable.cpp diff -u llvm/lib/Analysis/InductionVariable.cpp:1.24 llvm/lib/Analysis/InductionVariable.cpp:1.25 --- llvm/lib/Analysis/InductionVariable.cpp:1.24 Fri Aug 1 17:14:27 2003 +++ llvm/lib/Analysis/InductionVariable.cpp Tue Sep 9 23:49:10 2003 @@ -30,13 +30,10 @@ #include "Support/Debug.h" static bool isLoopInvariant(const Value *V, const Loop *L) { - if (isa(V) || isa(V) || isa(V)) - return true; - - const Instruction *I = cast(V); - const BasicBlock *BB = I->getParent(); - - return !L->contains(BB); + if (const Instruction *I = dyn_cast(V)) + return !L->contains(I->getParent()); + // non-instructions all dominate instructions/blocks + return true; } enum InductionVariable::iType @@ -45,7 +42,7 @@ // Check for cannonical and simple linear expressions now... if (const ConstantInt *CStart = dyn_cast(Start)) if (const ConstantInt *CStep = dyn_cast(Step)) { - if (CStart->equalsInt(0) && CStep->equalsInt(1)) + if (CStart->isNullValue() && CStep->equalsInt(1)) return Cannonical; else return SimpleLinear; From lattner at cs.uiuc.edu Wed Sep 10 00:09:06 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Wed Sep 10 00:09:06 2003 Subject: [llvm-commits] CVS: llvm/lib/Analysis/InductionVariable.cpp Message-ID: <200309100508.AAA08856@apoc.cs.uiuc.edu> Changes in directory llvm/lib/Analysis: InductionVariable.cpp updated: 1.25 -> 1.26 --- Log message: clean up file header comment --- Diffs of the changes: Index: llvm/lib/Analysis/InductionVariable.cpp diff -u llvm/lib/Analysis/InductionVariable.cpp:1.25 llvm/lib/Analysis/InductionVariable.cpp:1.26 --- llvm/lib/Analysis/InductionVariable.cpp:1.25 Tue Sep 9 23:49:10 2003 +++ llvm/lib/Analysis/InductionVariable.cpp Wed Sep 10 00:08:19 2003 @@ -1,9 +1,9 @@ -//===- llvm/Analysis/InductionVariable.h - Induction variable ----*- C++ -*--=// +//===- InductionVariable.cpp - Induction variable classification ----------===// // -// This interface is used to identify and classify induction variables that -// exist in the program. Induction variables must contain a PHI node that -// exists in a loop header. Because of this, they are identified an managed by -// this PHI node. +// This file implements identification and classification of induction +// variables. Induction variables must contain a PHI node that exists in a +// loop header. Because of this, they are identified an managed by this PHI +// node. // // Induction variables are classified into a type. Knowing that an induction // variable is of a specific type can constrain the values of the start and From lattner at cs.uiuc.edu Wed Sep 10 00:11:03 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Wed Sep 10 00:11:03 2003 Subject: [llvm-commits] CVS: llvm/lib/Transforms/Scalar/IndVarSimplify.cpp Message-ID: <200309100510.AAA08883@apoc.cs.uiuc.edu> Changes in directory llvm/lib/Transforms/Scalar: IndVarSimplify.cpp updated: 1.34 -> 1.35 --- Log message: Fix up file header --- Diffs of the changes: Index: llvm/lib/Transforms/Scalar/IndVarSimplify.cpp diff -u llvm/lib/Transforms/Scalar/IndVarSimplify.cpp:1.34 llvm/lib/Transforms/Scalar/IndVarSimplify.cpp:1.35 --- llvm/lib/Transforms/Scalar/IndVarSimplify.cpp:1.34 Fri Aug 1 17:15:03 2003 +++ llvm/lib/Transforms/Scalar/IndVarSimplify.cpp Wed Sep 10 00:10:34 2003 @@ -1,7 +1,9 @@ //===- IndVarSimplify.cpp - Induction Variable Elimination ----------------===// // -// InductionVariableSimplify - Transform induction variables in a program -// to all use a single cannonical induction variable per loop. +// Guarantees that all loops with identifiable, linear, induction variables will +// be transformed to have a single, cannonical, induction variable. After this +// pass runs, it guarantees the the first PHI node of the header block in the +// loop is the cannonical induction variable if there is one. // //===----------------------------------------------------------------------===// From lattner at cs.uiuc.edu Wed Sep 10 00:25:03 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Wed Sep 10 00:25:03 2003 Subject: [llvm-commits] CVS: llvm/lib/Analysis/InductionVariable.cpp Message-ID: <200309100524.AAA08936@apoc.cs.uiuc.edu> Changes in directory llvm/lib/Analysis: InductionVariable.cpp updated: 1.26 -> 1.27 --- Log message: Spelling fixes --- Diffs of the changes: Index: llvm/lib/Analysis/InductionVariable.cpp diff -u llvm/lib/Analysis/InductionVariable.cpp:1.26 llvm/lib/Analysis/InductionVariable.cpp:1.27 --- llvm/lib/Analysis/InductionVariable.cpp:1.26 Wed Sep 10 00:08:19 2003 +++ llvm/lib/Analysis/InductionVariable.cpp Wed Sep 10 00:23:58 2003 @@ -39,11 +39,11 @@ enum InductionVariable::iType InductionVariable::Classify(const Value *Start, const Value *Step, const Loop *L) { - // Check for cannonical and simple linear expressions now... + // Check for canonical and simple linear expressions now... if (const ConstantInt *CStart = dyn_cast(Start)) if (const ConstantInt *CStep = dyn_cast(Step)) { if (CStart->isNullValue() && CStep->equalsInt(1)) - return Cannonical; + return Canonical; else return SimpleLinear; } @@ -212,7 +212,7 @@ } SetCondInst *SCI = dyn_cast(B->getCondition()); - if (SCI && InductionType == Cannonical) { + if (SCI && InductionType == Canonical) { DEBUG(std::cerr << "sci:" << *SCI); Value *condVal0 = SCI->getOperand(0); Value *condVal1 = SCI->getOperand(1); @@ -269,7 +269,7 @@ } return End; } else { - DEBUG(std::cerr << "SCI null or non-cannonical ind var\n"); + DEBUG(std::cerr << "SCI null or non-canonical ind var\n"); } return NULL; } @@ -277,7 +277,7 @@ void InductionVariable::print(std::ostream &o) const { switch (InductionType) { - case InductionVariable::Cannonical: o << "Cannonical "; break; + case InductionVariable::Canonical: o << "Canonical "; break; case InductionVariable::SimpleLinear: o << "SimpleLinear "; break; case InductionVariable::Linear: o << "Linear "; break; case InductionVariable::Unknown: o << "Unrecognized "; break; From lattner at cs.uiuc.edu Wed Sep 10 00:25:09 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Wed Sep 10 00:25:09 2003 Subject: [llvm-commits] CVS: llvm/include/llvm/Analysis/InductionVariable.h Message-ID: <200309100524.AAA08948@apoc.cs.uiuc.edu> Changes in directory llvm/include/llvm/Analysis: InductionVariable.h updated: 1.5 -> 1.6 --- Log message: Spelling fixes --- Diffs of the changes: Index: llvm/include/llvm/Analysis/InductionVariable.h diff -u llvm/include/llvm/Analysis/InductionVariable.h:1.5 llvm/include/llvm/Analysis/InductionVariable.h:1.6 --- llvm/include/llvm/Analysis/InductionVariable.h:1.5 Fri Oct 11 00:34:32 2002 +++ llvm/include/llvm/Analysis/InductionVariable.h Wed Sep 10 00:24:09 2003 @@ -1,4 +1,4 @@ -//===- llvm/Analysis/InductionVariable.h - Induction variable ----*- C++ -*--=// +//===- llvm/Analysis/InductionVariable.h - Induction variables --*- C++ -*-===// // // This interface is used to identify and classify induction variables that // exist in the program. Induction variables must contain a PHI node that @@ -28,7 +28,7 @@ class InductionVariable { public: enum iType { // Identify the type of this induction variable - Cannonical, // Starts at 0, counts by 1 + Canonical, // Starts at 0, counts by 1 SimpleLinear, // Simple linear: Constant start, constant step Linear, // General linear: loop invariant start, and step Unknown, // Unknown type. Start & Step are null From lattner at cs.uiuc.edu Wed Sep 10 00:25:14 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Wed Sep 10 00:25:14 2003 Subject: [llvm-commits] CVS: llvm/lib/Transforms/Scalar/IndVarSimplify.cpp Message-ID: <200309100524.AAA08957@apoc.cs.uiuc.edu> Changes in directory llvm/lib/Transforms/Scalar: IndVarSimplify.cpp updated: 1.35 -> 1.36 --- Log message: Spelling fixes. I think that "cannonical" is ok, but "canonical" appears to be the canonical form for the word --- Diffs of the changes: Index: llvm/lib/Transforms/Scalar/IndVarSimplify.cpp diff -u llvm/lib/Transforms/Scalar/IndVarSimplify.cpp:1.35 llvm/lib/Transforms/Scalar/IndVarSimplify.cpp:1.36 --- llvm/lib/Transforms/Scalar/IndVarSimplify.cpp:1.35 Wed Sep 10 00:10:34 2003 +++ llvm/lib/Transforms/Scalar/IndVarSimplify.cpp Wed Sep 10 00:24:46 2003 @@ -1,9 +1,9 @@ //===- IndVarSimplify.cpp - Induction Variable Elimination ----------------===// // // Guarantees that all loops with identifiable, linear, induction variables will -// be transformed to have a single, cannonical, induction variable. After this +// be transformed to have a single, canonical, induction variable. After this // pass runs, it guarantees the the first PHI node of the header block in the -// loop is the cannonical induction variable if there is one. +// loop is the canonical induction variable if there is one. // //===----------------------------------------------------------------------===// @@ -21,7 +21,7 @@ namespace { Statistic<> NumRemoved ("indvars", "Number of aux indvars removed"); - Statistic<> NumInserted("indvars", "Number of cannonical indvars added"); + Statistic<> NumInserted("indvars", "Number of canonical indvars added"); } // InsertCast - Cast Val to Ty, setting a useful name on the cast if Val has a @@ -40,7 +40,7 @@ // Get the header node for this loop. All of the phi nodes that could be // induction variables must live in this basic block. // - BasicBlock *Header = Loop->getBlocks().front(); + BasicBlock *Header = Loop->getHeader(); // Loop over all of the PHI nodes in the basic block, calculating the // induction variables that they represent... stuffing the induction variable @@ -55,26 +55,26 @@ // If there are no phi nodes in this basic block, there can't be indvars... if (IndVars.empty()) return Changed; - // Loop over the induction variables, looking for a cannonical induction + // Loop over the induction variables, looking for a canonical induction // variable, and checking to make sure they are not all unknown induction // variables. // bool FoundIndVars = false; - InductionVariable *Cannonical = 0; + InductionVariable *Canonical = 0; for (unsigned i = 0; i < IndVars.size(); ++i) { - if (IndVars[i].InductionType == InductionVariable::Cannonical && + if (IndVars[i].InductionType == InductionVariable::Canonical && !isa(IndVars[i].Phi->getType())) - Cannonical = &IndVars[i]; + Canonical = &IndVars[i]; if (IndVars[i].InductionType != InductionVariable::Unknown) FoundIndVars = true; } - // No induction variables, bail early... don't add a cannonnical indvar + // No induction variables, bail early... don't add a canonical indvar if (!FoundIndVars) return Changed; - // Okay, we want to convert other induction variables to use a cannonical + // Okay, we want to convert other induction variables to use a canonical // indvar. If we don't have one, add one now... - if (!Cannonical) { + if (!Canonical) { // Create the PHI node for the new induction variable, and insert the phi // node at the end of the other phi nodes... PHINode *PN = new PHINode(Type::UIntTy, "cann-indvar", AfterPHIIt); @@ -103,9 +103,9 @@ // Analyze the new induction variable... IndVars.push_back(InductionVariable(PN, Loops)); - assert(IndVars.back().InductionType == InductionVariable::Cannonical && - "Just inserted cannonical indvar that is not cannonical!"); - Cannonical = &IndVars.back(); + assert(IndVars.back().InductionType == InductionVariable::Canonical && + "Just inserted canonical indvar that is not canonical!"); + Canonical = &IndVars.back(); ++NumInserted; Changed = true; } @@ -113,12 +113,12 @@ DEBUG(std::cerr << "Induction variables:\n"); // Get the current loop iteration count, which is always the value of the - // cannonical phi node... + // canonical phi node... // - PHINode *IterCount = Cannonical->Phi; + PHINode *IterCount = Canonical->Phi; - // Loop through and replace all of the auxillary induction variables with - // references to the primary induction variable... + // Loop through and replace all of the auxiliary induction variables with + // references to the canonical induction variable... // for (unsigned i = 0; i < IndVars.size(); ++i) { InductionVariable *IV = &IndVars[i]; @@ -129,8 +129,8 @@ const Type *IVTy = IV->Phi->getType(); if (isa(IVTy)) IVTy = Type::ULongTy; - // Don't modify the cannonical indvar or unrecognized indvars... - if (IV != Cannonical && IV->InductionType != InductionVariable::Unknown) { + // Don't modify the canonical indvar or unrecognized indvars... + if (IV != Canonical && IV->InductionType != InductionVariable::Unknown) { Instruction *Val = IterCount; if (!isa(IV->Step) || // If the step != 1 !cast(IV->Step)->equalsInt(1)) { @@ -197,7 +197,7 @@ } }; RegisterOpt X("indvars", - "Cannonicalize Induction Variables"); + "Canonicalize Induction Variables"); } Pass *createIndVarSimplifyPass() { From lattner at cs.uiuc.edu Wed Sep 10 00:29:06 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Wed Sep 10 00:29:06 2003 Subject: [llvm-commits] CVS: llvm/include/llvm/Transforms/Scalar.h Message-ID: <200309100528.AAA09182@apoc.cs.uiuc.edu> Changes in directory llvm/include/llvm/Transforms: Scalar.h updated: 1.22 -> 1.23 --- Log message: Fix spell-o's --- Diffs of the changes: Index: llvm/include/llvm/Transforms/Scalar.h diff -u llvm/include/llvm/Transforms/Scalar.h:1.22 llvm/include/llvm/Transforms/Scalar.h:1.23 --- llvm/include/llvm/Transforms/Scalar.h:1.22 Mon Sep 1 15:44:42 2003 +++ llvm/include/llvm/Transforms/Scalar.h Wed Sep 10 00:27:53 2003 @@ -100,7 +100,7 @@ //===----------------------------------------------------------------------===// // // InductionVariableSimplify - Transform induction variables in a program to all -// use a single cannonical induction variable per loop. +// use a single canonical induction variable per loop. // Pass *createIndVarSimplifyPass(); From lattner at cs.uiuc.edu Wed Sep 10 00:30:01 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Wed Sep 10 00:30:01 2003 Subject: [llvm-commits] CVS: llvm/lib/Transforms/IPO/ConstantMerge.cpp Message-ID: <200309100529.AAA09207@apoc.cs.uiuc.edu> Changes in directory llvm/lib/Transforms/IPO: ConstantMerge.cpp updated: 1.19 -> 1.20 --- Log message: Fix spell-o's --- Diffs of the changes: Index: llvm/lib/Transforms/IPO/ConstantMerge.cpp diff -u llvm/lib/Transforms/IPO/ConstantMerge.cpp:1.19 llvm/lib/Transforms/IPO/ConstantMerge.cpp:1.20 --- llvm/lib/Transforms/IPO/ConstantMerge.cpp:1.19 Thu Apr 17 23:34:29 2003 +++ llvm/lib/Transforms/IPO/ConstantMerge.cpp Wed Sep 10 00:29:00 2003 @@ -46,7 +46,7 @@ if (I == CMap.end()) { // Nope, add it to the map CMap.insert(I, std::make_pair(Init, GV)); } else { // Yup, this is a duplicate! - // Make all uses of the duplicate constant use the cannonical version... + // Make all uses of the duplicate constant use the canonical version... GV->replaceAllUsesWith(I->second); // Delete the global value from the module... and back up iterator to From lattner at cs.uiuc.edu Wed Sep 10 00:30:07 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Wed Sep 10 00:30:07 2003 Subject: [llvm-commits] CVS: llvm/lib/Transforms/Scalar/CorrelatedExprs.cpp InstructionCombining.cpp LICM.cpp PiNodeInsertion.cpp Message-ID: <200309100529.AAA09228@apoc.cs.uiuc.edu> Changes in directory llvm/lib/Transforms/Scalar: CorrelatedExprs.cpp updated: 1.11 -> 1.12 InstructionCombining.cpp updated: 1.117 -> 1.118 LICM.cpp updated: 1.31 -> 1.32 PiNodeInsertion.cpp updated: 1.9 -> 1.10 --- Log message: Fix spell-o's --- Diffs of the changes: Index: llvm/lib/Transforms/Scalar/CorrelatedExprs.cpp diff -u llvm/lib/Transforms/Scalar/CorrelatedExprs.cpp:1.11 llvm/lib/Transforms/Scalar/CorrelatedExprs.cpp:1.12 --- llvm/lib/Transforms/Scalar/CorrelatedExprs.cpp:1.11 Fri Aug 1 17:15:03 2003 +++ llvm/lib/Transforms/Scalar/CorrelatedExprs.cpp Wed Sep 10 00:29:03 2003 @@ -38,7 +38,7 @@ namespace { Statistic<> NumSetCCRemoved("cee", "Number of setcc instruction eliminated"); - Statistic<> NumOperandsCann("cee", "Number of operands cannonicalized"); + Statistic<> NumOperandsCann("cee", "Number of operands canonicalized"); Statistic<> BranchRevectors("cee", "Number of branches revectored"); class ValueInfo; @@ -950,7 +950,7 @@ // X and a constant C, we can replace all uses of X with C in the region we are // interested in. We generalize this replacement to replace variables with // other variables if they are equal and there is a variable with lower rank -// than the current one. This offers a cannonicalizing property that exposes +// than the current one. This offers a canonicalizing property that exposes // more redundancies for later transformations to take advantage of. // void CEE::ComputeReplacements(RegionInfo &RI) { @@ -1019,7 +1019,7 @@ } // SimplifyInstruction - Inspect the operands of the instruction, converting -// them to their cannonical form if possible. This takes care of, for example, +// them to their canonical form if possible. This takes care of, for example, // replacing a value 'X' with a constant 'C' if the instruction in question is // dominated by a true seteq 'X', 'C'. // Index: llvm/lib/Transforms/Scalar/InstructionCombining.cpp diff -u llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.117 llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.118 --- llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.117 Wed Aug 13 15:16:26 2003 +++ llvm/lib/Transforms/Scalar/InstructionCombining.cpp Wed Sep 10 00:29:03 2003 @@ -12,7 +12,7 @@ // // This is a simple worklist driven algorithm. // -// This pass guarantees that the following cannonicalizations are performed on +// This pass guarantees that the following canonicalizations are performed on // the program: // 1. If a binary operator has a constant operand, it is moved to the RHS // 2. Bitwise operators with constant operands are always grouped so that Index: llvm/lib/Transforms/Scalar/LICM.cpp diff -u llvm/lib/Transforms/Scalar/LICM.cpp:1.31 llvm/lib/Transforms/Scalar/LICM.cpp:1.32 --- llvm/lib/Transforms/Scalar/LICM.cpp:1.31 Mon Sep 8 13:17:14 2003 +++ llvm/lib/Transforms/Scalar/LICM.cpp Wed Sep 10 00:29:03 2003 @@ -332,7 +332,7 @@ /// void LICM::PromoteValuesInLoop() { // PromotedValues - List of values that are promoted out of the loop. Each - // value has an alloca instruction for it, and a cannonical version of the + // value has an alloca instruction for it, and a canonical version of the // pointer. std::vector > PromotedValues; std::map ValueToAllocaMap; // Map of ptr to alloca Index: llvm/lib/Transforms/Scalar/PiNodeInsertion.cpp diff -u llvm/lib/Transforms/Scalar/PiNodeInsertion.cpp:1.9 llvm/lib/Transforms/Scalar/PiNodeInsertion.cpp:1.10 --- llvm/lib/Transforms/Scalar/PiNodeInsertion.cpp:1.9 Mon Oct 21 15:00:26 2002 +++ llvm/lib/Transforms/Scalar/PiNodeInsertion.cpp Wed Sep 10 00:29:03 2003 @@ -77,7 +77,7 @@ Value *TrueRep = 0, *FalseRep = 0; // Make sure the the constant is the second operand if there is one... - // This fits with our cannonicalization patterns used elsewhere in the + // This fits with our canonicalization patterns used elsewhere in the // compiler, without depending on instcombine running before us. // if (isa(SCI->getOperand(0)) && From lattner at cs.uiuc.edu Wed Sep 10 00:30:13 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Wed Sep 10 00:30:13 2003 Subject: [llvm-commits] CVS: llvm/lib/VMCore/Type.cpp Message-ID: <200309100529.AAA09239@apoc.cs.uiuc.edu> Changes in directory llvm/lib/VMCore: Type.cpp updated: 1.68 -> 1.69 --- Log message: Fix spell-o's --- Diffs of the changes: Index: llvm/lib/VMCore/Type.cpp diff -u llvm/lib/VMCore/Type.cpp:1.68 llvm/lib/VMCore/Type.cpp:1.69 --- llvm/lib/VMCore/Type.cpp:1.68 Fri Sep 5 00:10:04 2003 +++ llvm/lib/VMCore/Type.cpp Wed Sep 10 00:29:06 2003 @@ -13,7 +13,7 @@ // DEBUG_MERGE_TYPES - Enable this #define to see how and when derived types are // created and later destroyed, all in an effort to make sure that there is only -// a single cannonical version of a type. +// a single canonical version of a type. // //#define DEBUG_MERGE_TYPES 1 From lattner at cs.uiuc.edu Wed Sep 10 00:30:18 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Wed Sep 10 00:30:18 2003 Subject: [llvm-commits] CVS: llvm/www/docs/ProgrammersManual.html WritingAnLLVMPass.html Message-ID: <200309100529.AAA11578@tank.cs.uiuc.edu> Changes in directory llvm/www/docs: ProgrammersManual.html updated: 1.45 -> 1.46 WritingAnLLVMPass.html updated: 1.18 -> 1.19 --- Log message: Fix spell-o's --- Diffs of the changes: Index: llvm/www/docs/ProgrammersManual.html diff -u llvm/www/docs/ProgrammersManual.html:1.45 llvm/www/docs/ProgrammersManual.html:1.46 --- llvm/www/docs/ProgrammersManual.html:1.45 Mon Aug 18 09:41:19 2003 +++ llvm/www/docs/ProgrammersManual.html Wed Sep 10 00:29:43 2003 @@ -487,7 +487,7 @@ 49 cee - Number of setcc instruction eliminated 532 gcse - Number of loads removed 2919 gcse - Number of instructions removed - 86 indvars - Number of cannonical indvars added + 86 indvars - Number of canonical indvars added 87 indvars - Number of aux indvars removed 25 instcombine - Number of dead inst eliminate 434 instcombine - Number of insts combined Index: llvm/www/docs/WritingAnLLVMPass.html diff -u llvm/www/docs/WritingAnLLVMPass.html:1.18 llvm/www/docs/WritingAnLLVMPass.html:1.19 --- llvm/www/docs/WritingAnLLVMPass.html:1.18 Thu Aug 21 17:14:26 2003 +++ llvm/www/docs/WritingAnLLVMPass.html Wed Sep 10 00:29:43 2003 @@ -308,7 +308,7 @@ -gcse - Global Common Subexpression Elimination -globaldce - Dead Global Elimination -hello - Hello World Pass - -indvars - Cannonicalize Induction Variables + -indvars - Canonicalize Induction Variables -inline - Function Integration/Inlining -instcombine - Combine redundant instructions ... From lattner at cs.uiuc.edu Wed Sep 10 00:31:01 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Wed Sep 10 00:31:01 2003 Subject: [llvm-commits] CVS: llvm/include/Support/Casting.h Message-ID: <200309100530.AAA09262@apoc.cs.uiuc.edu> Changes in directory llvm/include/Support: Casting.h updated: 1.7 -> 1.8 --- Log message: Fix spello --- Diffs of the changes: Index: llvm/include/Support/Casting.h diff -u llvm/include/Support/Casting.h:1.7 llvm/include/Support/Casting.h:1.8 --- llvm/include/Support/Casting.h:1.7 Wed Aug 27 13:26:28 2003 +++ llvm/include/Support/Casting.h Wed Sep 10 00:30:09 2003 @@ -62,7 +62,7 @@ }; // isa_impl_cl - Use class partial specialization to transform types to a single -// cannonical form for isa_impl. +// canonical form for isa_impl. // template struct isa_impl_cl { From criswell at cs.uiuc.edu Wed Sep 10 09:11:02 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Wed Sep 10 09:11:02 2003 Subject: [llvm-commits] CVS: llvm/lib/Target/Sparc/Makefile Message-ID: <200309101410.JAA31087@choi.cs.uiuc.edu> Changes in directory llvm/lib/Target/Sparc: Makefile updated: 1.31 -> 1.32 --- Log message: Don't explicitly use $SourceDir to find the tblgen files. This causes make some confusion when trying to generate files (it probably couldn't tell that ./file and $(SourceDir)/file may be the same file). Now, just let VPATH find everything, and list the primary tblgen file first in the list of dependencies so that we can just use $< to reference it in the make rule. This should hopefully fix the nightly tester. --- Diffs of the changes: Index: llvm/lib/Target/Sparc/Makefile diff -u llvm/lib/Target/Sparc/Makefile:1.31 llvm/lib/Target/Sparc/Makefile:1.32 --- llvm/lib/Target/Sparc/Makefile:1.31 Tue Sep 9 15:56:59 2003 +++ llvm/lib/Target/Sparc/Makefile Wed Sep 10 09:10:44 2003 @@ -37,11 +37,11 @@ TABLEGEN_FILES := $(notdir $(wildcard $(SourceDir)/*.td)) -$(SourceDir)/$(TARGET_NAME)CodeEmitter.cpp:: $(TARGET_NAME)CodeEmitter.inc +$(TARGET_NAME)CodeEmitter.cpp:: $(TARGET_NAME)CodeEmitter.inc -$(TARGET_NAME)CodeEmitter.inc:: $(TABLEGEN_FILES) $(TBLGEN) - @echo "Tblgen'ing $(TARGET_NAME).td" - $(TBLGEN) -I $(SourceDir) $(SourceDir)/$(TARGET_NAME).td -gen-emitter -o $@ +$(TARGET_NAME)CodeEmitter.inc:: $(TARGET_NAME).td $(TABLEGEN_FILES) $(TBLGEN) + @echo "Tblgen'ing $<" + $(TBLGEN) -I $(SourceDir) $< -gen-emitter -o $@ clean:: ${RM} -f $(TARGET_NAME)CodeEmitter.inc Sparc.burg.in1 Sparc.burm Sparc.burm.cpp From lattner at cs.uiuc.edu Wed Sep 10 09:52:02 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Wed Sep 10 09:52:02 2003 Subject: [llvm-commits] CVS: llvm/lib/Analysis/InductionVariable.cpp Message-ID: <200309101451.JAA14997@apoc.cs.uiuc.edu> Changes in directory llvm/lib/Analysis: InductionVariable.cpp updated: 1.27 -> 1.28 --- Log message: Simplification of trip counting machinery. - make sure to check the indvar type before anything else (efficiency) - Make sure to insert the 'add' into the program, even though it'll be dead - Wrap code at 80 columns - Other minor cleanups to reduce indentation level --- Diffs of the changes: Index: llvm/lib/Analysis/InductionVariable.cpp diff -u llvm/lib/Analysis/InductionVariable.cpp:1.27 llvm/lib/Analysis/InductionVariable.cpp:1.28 --- llvm/lib/Analysis/InductionVariable.cpp:1.27 Wed Sep 10 00:23:58 2003 +++ llvm/lib/Analysis/InductionVariable.cpp Wed Sep 10 09:51:49 2003 @@ -155,7 +155,9 @@ } -Value* InductionVariable::getExecutionCount(LoopInfo *LoopInfo) { +Value *InductionVariable::getExecutionCount(LoopInfo *LoopInfo) { + if (InductionType != Canonical) return 0; + DEBUG(std::cerr << "entering getExecutionCount\n"); // Don't recompute if already available @@ -167,111 +169,104 @@ const Loop *L = LoopInfo ? LoopInfo->getLoopFor(Phi->getParent()) : 0; if (!L) { DEBUG(std::cerr << "null loop. oops\n"); - return NULL; + return 0; } // >1 backedge => cannot predict number of iterations if (Phi->getNumIncomingValues() != 2) { DEBUG(std::cerr << ">2 incoming values. oops\n"); - return NULL; + return 0; } // Find final node: predecesor of the loop header that's also an exit BasicBlock *terminator = 0; - BasicBlock *header = L->getHeader(); - for (pred_iterator PI = pred_begin(header), PE = pred_end(header); - PI != PE; ++PI) { + for (pred_iterator PI = pred_begin(L->getHeader()), + PE = pred_end(L->getHeader()); PI != PE; ++PI) if (L->isLoopExit(*PI)) { terminator = *PI; break; } - } // Break in the loop => cannot predict number of iterations // break: any block which is an exit node whose successor is not in loop, // and this block is not marked as the terminator // const std::vector &blocks = L->getBlocks(); - for (std::vector::const_iterator i = blocks.begin(), e = blocks.end(); - i != e; ++i) { - if (L->isLoopExit(*i) && (*i != terminator)) { - for (succ_iterator SI = succ_begin(*i), SE = succ_end(*i); SI != SE; ++SI) { - if (! L->contains(*SI)) { + for (std::vector::const_iterator I = blocks.begin(), + e = blocks.end(); I != e; ++I) + if (L->isLoopExit(*I) && *I != terminator) + for (succ_iterator SI = succ_begin(*I), SE = succ_end(*I); SI != SE; ++SI) + if (!L->contains(*SI)) { DEBUG(std::cerr << "break found in loop"); - return NULL; + return 0; } - } - } - } BranchInst *B = dyn_cast(terminator->getTerminator()); if (!B) { - // this really should not happen - DEBUG(std::cerr << "no terminator instruction!"); - return NULL; + DEBUG(std::cerr << "Terminator is not a cond branch!"); + return 0; } SetCondInst *SCI = dyn_cast(B->getCondition()); - - if (SCI && InductionType == Canonical) { - DEBUG(std::cerr << "sci:" << *SCI); - Value *condVal0 = SCI->getOperand(0); - Value *condVal1 = SCI->getOperand(1); - Value *indVar = 0; - - // the induction variable is the one coming from the backedge - if (L->contains(Phi->getIncomingBlock(0))) { - indVar = Phi->getIncomingValue(0); - } else { - indVar = Phi->getIncomingValue(1); + if (!SCI) { + DEBUG(std::cerr << "Not a cond branch on setcc!\n"); + return 0; + } + + DEBUG(std::cerr << "sci:" << *SCI); + Value *condVal0 = SCI->getOperand(0); + Value *condVal1 = SCI->getOperand(1); + Value *indVar = 0; + + // the induction variable is the one coming from the backedge + indVar = Phi->getIncomingValue(L->contains(Phi->getIncomingBlock(1))); + + + // Check to see if indVar is one of the parameters in SCI and if the other is + // loop-invariant, it is the UB + if (indVar == condVal0) { + if (isLoopInvariant(condVal1, L)) + End = condVal1; + else { + DEBUG(std::cerr << "not loop invariant 1\n"); + return 0; } - - // check to see if indVar is one of the parameters in SCI - // and if the other is loop-invariant, it is the UB - if (indVar == condVal0) { - if (isLoopInvariant(condVal1, L)) { - End = condVal1; - } else { - DEBUG(std::cerr << "not loop invariant 1\n"); - } - } else if (indVar == condVal1) { - if (isLoopInvariant(condVal0, L)) { - End = condVal0; - } else { - DEBUG(std::cerr << "not loop invariant 0\n"); - } + } else if (indVar == condVal1) { + if (isLoopInvariant(condVal0, L)) + End = condVal0; + else { + DEBUG(std::cerr << "not loop invariant 0\n"); + return 0; } + } else { + DEBUG(std::cerr << "Loop condition doesn't directly uses indvar\n"); + return 0; + } - if (End) { - switch (SCI->getOpcode()) { - case Instruction::SetLT: - case Instruction::SetNE: break; // already done - case Instruction::SetLE: { - // if compared to a constant int N, then predict N+1 iterations - if (ConstantSInt *ubSigned = dyn_cast(End)) { - End = ConstantSInt::get(ubSigned->getType(), ubSigned->getValue()+1); - DEBUG(std::cerr << "signed int constant\n"); - } else if (ConstantUInt *ubUnsigned = dyn_cast(End)) { - End = ConstantUInt::get(ubUnsigned->getType(), - ubUnsigned->getValue()+1); - DEBUG(std::cerr << "unsigned int constant\n"); - } else { - DEBUG(std::cerr << "symbolic bound\n"); - //End = NULL; - // new expression N+1 - End = BinaryOperator::create(Instruction::Add, End, - ConstantUInt::get(ubUnsigned->getType(), - 1)); - } - break; - } - default: End = NULL; // cannot predict - } + switch (SCI->getOpcode()) { + case Instruction::SetLT: + case Instruction::SetNE: return End; // already done + case Instruction::SetLE: + // if compared to a constant int N, then predict N+1 iterations + if (ConstantSInt *ubSigned = dyn_cast(End)) { + DEBUG(std::cerr << "signed int constant\n"); + return ConstantSInt::get(ubSigned->getType(), ubSigned->getValue()+1); + } else if (ConstantUInt *ubUnsigned = dyn_cast(End)) { + DEBUG(std::cerr << "unsigned int constant\n"); + return ConstantUInt::get(ubUnsigned->getType(), + ubUnsigned->getValue()+1); + } else { + DEBUG(std::cerr << "symbolic bound\n"); + // new expression N+1, insert right before the SCI. FIXME: If End is loop + // invariant, then so is this expression. We should insert it in the loop + // preheader if it exists. + return BinaryOperator::create(Instruction::Add, End, + ConstantInt::get(End->getType(), 1), + "tripcount", SCI); } - return End; - } else { - DEBUG(std::cerr << "SCI null or non-canonical ind var\n"); + + default: + return 0; // cannot predict } - return NULL; } From lattner at cs.uiuc.edu Wed Sep 10 09:56:03 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Wed Sep 10 09:56:03 2003 Subject: [llvm-commits] CVS: llvm/lib/Analysis/InductionVariable.cpp Message-ID: <200309101455.JAA15030@apoc.cs.uiuc.edu> Changes in directory llvm/lib/Analysis: InductionVariable.cpp updated: 1.28 -> 1.29 --- Log message: another trivial cleanup --- Diffs of the changes: Index: llvm/lib/Analysis/InductionVariable.cpp diff -u llvm/lib/Analysis/InductionVariable.cpp:1.28 llvm/lib/Analysis/InductionVariable.cpp:1.29 --- llvm/lib/Analysis/InductionVariable.cpp:1.28 Wed Sep 10 09:51:49 2003 +++ llvm/lib/Analysis/InductionVariable.cpp Wed Sep 10 09:55:05 2003 @@ -215,10 +215,9 @@ DEBUG(std::cerr << "sci:" << *SCI); Value *condVal0 = SCI->getOperand(0); Value *condVal1 = SCI->getOperand(1); - Value *indVar = 0; - // the induction variable is the one coming from the backedge - indVar = Phi->getIncomingValue(L->contains(Phi->getIncomingBlock(1))); + // The induction variable is the one coming from the backedge + Value *indVar = Phi->getIncomingValue(L->contains(Phi->getIncomingBlock(1))); // Check to see if indVar is one of the parameters in SCI and if the other is From criswell at cs.uiuc.edu Wed Sep 10 10:03:53 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Wed Sep 10 10:03:53 2003 Subject: [llvm-commits] CVS: reopt/Makefile.common.in Message-ID: <200309101502.KAA03069@choi.cs.uiuc.edu> Changes in directory reopt: Makefile.common.in updated: 1.2 -> 1.3 --- Log message: Updated for the new autoconf system. --- Diffs of the changes: Index: reopt/Makefile.common.in diff -u reopt/Makefile.common.in:1.2 reopt/Makefile.common.in:1.3 --- reopt/Makefile.common.in:1.2 Thu Aug 14 22:34:44 2003 +++ reopt/Makefile.common.in Wed Sep 10 10:02:24 2003 @@ -12,5 +12,17 @@ # # Include LLVM's Master Makefile. # -include $(LLVM_SRC_ROOT)/Makefile.common +include $(LLVM_SRC_ROOT)/Makefile.config + +# +# Set the source root and source directory pathnames +# +BUILD_SRC_DIR := $(subst //,/, at abs_top_srcdir@/$(patsubst $(BUILD_OBJ_ROOT)%,%,$(BUILD_OBJ_DIR))) + +BUILD_SRC_ROOT := $(subst //,/, at abs_top_srcdir@) + +# +# Include LLVM's Master Makefile. +# +include $(LLVM_SRC_ROOT)/Makefile.rules From criswell at cs.uiuc.edu Wed Sep 10 10:04:01 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Wed Sep 10 10:04:01 2003 Subject: [llvm-commits] CVS: reopt/Makefile.config.in Message-ID: <200309101503.KAA03084@choi.cs.uiuc.edu> Changes in directory reopt: Makefile.config.in (r1.1.1.1) removed --- Log message: No longer necessary as we directly includes Makefile.config and Makefile.rules from the LLVM source tree. --- Diffs of the changes: From criswell at cs.uiuc.edu Wed Sep 10 10:06:05 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Wed Sep 10 10:06:05 2003 Subject: [llvm-commits] CVS: reopt/autoconf/configure.ac Message-ID: <200309101505.KAA04322@choi.cs.uiuc.edu> Changes in directory reopt/autoconf: configure.ac updated: 1.1.1.1 -> 1.2 --- Log message: Removed Makefile.config as it is no longer necessary. --- Diffs of the changes: Index: reopt/autoconf/configure.ac diff -u reopt/autoconf/configure.ac:1.1.1.1 reopt/autoconf/configure.ac:1.2 --- reopt/autoconf/configure.ac:1.1.1.1 Mon Aug 11 16:29:15 2003 +++ reopt/autoconf/configure.ac Wed Sep 10 10:05:14 2003 @@ -32,7 +32,7 @@ dnl ************************************************************************** dnl Verify that the source directory is valid -AC_CONFIG_SRCDIR(["Makefile.config.in"]) +AC_CONFIG_SRCDIR(["Makefile.common.in"]) dnl ************************************************************************** dnl * Check for libraries. @@ -74,5 +74,4 @@ dnl ************************************************************************** dnl * Create the output files dnl ************************************************************************** -AC_OUTPUT(Makefile.config) AC_OUTPUT(Makefile.common) From criswell at cs.uiuc.edu Wed Sep 10 10:06:12 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Wed Sep 10 10:06:12 2003 Subject: [llvm-commits] CVS: reopt/configure Message-ID: <200309101505.KAA04315@choi.cs.uiuc.edu> Changes in directory reopt: configure updated: 1.2 -> 1.3 --- Log message: Removed Makefile.config as it is no longer necessary. --- Diffs of the changes: Index: reopt/configure diff -u reopt/configure:1.2 reopt/configure:1.3 --- reopt/configure:1.2 Mon Aug 11 17:02:47 2003 +++ reopt/configure Wed Sep 10 10:05:13 2003 @@ -272,7 +272,7 @@ PACKAGE_STRING='[LLVM] [1.0]' PACKAGE_BUGREPORT='llvmbugs at cs.uiuc.edu' -ac_unique_file=""Makefile.config.in"" +ac_unique_file=""Makefile.common.in"" ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS LLVM_SRC LLVM_OBJ LIBOBJS LTLIBOBJS' ac_subst_files='' @@ -1259,878 +1259,10 @@ LLVM_OBJ=$withval else - LLVM_OBJ=${LLVM_SRC} + LLVM_OBJ=/home/vadve/${USER}/llvm fi; - ac_config_files="$ac_config_files Makefile.config" -cat >confcache <<\_ACEOF -# This file is a shell script that caches the results of configure -# tests run on this system so they can be shared between configure -# scripts and configure runs, see configure's option --config-cache. -# It is not useful on other systems. If it contains results you don't -# want to keep, you may remove or edit it. -# -# config.status only pays attention to the cache file if you give it -# the --recheck option to rerun configure. -# -# `ac_cv_env_foo' variables (set or unset) will be overridden when -# loading this file, other *unset* `ac_cv_foo' will be assigned the -# following values. - -_ACEOF - -# The following way of writing the cache mishandles newlines in values, -# but we know of no workaround that is simple, portable, and efficient. -# So, don't put newlines in cache variables' values. -# Ultrix sh set writes to stderr and can't be redirected directly, -# and sets the high bit in the cache file unless we assign to the vars. -{ - (set) 2>&1 | - case `(ac_space=' '; set | grep ac_space) 2>&1` in - *ac_space=\ *) - # `set' does not quote correctly, so add quotes (double-quote - # substitution turns \\\\ into \\, and sed turns \\ into \). - sed -n \ - "s/'/'\\\\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" - ;; - *) - # `set' quotes correctly as required by POSIX, so do not add quotes. - sed -n \ - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" - ;; - esac; -} | - sed ' - t clear - : clear - s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ - t end - /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ - : end' >>confcache -if diff $cache_file confcache >/dev/null 2>&1; then :; else - if test -w $cache_file; then - test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" - cat confcache >$cache_file - else - echo "not updating unwritable cache $cache_file" - fi -fi -rm -f confcache - -test "x$prefix" = xNONE && prefix=$ac_default_prefix -# Let make expand exec_prefix. -test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' - -# VPATH may cause trouble with some makes, so we remove $(srcdir), -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and -# trailing colons and then remove the whole line if VPATH becomes empty -# (actually we leave an empty line to preserve line numbers). -if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=/{ -s/:*\$(srcdir):*/:/; -s/:*\${srcdir}:*/:/; -s/:*@srcdir@:*/:/; -s/^\([^=]*=[ ]*\):*/\1/; -s/:*$//; -s/^[^=]*=[ ]*$//; -}' -fi - -# Transform confdefs.h into DEFS. -# Protect against shell expansion while executing Makefile rules. -# Protect against Makefile macro expansion. -# -# If the first sed substitution is executed (which looks for macros that -# take arguments), then we branch to the quote section. Otherwise, -# look for a macro that doesn't take arguments. -cat >confdef2opt.sed <<\_ACEOF -t clear -: clear -s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g -t quote -s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g -t quote -d -: quote -s,[ `~#$^&*(){}\\|;'"<>?],\\&,g -s,\[,\\&,g -s,\],\\&,g -s,\$,$$,g -p -_ACEOF -# We use echo to avoid assuming a particular line-breaking character. -# The extra dot is to prevent the shell from consuming trailing -# line-breaks from the sub-command output. A line-break within -# single-quotes doesn't work because, if this script is created in a -# platform that uses two characters for line-breaks (e.g., DOS), tr -# would break. -ac_LF_and_DOT=`echo; echo .` -DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'` -rm -f confdef2opt.sed - - -ac_libobjs= -ac_ltlibobjs= -for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue - # 1. Remove the extension, and $U if already installed. - ac_i=`echo "$ac_i" | - sed 's/\$U\././;s/\.o$//;s/\.obj$//'` - # 2. Add them. - ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" - ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' -done -LIBOBJS=$ac_libobjs - -LTLIBOBJS=$ac_ltlibobjs - - - -: ${CONFIG_STATUS=./config.status} -ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 -echo "$as_me: creating $CONFIG_STATUS" >&6;} -cat >$CONFIG_STATUS <<_ACEOF -#! $SHELL -# Generated by $as_me. -# Run this file to recreate the current configuration. -# Compiler output produced by configure, useful for debugging -# configure, is in config.log if it exists. - -debug=false -ac_cs_recheck=false -ac_cs_silent=false -SHELL=\${CONFIG_SHELL-$SHELL} -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## - -# Be Bourne compatible -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then - set -o posix -fi - -# Support unset when possible. -if (FOO=FOO; unset FOO) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi - - -# Work around bugs in pre-3.0 UWIN ksh. -$as_unset ENV MAIL MAILPATH -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -for as_var in \ - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ - LC_TELEPHONE LC_TIME -do - if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else - $as_unset $as_var - fi -done - -# Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1; then - as_expr=expr -else - as_expr=false -fi - -if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then - as_basename=basename -else - as_basename=false -fi - - -# Name of the executable. -as_me=`$as_basename "$0" || -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)$' \| \ - . : '\(.\)' 2>/dev/null || -echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } - /^X\/\(\/\/\)$/{ s//\1/; q; } - /^X\/\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - - -# PATH needs CR, and LINENO needs CR and PATH. -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh -fi - - - as_lineno_1=$LINENO - as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" || { - # Find who we are. Look in the path if we contain no path at all - # relative or not. - case $0 in - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done - - ;; - esac - # We did not find ourselves, most probably we were run as `sh COMMAND' - # in which case we are not to be found in the path. - if test "x$as_myself" = x; then - as_myself=$0 - fi - if test ! -f "$as_myself"; then - { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 -echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} - { (exit 1); exit 1; }; } - fi - case $CONFIG_SHELL in - '') - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for as_base in sh bash ksh sh5; do - case $as_dir in - /*) - if ("$as_dir/$as_base" -c ' - as_lineno_1=$LINENO - as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then - $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } - $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } - CONFIG_SHELL=$as_dir/$as_base - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$0" ${1+"$@"} - fi;; - esac - done -done -;; - esac - - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line before each line; the second 'sed' does the real - # work. The second script uses 'N' to pair each line-number line - # with the numbered line, and appends trailing '-' during - # substitution so that $LINENO is not a special case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) - sed '=' <$as_myself | - sed ' - N - s,$,-, - : loop - s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, - t loop - s,-$,, - s,^['$as_cr_digits']*\n,, - ' >$as_me.lineno && - chmod +x $as_me.lineno || - { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 -echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;} - { (exit 1); exit 1; }; } - - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensible to this). - . ./$as_me.lineno - # Exit status is that of the last command. - exit -} - - -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in - *c*,-n*) ECHO_N= ECHO_C=' -' ECHO_T=' ' ;; - *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; - *) ECHO_N= ECHO_C='\c' ECHO_T= ;; -esac - -if expr a : '\(a\)' >/dev/null 2>&1; then - as_expr=expr -else - as_expr=false -fi - -rm -f conf$$ conf$$.exe conf$$.file -echo >conf$$.file -if ln -s conf$$.file conf$$ 2>/dev/null; then - # We could just check for DJGPP; but this test a) works b) is more generic - # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). - if test -f conf$$.exe; then - # Don't use ln at all; we don't have any links - as_ln_s='cp -p' - else - as_ln_s='ln -s' - fi -elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln -else - as_ln_s='cp -p' -fi -rm -f conf$$ conf$$.exe conf$$.file - -if mkdir -p . 2>/dev/null; then - as_mkdir_p=: -else - as_mkdir_p=false -fi - -as_executable_p="test -f" - -# Sed expression to map a string onto a valid CPP name. -as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" - -# Sed expression to map a string onto a valid variable name. -as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" - - -# IFS -# We need space, tab and new line, in precisely that order. -as_nl=' -' -IFS=" $as_nl" - -# CDPATH. -$as_unset CDPATH - -exec 6>&1 - -# Open the log real soon, to keep \$[0] and so on meaningful, and to -# report actual input values of CONFIG_FILES etc. instead of their -# values after options handling. Logging --version etc. is OK. -exec 5>>config.log -{ - echo - sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX -## Running $as_me. ## -_ASBOX -} >&5 -cat >&5 <<_CSEOF - -This file was extended by [LLVM] $as_me [1.0], which was -generated by GNU Autoconf 2.57. Invocation command line was - - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS - CONFIG_LINKS = $CONFIG_LINKS - CONFIG_COMMANDS = $CONFIG_COMMANDS - $ $0 $@ - -_CSEOF -echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5 -echo >&5 -_ACEOF - -# Files that config.status was made for. -if test -n "$ac_config_files"; then - echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS -fi - -if test -n "$ac_config_headers"; then - echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS -fi - -if test -n "$ac_config_links"; then - echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS -fi - -if test -n "$ac_config_commands"; then - echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS -fi - -cat >>$CONFIG_STATUS <<\_ACEOF - -ac_cs_usage="\ -\`$as_me' instantiates files from templates according to the -current configuration. - -Usage: $0 [OPTIONS] [FILE]... - - -h, --help print this help, then exit - -V, --version print version number, then exit - -q, --quiet do not print progress messages - -d, --debug don't remove temporary files - --recheck update $as_me by reconfiguring in the same conditions - --file=FILE[:TEMPLATE] - instantiate the configuration file FILE - -Configuration files: -$config_files - -Report bugs to ." -_ACEOF - -cat >>$CONFIG_STATUS <<_ACEOF -ac_cs_version="\\ -[LLVM] config.status [1.0] -configured by $0, generated by GNU Autoconf 2.57, - with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" - -Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 -Free Software Foundation, Inc. -This config.status script is free software; the Free Software Foundation -gives unlimited permission to copy, distribute and modify it." -srcdir=$srcdir -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF -# If no file are specified by the user, then we need to provide default -# value. By we need to know if files were specified by the user. -ac_need_defaults=: -while test $# != 0 -do - case $1 in - --*=*) - ac_option=`expr "x$1" : 'x\([^=]*\)='` - ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` - ac_shift=: - ;; - -*) - ac_option=$1 - ac_optarg=$2 - ac_shift=shift - ;; - *) # This is not an option, so the user has probably given explicit - # arguments. - ac_option=$1 - ac_need_defaults=false;; - esac - - case $ac_option in - # Handling of the options. -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - ac_cs_recheck=: ;; - --version | --vers* | -V ) - echo "$ac_cs_version"; exit 0 ;; - --he | --h) - # Conflict between --help and --header - { { echo "$as_me:$LINENO: error: ambiguous option: $1 -Try \`$0 --help' for more information." >&5 -echo "$as_me: error: ambiguous option: $1 -Try \`$0 --help' for more information." >&2;} - { (exit 1); exit 1; }; };; - --help | --hel | -h ) - echo "$ac_cs_usage"; exit 0 ;; - --debug | --d* | -d ) - debug=: ;; - --file | --fil | --fi | --f ) - $ac_shift - CONFIG_FILES="$CONFIG_FILES $ac_optarg" - ac_need_defaults=false;; - --header | --heade | --head | --hea ) - $ac_shift - CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" - ac_need_defaults=false;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil | --si | --s) - ac_cs_silent=: ;; - - # This is an error. - -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&5 -echo "$as_me: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&2;} - { (exit 1); exit 1; }; } ;; - - *) ac_config_targets="$ac_config_targets $1" ;; - - esac - shift -done - -ac_configure_extra_args= - -if $ac_cs_silent; then - exec 6>/dev/null - ac_configure_extra_args="$ac_configure_extra_args --silent" -fi - -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF -if \$ac_cs_recheck; then - echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 - exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion -fi - -_ACEOF - - - - - -cat >>$CONFIG_STATUS <<\_ACEOF -for ac_config_target in $ac_config_targets -do - case "$ac_config_target" in - # Handling of arguments. - "Makefile.config" ) CONFIG_FILES="$CONFIG_FILES Makefile.config" ;; - *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 -echo "$as_me: error: invalid argument: $ac_config_target" >&2;} - { (exit 1); exit 1; }; };; - esac -done - -# If the user did not use the arguments to specify the items to instantiate, -# then the envvar interface is used. Set only those that are not. -# We use the long form for the default assignment because of an extremely -# bizarre bug on SunOS 4.1.3. -if $ac_need_defaults; then - test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files -fi - -# Have a temporary directory for convenience. Make it in the build tree -# simply because there is no reason to put it here, and in addition, -# creating and moving files from /tmp can sometimes cause problems. -# Create a temporary directory, and hook for its removal unless debugging. -$debug || -{ - trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 - trap '{ (exit 1); exit 1; }' 1 2 13 15 -} - -# Create a (secure) tmp directory for tmp files. - -{ - tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` && - test -n "$tmp" && test -d "$tmp" -} || -{ - tmp=./confstat$$-$RANDOM - (umask 077 && mkdir $tmp) -} || -{ - echo "$me: cannot create a temporary directory in ." >&2 - { (exit 1); exit 1; } -} - -_ACEOF - -cat >>$CONFIG_STATUS <<_ACEOF - -# -# CONFIG_FILES section. -# - -# No need to generate the scripts if there are no CONFIG_FILES. -# This happens for instance when ./config.status config.h -if test -n "\$CONFIG_FILES"; then - # Protect against being on the right side of a sed subst in config.status. - sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g; - s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF -s, at SHELL@,$SHELL,;t t -s, at PATH_SEPARATOR@,$PATH_SEPARATOR,;t t -s, at PACKAGE_NAME@,$PACKAGE_NAME,;t t -s, at PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t -s, at PACKAGE_VERSION@,$PACKAGE_VERSION,;t t -s, at PACKAGE_STRING@,$PACKAGE_STRING,;t t -s, at PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t -s, at exec_prefix@,$exec_prefix,;t t -s, at prefix@,$prefix,;t t -s, at program_transform_name@,$program_transform_name,;t t -s, at bindir@,$bindir,;t t -s, at sbindir@,$sbindir,;t t -s, at libexecdir@,$libexecdir,;t t -s, at datadir@,$datadir,;t t -s, at sysconfdir@,$sysconfdir,;t t -s, at sharedstatedir@,$sharedstatedir,;t t -s, at localstatedir@,$localstatedir,;t t -s, at libdir@,$libdir,;t t -s, at includedir@,$includedir,;t t -s, at oldincludedir@,$oldincludedir,;t t -s, at infodir@,$infodir,;t t -s, at mandir@,$mandir,;t t -s, at build_alias@,$build_alias,;t t -s, at host_alias@,$host_alias,;t t -s, at target_alias@,$target_alias,;t t -s, at DEFS@,$DEFS,;t t -s, at ECHO_C@,$ECHO_C,;t t -s, at ECHO_N@,$ECHO_N,;t t -s, at ECHO_T@,$ECHO_T,;t t -s, at LIBS@,$LIBS,;t t -s, at LLVM_SRC@,$LLVM_SRC,;t t -s, at LLVM_OBJ@,$LLVM_OBJ,;t t -s, at LIBOBJS@,$LIBOBJS,;t t -s, at LTLIBOBJS@,$LTLIBOBJS,;t t -CEOF - -_ACEOF - - cat >>$CONFIG_STATUS <<\_ACEOF - # Split the substitutions into bite-sized pieces for seds with - # small command number limits, like on Digital OSF/1 and HP-UX. - ac_max_sed_lines=48 - ac_sed_frag=1 # Number of current file. - ac_beg=1 # First line for current file. - ac_end=$ac_max_sed_lines # Line after last line for current file. - ac_more_lines=: - ac_sed_cmds= - while $ac_more_lines; do - if test $ac_beg -gt 1; then - sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag - else - sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag - fi - if test ! -s $tmp/subs.frag; then - ac_more_lines=false - else - # The purpose of the label and of the branching condition is to - # speed up the sed processing (if there are no `@' at all, there - # is no need to browse any of the substitutions). - # These are the two extra sed commands mentioned above. - (echo ':t - /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed - if test -z "$ac_sed_cmds"; then - ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" - else - ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" - fi - ac_sed_frag=`expr $ac_sed_frag + 1` - ac_beg=$ac_end - ac_end=`expr $ac_end + $ac_max_sed_lines` - fi - done - if test -z "$ac_sed_cmds"; then - ac_sed_cmds=cat - fi -fi # test -n "$CONFIG_FILES" - -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF -for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". - case $ac_file in - - | *:- | *:-:* ) # input from stdin - cat >$tmp/stdin - ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - * ) ac_file_in=$ac_file.in ;; - esac - - # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. - ac_dir=`(dirname "$ac_file") 2>/dev/null || -$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$ac_file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - { if $as_mkdir_p; then - mkdir -p "$ac_dir" - else - as_dir="$ac_dir" - as_dirs= - while test ! -d "$as_dir"; do - as_dirs="$as_dir $as_dirs" - as_dir=`(dirname "$as_dir") 2>/dev/null || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - done - test ! -n "$as_dirs" || mkdir $as_dirs - fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} - { (exit 1); exit 1; }; }; } - - ac_builddir=. - -if test "$ac_dir" != .; then - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A "../" for each directory in $ac_dir_suffix. - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` -else - ac_dir_suffix= ac_top_builddir= -fi - -case $srcdir in - .) # No --srcdir option. We are building in place. - ac_srcdir=. - if test -z "$ac_top_builddir"; then - ac_top_srcdir=. - else - ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` - fi ;; - [\\/]* | ?:[\\/]* ) # Absolute path. - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir ;; - *) # Relative path. - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_builddir$srcdir ;; -esac -# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be -# absolute. -ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` -ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` -ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` -ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` - - - - if test x"$ac_file" != x-; then - { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} - rm -f "$ac_file" - fi - # Let's still pretend it is `configure' which instantiates (i.e., don't - # use $as_me), people would be surprised to read: - # /* config.h. Generated by config.status. */ - if test x"$ac_file" = x-; then - configure_input= - else - configure_input="$ac_file. " - fi - configure_input=$configure_input"Generated from `echo $ac_file_in | - sed 's,.*/,,'` by configure." - - # First look for the input files in the build tree, otherwise in the - # src tree. - ac_file_inputs=`IFS=: - for f in $ac_file_in; do - case $f in - -) echo $tmp/stdin ;; - [\\/$]*) - # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - echo $f;; - *) # Relative - if test -f "$f"; then - # Build tree - echo $f - elif test -f "$srcdir/$f"; then - # Source tree - echo $srcdir/$f - else - # /dev/null tree - { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - fi;; - esac - done` || { (exit 1); exit 1; } -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF - sed "$ac_vpsub -$extrasub -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF -:t -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b -s, at configure_input@,$configure_input,;t t -s, at srcdir@,$ac_srcdir,;t t -s, at abs_srcdir@,$ac_abs_srcdir,;t t -s, at top_srcdir@,$ac_top_srcdir,;t t -s, at abs_top_srcdir@,$ac_abs_top_srcdir,;t t -s, at builddir@,$ac_builddir,;t t -s, at abs_builddir@,$ac_abs_builddir,;t t -s, at top_builddir@,$ac_top_builddir,;t t -s, at abs_top_builddir@,$ac_abs_top_builddir,;t t -" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out - rm -f $tmp/stdin - if test x"$ac_file" != x-; then - mv $tmp/out $ac_file - else - cat $tmp/out - rm -f $tmp/out - fi - -done -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF - -{ (exit 0); exit 0; } -_ACEOF -chmod +x $CONFIG_STATUS -ac_clean_files=$ac_clean_files_save - - -# configure is writing to config.log, and then calls config.status. -# config.status does its own redirection, appending to config.log. -# Unfortunately, on DOS this fails, as config.log is still kept open -# by configure, so config.status won't be able to write to it; its -# output is simply discarded. So we exec the FD to /dev/null, -# effectively closing config.log, so it can be properly (re)opened and -# appended to by config.status. When coming back to configure, we -# need to make the FD available again. -if test "$no_create" != yes; then - ac_cs_success=: - ac_config_status_args= - test "$silent" = yes && - ac_config_status_args="$ac_config_status_args --quiet" - exec 5>/dev/null - $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false - exec 5>>config.log - # Use ||, not &&, to avoid exiting from the if with $? = 1, which - # would make configure fail if this is the last instruction. - $ac_cs_success || { (exit 1); exit 1; } -fi - ac_config_files="$ac_config_files Makefile.common" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -2681,7 +1813,6 @@ do case "$ac_config_target" in # Handling of arguments. - "Makefile.config" ) CONFIG_FILES="$CONFIG_FILES Makefile.config" ;; "Makefile.common" ) CONFIG_FILES="$CONFIG_FILES Makefile.common" ;; *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} From criswell at cs.uiuc.edu Wed Sep 10 10:06:18 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Wed Sep 10 10:06:18 2003 Subject: [llvm-commits] CVS: reopt/lib/Makefile Message-ID: <200309101505.KAA04337@choi.cs.uiuc.edu> Changes in directory reopt/lib: Makefile updated: 1.14 -> 1.15 --- Log message: Removed Makefile.config as it is no longer necessary. --- Diffs of the changes: Index: reopt/lib/Makefile diff -u reopt/lib/Makefile:1.14 reopt/lib/Makefile:1.15 --- reopt/lib/Makefile:1.14 Thu Aug 21 14:40:53 2003 +++ reopt/lib/Makefile Wed Sep 10 10:05:37 2003 @@ -1,5 +1,3 @@ - LEVEL = .. -include $(LEVEL)/Makefile.config DIRS = BinInterface Inst LightWtProfiling Mapping ScratchMemory TraceCache Trigger include $(LEVEL)/Makefile.common From brukman at cs.uiuc.edu Wed Sep 10 10:10:03 2003 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Wed Sep 10 10:10:03 2003 Subject: [llvm-commits] CVS: llvm/lib/ExecutionEngine/JIT/Emitter.cpp Message-ID: <200309101509.KAA01110@zion.cs.uiuc.edu> Changes in directory llvm/lib/ExecutionEngine/JIT: Emitter.cpp updated: 1.23 -> 1.24 --- Log message: Fix warning when _POSIX_MAPPED_FILES is already defined in unistd.h --- Diffs of the changes: Index: llvm/lib/ExecutionEngine/JIT/Emitter.cpp diff -u llvm/lib/ExecutionEngine/JIT/Emitter.cpp:1.23 llvm/lib/ExecutionEngine/JIT/Emitter.cpp:1.24 --- llvm/lib/ExecutionEngine/JIT/Emitter.cpp:1.23 Thu Aug 14 13:35:27 2003 +++ llvm/lib/ExecutionEngine/JIT/Emitter.cpp Wed Sep 10 10:09:45 2003 @@ -41,7 +41,9 @@ }; } +#ifndef _POSIX_MAPPED_FILES #define _POSIX_MAPPED_FILES +#endif #include #include From criswell at cs.uiuc.edu Wed Sep 10 10:14:02 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Wed Sep 10 10:14:02 2003 Subject: [llvm-commits] CVS: poolalloc/Makefile.common.in configure Makefile.config.in Message-ID: <200309101513.KAA05484@choi.cs.uiuc.edu> Changes in directory poolalloc: Makefile.common.in updated: 1.3 -> 1.4 configure updated: 1.2 -> 1.3 Makefile.config.in (r1.1.1.1) removed --- Log message: Updated to use the new autoconf-style object root directory. Removed the local project's Makefile.config as it is no longer needed. Switched to including Makefile.config and Makefile.rules from the LLVM source tree. --- Diffs of the changes: Index: poolalloc/Makefile.common.in diff -u poolalloc/Makefile.common.in:1.3 poolalloc/Makefile.common.in:1.4 --- poolalloc/Makefile.common.in:1.3 Thu Aug 21 17:31:04 2003 +++ poolalloc/Makefile.common.in Wed Sep 10 10:13:01 2003 @@ -4,7 +4,25 @@ LLVM_SRC_ROOT = @LLVM_SRC@ # +# Set this variable to the top level directory where LLVM was built +# (this is *not* the same as OBJ_ROOT as defined in LLVM's Makefile.config). +# +LLVM_OBJ_ROOT = @LLVM_OBJ@ + +# +# Include LLVM's Master Makefile. +# +include $(LLVM_SRC_ROOT)/Makefile.config + +# +# Set the source root and source directory pathnames +# +BUILD_SRC_DIR := $(subst //,/, at abs_top_srcdir@/$(patsubst $(BUILD_OBJ_ROOT)%,%,$(BUILD_OBJ_DIR))) + +BUILD_SRC_ROOT := $(subst //,/, at abs_top_srcdir@) + +# # Include LLVM's Master Makefile. # -include $(LLVM_SRC_ROOT)/Makefile.common +include $(LLVM_SRC_ROOT)/Makefile.rules Index: poolalloc/configure diff -u poolalloc/configure:1.2 poolalloc/configure:1.3 --- poolalloc/configure:1.2 Mon Aug 11 17:02:47 2003 +++ poolalloc/configure Wed Sep 10 10:13:01 2003 @@ -272,7 +272,7 @@ PACKAGE_STRING='[LLVM] [1.0]' PACKAGE_BUGREPORT='llvmbugs at cs.uiuc.edu' -ac_unique_file=""Makefile.config.in"" +ac_unique_file=""Makefile.common.in"" ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS LLVM_SRC LLVM_OBJ LIBOBJS LTLIBOBJS' ac_subst_files='' @@ -1259,878 +1259,10 @@ LLVM_OBJ=$withval else - LLVM_OBJ=${LLVM_SRC} + LLVM_OBJ=/home/vadve/${USER}/llvm fi; - ac_config_files="$ac_config_files Makefile.config" -cat >confcache <<\_ACEOF -# This file is a shell script that caches the results of configure -# tests run on this system so they can be shared between configure -# scripts and configure runs, see configure's option --config-cache. -# It is not useful on other systems. If it contains results you don't -# want to keep, you may remove or edit it. -# -# config.status only pays attention to the cache file if you give it -# the --recheck option to rerun configure. -# -# `ac_cv_env_foo' variables (set or unset) will be overridden when -# loading this file, other *unset* `ac_cv_foo' will be assigned the -# following values. - -_ACEOF - -# The following way of writing the cache mishandles newlines in values, -# but we know of no workaround that is simple, portable, and efficient. -# So, don't put newlines in cache variables' values. -# Ultrix sh set writes to stderr and can't be redirected directly, -# and sets the high bit in the cache file unless we assign to the vars. -{ - (set) 2>&1 | - case `(ac_space=' '; set | grep ac_space) 2>&1` in - *ac_space=\ *) - # `set' does not quote correctly, so add quotes (double-quote - # substitution turns \\\\ into \\, and sed turns \\ into \). - sed -n \ - "s/'/'\\\\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" - ;; - *) - # `set' quotes correctly as required by POSIX, so do not add quotes. - sed -n \ - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" - ;; - esac; -} | - sed ' - t clear - : clear - s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ - t end - /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ - : end' >>confcache -if diff $cache_file confcache >/dev/null 2>&1; then :; else - if test -w $cache_file; then - test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" - cat confcache >$cache_file - else - echo "not updating unwritable cache $cache_file" - fi -fi -rm -f confcache - -test "x$prefix" = xNONE && prefix=$ac_default_prefix -# Let make expand exec_prefix. -test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' - -# VPATH may cause trouble with some makes, so we remove $(srcdir), -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and -# trailing colons and then remove the whole line if VPATH becomes empty -# (actually we leave an empty line to preserve line numbers). -if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=/{ -s/:*\$(srcdir):*/:/; -s/:*\${srcdir}:*/:/; -s/:*@srcdir@:*/:/; -s/^\([^=]*=[ ]*\):*/\1/; -s/:*$//; -s/^[^=]*=[ ]*$//; -}' -fi - -# Transform confdefs.h into DEFS. -# Protect against shell expansion while executing Makefile rules. -# Protect against Makefile macro expansion. -# -# If the first sed substitution is executed (which looks for macros that -# take arguments), then we branch to the quote section. Otherwise, -# look for a macro that doesn't take arguments. -cat >confdef2opt.sed <<\_ACEOF -t clear -: clear -s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g -t quote -s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g -t quote -d -: quote -s,[ `~#$^&*(){}\\|;'"<>?],\\&,g -s,\[,\\&,g -s,\],\\&,g -s,\$,$$,g -p -_ACEOF -# We use echo to avoid assuming a particular line-breaking character. -# The extra dot is to prevent the shell from consuming trailing -# line-breaks from the sub-command output. A line-break within -# single-quotes doesn't work because, if this script is created in a -# platform that uses two characters for line-breaks (e.g., DOS), tr -# would break. -ac_LF_and_DOT=`echo; echo .` -DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'` -rm -f confdef2opt.sed - - -ac_libobjs= -ac_ltlibobjs= -for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue - # 1. Remove the extension, and $U if already installed. - ac_i=`echo "$ac_i" | - sed 's/\$U\././;s/\.o$//;s/\.obj$//'` - # 2. Add them. - ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" - ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' -done -LIBOBJS=$ac_libobjs - -LTLIBOBJS=$ac_ltlibobjs - - - -: ${CONFIG_STATUS=./config.status} -ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 -echo "$as_me: creating $CONFIG_STATUS" >&6;} -cat >$CONFIG_STATUS <<_ACEOF -#! $SHELL -# Generated by $as_me. -# Run this file to recreate the current configuration. -# Compiler output produced by configure, useful for debugging -# configure, is in config.log if it exists. - -debug=false -ac_cs_recheck=false -ac_cs_silent=false -SHELL=\${CONFIG_SHELL-$SHELL} -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## - -# Be Bourne compatible -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then - set -o posix -fi - -# Support unset when possible. -if (FOO=FOO; unset FOO) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi - - -# Work around bugs in pre-3.0 UWIN ksh. -$as_unset ENV MAIL MAILPATH -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -for as_var in \ - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ - LC_TELEPHONE LC_TIME -do - if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else - $as_unset $as_var - fi -done - -# Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1; then - as_expr=expr -else - as_expr=false -fi - -if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then - as_basename=basename -else - as_basename=false -fi - - -# Name of the executable. -as_me=`$as_basename "$0" || -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)$' \| \ - . : '\(.\)' 2>/dev/null || -echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } - /^X\/\(\/\/\)$/{ s//\1/; q; } - /^X\/\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - - -# PATH needs CR, and LINENO needs CR and PATH. -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh -fi - - - as_lineno_1=$LINENO - as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" || { - # Find who we are. Look in the path if we contain no path at all - # relative or not. - case $0 in - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done - - ;; - esac - # We did not find ourselves, most probably we were run as `sh COMMAND' - # in which case we are not to be found in the path. - if test "x$as_myself" = x; then - as_myself=$0 - fi - if test ! -f "$as_myself"; then - { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 -echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} - { (exit 1); exit 1; }; } - fi - case $CONFIG_SHELL in - '') - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for as_base in sh bash ksh sh5; do - case $as_dir in - /*) - if ("$as_dir/$as_base" -c ' - as_lineno_1=$LINENO - as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then - $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } - $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } - CONFIG_SHELL=$as_dir/$as_base - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$0" ${1+"$@"} - fi;; - esac - done -done -;; - esac - - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line before each line; the second 'sed' does the real - # work. The second script uses 'N' to pair each line-number line - # with the numbered line, and appends trailing '-' during - # substitution so that $LINENO is not a special case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) - sed '=' <$as_myself | - sed ' - N - s,$,-, - : loop - s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, - t loop - s,-$,, - s,^['$as_cr_digits']*\n,, - ' >$as_me.lineno && - chmod +x $as_me.lineno || - { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 -echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;} - { (exit 1); exit 1; }; } - - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensible to this). - . ./$as_me.lineno - # Exit status is that of the last command. - exit -} - - -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in - *c*,-n*) ECHO_N= ECHO_C=' -' ECHO_T=' ' ;; - *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; - *) ECHO_N= ECHO_C='\c' ECHO_T= ;; -esac - -if expr a : '\(a\)' >/dev/null 2>&1; then - as_expr=expr -else - as_expr=false -fi - -rm -f conf$$ conf$$.exe conf$$.file -echo >conf$$.file -if ln -s conf$$.file conf$$ 2>/dev/null; then - # We could just check for DJGPP; but this test a) works b) is more generic - # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). - if test -f conf$$.exe; then - # Don't use ln at all; we don't have any links - as_ln_s='cp -p' - else - as_ln_s='ln -s' - fi -elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln -else - as_ln_s='cp -p' -fi -rm -f conf$$ conf$$.exe conf$$.file - -if mkdir -p . 2>/dev/null; then - as_mkdir_p=: -else - as_mkdir_p=false -fi - -as_executable_p="test -f" - -# Sed expression to map a string onto a valid CPP name. -as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" - -# Sed expression to map a string onto a valid variable name. -as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" - - -# IFS -# We need space, tab and new line, in precisely that order. -as_nl=' -' -IFS=" $as_nl" - -# CDPATH. -$as_unset CDPATH - -exec 6>&1 - -# Open the log real soon, to keep \$[0] and so on meaningful, and to -# report actual input values of CONFIG_FILES etc. instead of their -# values after options handling. Logging --version etc. is OK. -exec 5>>config.log -{ - echo - sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX -## Running $as_me. ## -_ASBOX -} >&5 -cat >&5 <<_CSEOF - -This file was extended by [LLVM] $as_me [1.0], which was -generated by GNU Autoconf 2.57. Invocation command line was - - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS - CONFIG_LINKS = $CONFIG_LINKS - CONFIG_COMMANDS = $CONFIG_COMMANDS - $ $0 $@ - -_CSEOF -echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5 -echo >&5 -_ACEOF - -# Files that config.status was made for. -if test -n "$ac_config_files"; then - echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS -fi - -if test -n "$ac_config_headers"; then - echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS -fi - -if test -n "$ac_config_links"; then - echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS -fi - -if test -n "$ac_config_commands"; then - echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS -fi - -cat >>$CONFIG_STATUS <<\_ACEOF - -ac_cs_usage="\ -\`$as_me' instantiates files from templates according to the -current configuration. - -Usage: $0 [OPTIONS] [FILE]... - - -h, --help print this help, then exit - -V, --version print version number, then exit - -q, --quiet do not print progress messages - -d, --debug don't remove temporary files - --recheck update $as_me by reconfiguring in the same conditions - --file=FILE[:TEMPLATE] - instantiate the configuration file FILE - -Configuration files: -$config_files - -Report bugs to ." -_ACEOF - -cat >>$CONFIG_STATUS <<_ACEOF -ac_cs_version="\\ -[LLVM] config.status [1.0] -configured by $0, generated by GNU Autoconf 2.57, - with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" - -Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 -Free Software Foundation, Inc. -This config.status script is free software; the Free Software Foundation -gives unlimited permission to copy, distribute and modify it." -srcdir=$srcdir -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF -# If no file are specified by the user, then we need to provide default -# value. By we need to know if files were specified by the user. -ac_need_defaults=: -while test $# != 0 -do - case $1 in - --*=*) - ac_option=`expr "x$1" : 'x\([^=]*\)='` - ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` - ac_shift=: - ;; - -*) - ac_option=$1 - ac_optarg=$2 - ac_shift=shift - ;; - *) # This is not an option, so the user has probably given explicit - # arguments. - ac_option=$1 - ac_need_defaults=false;; - esac - - case $ac_option in - # Handling of the options. -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - ac_cs_recheck=: ;; - --version | --vers* | -V ) - echo "$ac_cs_version"; exit 0 ;; - --he | --h) - # Conflict between --help and --header - { { echo "$as_me:$LINENO: error: ambiguous option: $1 -Try \`$0 --help' for more information." >&5 -echo "$as_me: error: ambiguous option: $1 -Try \`$0 --help' for more information." >&2;} - { (exit 1); exit 1; }; };; - --help | --hel | -h ) - echo "$ac_cs_usage"; exit 0 ;; - --debug | --d* | -d ) - debug=: ;; - --file | --fil | --fi | --f ) - $ac_shift - CONFIG_FILES="$CONFIG_FILES $ac_optarg" - ac_need_defaults=false;; - --header | --heade | --head | --hea ) - $ac_shift - CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" - ac_need_defaults=false;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil | --si | --s) - ac_cs_silent=: ;; - - # This is an error. - -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&5 -echo "$as_me: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&2;} - { (exit 1); exit 1; }; } ;; - - *) ac_config_targets="$ac_config_targets $1" ;; - - esac - shift -done - -ac_configure_extra_args= - -if $ac_cs_silent; then - exec 6>/dev/null - ac_configure_extra_args="$ac_configure_extra_args --silent" -fi - -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF -if \$ac_cs_recheck; then - echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 - exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion -fi - -_ACEOF - - - - - -cat >>$CONFIG_STATUS <<\_ACEOF -for ac_config_target in $ac_config_targets -do - case "$ac_config_target" in - # Handling of arguments. - "Makefile.config" ) CONFIG_FILES="$CONFIG_FILES Makefile.config" ;; - *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 -echo "$as_me: error: invalid argument: $ac_config_target" >&2;} - { (exit 1); exit 1; }; };; - esac -done - -# If the user did not use the arguments to specify the items to instantiate, -# then the envvar interface is used. Set only those that are not. -# We use the long form for the default assignment because of an extremely -# bizarre bug on SunOS 4.1.3. -if $ac_need_defaults; then - test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files -fi - -# Have a temporary directory for convenience. Make it in the build tree -# simply because there is no reason to put it here, and in addition, -# creating and moving files from /tmp can sometimes cause problems. -# Create a temporary directory, and hook for its removal unless debugging. -$debug || -{ - trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 - trap '{ (exit 1); exit 1; }' 1 2 13 15 -} - -# Create a (secure) tmp directory for tmp files. - -{ - tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` && - test -n "$tmp" && test -d "$tmp" -} || -{ - tmp=./confstat$$-$RANDOM - (umask 077 && mkdir $tmp) -} || -{ - echo "$me: cannot create a temporary directory in ." >&2 - { (exit 1); exit 1; } -} - -_ACEOF - -cat >>$CONFIG_STATUS <<_ACEOF - -# -# CONFIG_FILES section. -# - -# No need to generate the scripts if there are no CONFIG_FILES. -# This happens for instance when ./config.status config.h -if test -n "\$CONFIG_FILES"; then - # Protect against being on the right side of a sed subst in config.status. - sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g; - s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF -s, at SHELL@,$SHELL,;t t -s, at PATH_SEPARATOR@,$PATH_SEPARATOR,;t t -s, at PACKAGE_NAME@,$PACKAGE_NAME,;t t -s, at PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t -s, at PACKAGE_VERSION@,$PACKAGE_VERSION,;t t -s, at PACKAGE_STRING@,$PACKAGE_STRING,;t t -s, at PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t -s, at exec_prefix@,$exec_prefix,;t t -s, at prefix@,$prefix,;t t -s, at program_transform_name@,$program_transform_name,;t t -s, at bindir@,$bindir,;t t -s, at sbindir@,$sbindir,;t t -s, at libexecdir@,$libexecdir,;t t -s, at datadir@,$datadir,;t t -s, at sysconfdir@,$sysconfdir,;t t -s, at sharedstatedir@,$sharedstatedir,;t t -s, at localstatedir@,$localstatedir,;t t -s, at libdir@,$libdir,;t t -s, at includedir@,$includedir,;t t -s, at oldincludedir@,$oldincludedir,;t t -s, at infodir@,$infodir,;t t -s, at mandir@,$mandir,;t t -s, at build_alias@,$build_alias,;t t -s, at host_alias@,$host_alias,;t t -s, at target_alias@,$target_alias,;t t -s, at DEFS@,$DEFS,;t t -s, at ECHO_C@,$ECHO_C,;t t -s, at ECHO_N@,$ECHO_N,;t t -s, at ECHO_T@,$ECHO_T,;t t -s, at LIBS@,$LIBS,;t t -s, at LLVM_SRC@,$LLVM_SRC,;t t -s, at LLVM_OBJ@,$LLVM_OBJ,;t t -s, at LIBOBJS@,$LIBOBJS,;t t -s, at LTLIBOBJS@,$LTLIBOBJS,;t t -CEOF - -_ACEOF - - cat >>$CONFIG_STATUS <<\_ACEOF - # Split the substitutions into bite-sized pieces for seds with - # small command number limits, like on Digital OSF/1 and HP-UX. - ac_max_sed_lines=48 - ac_sed_frag=1 # Number of current file. - ac_beg=1 # First line for current file. - ac_end=$ac_max_sed_lines # Line after last line for current file. - ac_more_lines=: - ac_sed_cmds= - while $ac_more_lines; do - if test $ac_beg -gt 1; then - sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag - else - sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag - fi - if test ! -s $tmp/subs.frag; then - ac_more_lines=false - else - # The purpose of the label and of the branching condition is to - # speed up the sed processing (if there are no `@' at all, there - # is no need to browse any of the substitutions). - # These are the two extra sed commands mentioned above. - (echo ':t - /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed - if test -z "$ac_sed_cmds"; then - ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" - else - ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" - fi - ac_sed_frag=`expr $ac_sed_frag + 1` - ac_beg=$ac_end - ac_end=`expr $ac_end + $ac_max_sed_lines` - fi - done - if test -z "$ac_sed_cmds"; then - ac_sed_cmds=cat - fi -fi # test -n "$CONFIG_FILES" - -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF -for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". - case $ac_file in - - | *:- | *:-:* ) # input from stdin - cat >$tmp/stdin - ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - * ) ac_file_in=$ac_file.in ;; - esac - - # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. - ac_dir=`(dirname "$ac_file") 2>/dev/null || -$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$ac_file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - { if $as_mkdir_p; then - mkdir -p "$ac_dir" - else - as_dir="$ac_dir" - as_dirs= - while test ! -d "$as_dir"; do - as_dirs="$as_dir $as_dirs" - as_dir=`(dirname "$as_dir") 2>/dev/null || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - done - test ! -n "$as_dirs" || mkdir $as_dirs - fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} - { (exit 1); exit 1; }; }; } - - ac_builddir=. - -if test "$ac_dir" != .; then - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A "../" for each directory in $ac_dir_suffix. - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` -else - ac_dir_suffix= ac_top_builddir= -fi - -case $srcdir in - .) # No --srcdir option. We are building in place. - ac_srcdir=. - if test -z "$ac_top_builddir"; then - ac_top_srcdir=. - else - ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` - fi ;; - [\\/]* | ?:[\\/]* ) # Absolute path. - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir ;; - *) # Relative path. - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_builddir$srcdir ;; -esac -# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be -# absolute. -ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` -ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` -ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` -ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` - - - - if test x"$ac_file" != x-; then - { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} - rm -f "$ac_file" - fi - # Let's still pretend it is `configure' which instantiates (i.e., don't - # use $as_me), people would be surprised to read: - # /* config.h. Generated by config.status. */ - if test x"$ac_file" = x-; then - configure_input= - else - configure_input="$ac_file. " - fi - configure_input=$configure_input"Generated from `echo $ac_file_in | - sed 's,.*/,,'` by configure." - - # First look for the input files in the build tree, otherwise in the - # src tree. - ac_file_inputs=`IFS=: - for f in $ac_file_in; do - case $f in - -) echo $tmp/stdin ;; - [\\/$]*) - # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - echo $f;; - *) # Relative - if test -f "$f"; then - # Build tree - echo $f - elif test -f "$srcdir/$f"; then - # Source tree - echo $srcdir/$f - else - # /dev/null tree - { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - fi;; - esac - done` || { (exit 1); exit 1; } -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF - sed "$ac_vpsub -$extrasub -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF -:t -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b -s, at configure_input@,$configure_input,;t t -s, at srcdir@,$ac_srcdir,;t t -s, at abs_srcdir@,$ac_abs_srcdir,;t t -s, at top_srcdir@,$ac_top_srcdir,;t t -s, at abs_top_srcdir@,$ac_abs_top_srcdir,;t t -s, at builddir@,$ac_builddir,;t t -s, at abs_builddir@,$ac_abs_builddir,;t t -s, at top_builddir@,$ac_top_builddir,;t t -s, at abs_top_builddir@,$ac_abs_top_builddir,;t t -" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out - rm -f $tmp/stdin - if test x"$ac_file" != x-; then - mv $tmp/out $ac_file - else - cat $tmp/out - rm -f $tmp/out - fi - -done -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF - -{ (exit 0); exit 0; } -_ACEOF -chmod +x $CONFIG_STATUS -ac_clean_files=$ac_clean_files_save - - -# configure is writing to config.log, and then calls config.status. -# config.status does its own redirection, appending to config.log. -# Unfortunately, on DOS this fails, as config.log is still kept open -# by configure, so config.status won't be able to write to it; its -# output is simply discarded. So we exec the FD to /dev/null, -# effectively closing config.log, so it can be properly (re)opened and -# appended to by config.status. When coming back to configure, we -# need to make the FD available again. -if test "$no_create" != yes; then - ac_cs_success=: - ac_config_status_args= - test "$silent" = yes && - ac_config_status_args="$ac_config_status_args --quiet" - exec 5>/dev/null - $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false - exec 5>>config.log - # Use ||, not &&, to avoid exiting from the if with $? = 1, which - # would make configure fail if this is the last instruction. - $ac_cs_success || { (exit 1); exit 1; } -fi - ac_config_files="$ac_config_files Makefile.common" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -2681,7 +1813,6 @@ do case "$ac_config_target" in # Handling of arguments. - "Makefile.config" ) CONFIG_FILES="$CONFIG_FILES Makefile.config" ;; "Makefile.common" ) CONFIG_FILES="$CONFIG_FILES Makefile.common" ;; *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} From criswell at cs.uiuc.edu Wed Sep 10 10:14:09 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Wed Sep 10 10:14:09 2003 Subject: [llvm-commits] CVS: poolalloc/autoconf/configure.ac Message-ID: <200309101513.KAA05491@choi.cs.uiuc.edu> Changes in directory poolalloc/autoconf: configure.ac updated: 1.1.1.1 -> 1.2 --- Log message: Updated to use the new autoconf-style object root directory. Removed the local project's Makefile.config as it is no longer needed. Switched to including Makefile.config and Makefile.rules from the LLVM source tree. --- Diffs of the changes: Index: poolalloc/autoconf/configure.ac diff -u poolalloc/autoconf/configure.ac:1.1.1.1 poolalloc/autoconf/configure.ac:1.2 --- poolalloc/autoconf/configure.ac:1.1.1.1 Mon Aug 11 16:29:15 2003 +++ poolalloc/autoconf/configure.ac Wed Sep 10 10:13:02 2003 @@ -32,7 +32,7 @@ dnl ************************************************************************** dnl Verify that the source directory is valid -AC_CONFIG_SRCDIR(["Makefile.config.in"]) +AC_CONFIG_SRCDIR(["Makefile.common.in"]) dnl ************************************************************************** dnl * Check for libraries. @@ -74,5 +74,4 @@ dnl ************************************************************************** dnl * Create the output files dnl ************************************************************************** -AC_OUTPUT(Makefile.config) AC_OUTPUT(Makefile.common) From lattner at cs.uiuc.edu Wed Sep 10 10:14:14 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Wed Sep 10 10:14:14 2003 Subject: [llvm-commits] CVS: llvm/autoconf/configure.ac Message-ID: <200309101513.KAA25839@apoc.cs.uiuc.edu> Changes in directory llvm/autoconf: configure.ac updated: 1.8 -> 1.9 --- Log message: Add missing runtime directories --- Diffs of the changes: Index: llvm/autoconf/configure.ac diff -u llvm/autoconf/configure.ac:1.8 llvm/autoconf/configure.ac:1.9 --- llvm/autoconf/configure.ac:1.8 Tue Sep 9 15:52:17 2003 +++ llvm/autoconf/configure.ac Wed Sep 10 10:13:21 2003 @@ -60,11 +60,16 @@ AC_CONFIG_MAKEFILE(runtime/GCCLibraries/Makefile) AC_CONFIG_MAKEFILE(runtime/GCCLibraries/crtend/Makefile) AC_CONFIG_MAKEFILE(runtime/GCCLibraries/libc/Makefile) +AC_CONFIG_MAKEFILE(runtime/GCCLibraries/libcurses/Makefile) +AC_CONFIG_MAKEFILE(runtime/GCCLibraries/libexception/Makefile) AC_CONFIG_MAKEFILE(runtime/GCCLibraries/libg/Makefile) AC_CONFIG_MAKEFILE(runtime/GCCLibraries/libgcc/Makefile) AC_CONFIG_MAKEFILE(runtime/GCCLibraries/libm/Makefile) AC_CONFIG_MAKEFILE(runtime/GCCLibraries/libmalloc/Makefile) +AC_CONFIG_MAKEFILE(runtime/GCCLibraries/libtermcap/Makefile) AC_CONFIG_MAKEFILE(runtime/GCCLibraries/libucb/Makefile) +AC_CONFIG_MAKEFILE(runtime/GCCLibraries/libutempter/Makefile) +AC_CONFIG_MAKEFILE(runtime/GCCLibraries/libutil/Makefile) AC_CONFIG_MAKEFILE(runtime/libdummy/Makefile) AC_CONFIG_MAKEFILE(runtime/libtrace/Makefile) AC_CONFIG_MAKEFILE(test/Makefile) From criswell at cs.uiuc.edu Wed Sep 10 10:18:05 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Wed Sep 10 10:18:05 2003 Subject: [llvm-commits] CVS: llvm/configure Message-ID: <200309101517.KAA05595@choi.cs.uiuc.edu> Changes in directory llvm: configure updated: 1.15 -> 1.16 --- Log message: Regenerated for Chris's updates, which adds several runtime library directories. --- Diffs of the changes: Index: llvm/configure diff -u llvm/configure:1.15 llvm/configure:1.16 --- llvm/configure:1.15 Tue Sep 9 15:52:15 2003 +++ llvm/configure Wed Sep 10 10:17:25 2003 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.53 for [LLVM] [1.0]. +# Generated by GNU Autoconf 2.57 for [LLVM] [1.0]. # # Report bugs to . # @@ -8,168 +8,6 @@ # Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. - - -# Check that we are running under the correct shell. -SHELL=${CONFIG_SHELL-/bin/sh} - -case X$ECHO in -X*--fallback-echo) - # Remove one level of quotation (which was required for Make). - ECHO=`echo "$ECHO" | sed 's,\\\\\$\\$0,'$0','` - ;; -esac - -echo=${ECHO-echo} -if test "X$1" = X--no-reexec; then - # Discard the --no-reexec flag, and continue. - shift -elif test "X$1" = X--fallback-echo; then - # Avoid inline document here, it may be left over - : -elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then - # Yippee, $echo works! - : -else - # Restart under the correct shell. - exec $SHELL "$0" --no-reexec ${1+"$@"} -fi - -if test "X$1" = X--fallback-echo; then - # used as fallback echo - shift - cat </dev/null && - echo_test_string="`eval $cmd`" && - (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null - then - break - fi - done -fi - -if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - : -else - # The Solaris, AIX, and Digital Unix default echo programs unquote - # backslashes. This makes it impossible to quote backslashes using - # echo "$something" | sed 's/\\/\\\\/g' - # - # So, first we look for a working echo in the user's PATH. - - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for dir in $PATH /usr/ucb; do - IFS="$lt_save_ifs" - if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && - test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - echo="$dir/echo" - break - fi - done - IFS="$lt_save_ifs" - - if test "X$echo" = Xecho; then - # We didn't find a better echo, so look for alternatives. - if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - # This shell has a builtin print -r that does the trick. - echo='print -r' - elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) && - test "X$CONFIG_SHELL" != X/bin/ksh; then - # If we have ksh, try running configure again with it. - ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} - export ORIGINAL_CONFIG_SHELL - CONFIG_SHELL=/bin/ksh - export CONFIG_SHELL - exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"} - else - # Try using printf. - echo='printf %s\n' - if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - # Cool, printf works - : - elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && - test "X$echo_testing_string" = 'X\t' && - echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL - export CONFIG_SHELL - SHELL="$CONFIG_SHELL" - export SHELL - echo="$CONFIG_SHELL $0 --fallback-echo" - elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && - test "X$echo_testing_string" = 'X\t' && - echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - echo="$CONFIG_SHELL $0 --fallback-echo" - else - # maybe with a smaller string... - prev=: - - for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do - if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null - then - break - fi - prev="$cmd" - done - - if test "$prev" != 'sed 50q "$0"'; then - echo_test_string=`eval $prev` - export echo_test_string - exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"} - else - # Oops. We lost completely, so just stick with echo. - echo=echo - fi - fi - fi - fi -fi -fi - -# Copy echo and quote the copy suitably for passing to libtool from -# the Makefile, instead of quoting the original, which is used later. -ECHO=$echo -if test "X$ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then - ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo" -fi - - - - -tagnames=`echo "$tagnames,CXX" | sed 's/^,//'` - -tagnames=`echo "$tagnames,F77" | sed 's/^,//'` - -if expr a : '\(a\)' >/dev/null 2>&1; then - as_expr=expr -else - as_expr=false -fi - - ## --------------------- ## ## M4sh Initialization. ## ## --------------------- ## @@ -178,11 +16,13 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then set -o posix fi -# NLS nuisances. # Support unset when possible. if (FOO=FOO; unset FOO) >/dev/null 2>&1; then as_unset=unset @@ -190,34 +30,42 @@ as_unset=false fi -(set +x; test -n "`(LANG=C; export LANG) 2>&1`") && - { $as_unset LANG || test "${LANG+set}" != set; } || - { LANG=C; export LANG; } -(set +x; test -n "`(LC_ALL=C; export LC_ALL) 2>&1`") && - { $as_unset LC_ALL || test "${LC_ALL+set}" != set; } || - { LC_ALL=C; export LC_ALL; } -(set +x; test -n "`(LC_TIME=C; export LC_TIME) 2>&1`") && - { $as_unset LC_TIME || test "${LC_TIME+set}" != set; } || - { LC_TIME=C; export LC_TIME; } -(set +x; test -n "`(LC_CTYPE=C; export LC_CTYPE) 2>&1`") && - { $as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set; } || - { LC_CTYPE=C; export LC_CTYPE; } -(set +x; test -n "`(LANGUAGE=C; export LANGUAGE) 2>&1`") && - { $as_unset LANGUAGE || test "${LANGUAGE+set}" != set; } || - { LANGUAGE=C; export LANGUAGE; } -(set +x; test -n "`(LC_COLLATE=C; export LC_COLLATE) 2>&1`") && - { $as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set; } || - { LC_COLLATE=C; export LC_COLLATE; } -(set +x; test -n "`(LC_NUMERIC=C; export LC_NUMERIC) 2>&1`") && - { $as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set; } || - { LC_NUMERIC=C; export LC_NUMERIC; } -(set +x; test -n "`(LC_MESSAGES=C; export LC_MESSAGES) 2>&1`") && - { $as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set; } || - { LC_MESSAGES=C; export LC_MESSAGES; } + +# Work around bugs in pre-3.0 UWIN ksh. +$as_unset ENV MAIL MAILPATH +PS1='$ ' +PS2='> ' +PS4='+ ' + +# NLS nuisances. +for as_var in \ + LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ + LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ + LC_TELEPHONE LC_TIME +do + if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then + eval $as_var=C; export $as_var + else + $as_unset $as_var + fi +done + +# Required to use basename. +if expr a : '\(a\)' >/dev/null 2>&1; then + as_expr=expr +else + as_expr=false +fi + +if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false +fi # Name of the executable. -as_me=`(basename "$0") 2>/dev/null || +as_me=`$as_basename "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)$' \| \ @@ -228,6 +76,7 @@ /^X\/\(\/\).*/{ s//\1/; q; } s/.*/./; q'` + # PATH needs CR, and LINENO needs CR and PATH. # Avoid depending upon Character Ranges. as_cr_letters='abcdefghijklmnopqrstuvwxyz' @@ -238,15 +87,15 @@ # The user is always right. if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conftest.sh - echo "exit 0" >>conftest.sh - chmod +x conftest.sh - if (PATH=".;."; conftest.sh) >/dev/null 2>&1; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then PATH_SEPARATOR=';' else PATH_SEPARATOR=: fi - rm -f conftest.sh + rm -f conf$$.sh fi @@ -294,6 +143,8 @@ as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` test "x$as_lineno_1" != "x$as_lineno_2" && test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then + $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } + $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } CONFIG_SHELL=$as_dir/$as_base export CONFIG_SHELL exec "$CONFIG_SHELL" "$0" ${1+"$@"} @@ -366,6 +217,12 @@ fi rm -f conf$$ conf$$.exe conf$$.file +if mkdir -p . 2>/dev/null; then + as_mkdir_p=: +else + as_mkdir_p=false +fi + as_executable_p="test -f" # Sed expression to map a string onto a valid CPP name. @@ -381,9 +238,163 @@ ' IFS=" $as_nl" -# CDPATH. -$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=$PATH_SEPARATOR; export CDPATH; } +# CDPATH. +$as_unset CDPATH + + + +# Check that we are running under the correct shell. +SHELL=${CONFIG_SHELL-/bin/sh} + +case X$ECHO in +X*--fallback-echo) + # Remove one level of quotation (which was required for Make). + ECHO=`echo "$ECHO" | sed 's,\\\\\$\\$0,'$0','` + ;; +esac + +echo=${ECHO-echo} +if test "X$1" = X--no-reexec; then + # Discard the --no-reexec flag, and continue. + shift +elif test "X$1" = X--fallback-echo; then + # Avoid inline document here, it may be left over + : +elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then + # Yippee, $echo works! + : +else + # Restart under the correct shell. + exec $SHELL "$0" --no-reexec ${1+"$@"} +fi + +if test "X$1" = X--fallback-echo; then + # used as fallback echo + shift + cat </dev/null && + echo_test_string="`eval $cmd`" && + (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null + then + break + fi + done +fi + +if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && + echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + : +else + # The Solaris, AIX, and Digital Unix default echo programs unquote + # backslashes. This makes it impossible to quote backslashes using + # echo "$something" | sed 's/\\/\\\\/g' + # + # So, first we look for a working echo in the user's PATH. + + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for dir in $PATH /usr/ucb; do + IFS="$lt_save_ifs" + if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && + test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && + echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + echo="$dir/echo" + break + fi + done + IFS="$lt_save_ifs" + + if test "X$echo" = Xecho; then + # We didn't find a better echo, so look for alternatives. + if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' && + echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + # This shell has a builtin print -r that does the trick. + echo='print -r' + elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) && + test "X$CONFIG_SHELL" != X/bin/ksh; then + # If we have ksh, try running configure again with it. + ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} + export ORIGINAL_CONFIG_SHELL + CONFIG_SHELL=/bin/ksh + export CONFIG_SHELL + exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"} + else + # Try using printf. + echo='printf %s\n' + if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && + echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + # Cool, printf works + : + elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && + test "X$echo_testing_string" = 'X\t' && + echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL + export CONFIG_SHELL + SHELL="$CONFIG_SHELL" + export SHELL + echo="$CONFIG_SHELL $0 --fallback-echo" + elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && + test "X$echo_testing_string" = 'X\t' && + echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + echo="$CONFIG_SHELL $0 --fallback-echo" + else + # maybe with a smaller string... + prev=: + + for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do + if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null + then + break + fi + prev="$cmd" + done + + if test "$prev" != 'sed 50q "$0"'; then + echo_test_string=`eval $prev` + export echo_test_string + exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"} + else + # Oops. We lost completely, so just stick with echo. + echo=echo + fi + fi + fi + fi +fi +fi + +# Copy echo and quote the copy suitably for passing to libtool from +# the Makefile, instead of quoting the original, which is used later. +ECHO=$echo +if test "X$ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then + ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo" +fi + + + + +tagnames=`echo "$tagnames,CXX" | sed 's/^,//'` +tagnames=`echo "$tagnames,F77" | sed 's/^,//'` # Name of the host. # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, @@ -396,6 +407,7 @@ # Initializations. # ac_default_prefix=/usr/local +ac_config_libobj_dir=. cross_compiling=no subdirs= MFLAGS= @@ -452,6 +464,8 @@ #endif" ac_unique_file=""Makefile.config.in"" +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os OS LLVMGCCDIR ARCH CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT CC CFLAGS ac_ct_CC CPP ifGNUmake LEX LEXLIB LEX_OUTPUT_ROOT YACC EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL RPWD SED RM MKDIR DATE MV DOT ETAGS PURIFY PYTHON QMTEST ALLOCA LIBOBJS MMAP_FILE ENABLE_PURIFY ENABLE_OPTIMIZED USE_SPEC UPB DISABLE_LLC_DIFFS JIT SPEC_ROOT BCR PAPIDIR LTLIBOBJS' +ac_subst_files='' # Initialize some variables set by options. ac_init_help= @@ -875,6 +889,9 @@ { (exit 1); exit 1; }; } fi fi +(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || + { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 + { (exit 1); exit 1; }; } srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` ac_env_build_alias_set=${build_alias+set} ac_env_build_alias_value=$build_alias @@ -1088,7 +1105,7 @@ # Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be # absolute. ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` -ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd` +ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` @@ -1115,7 +1132,7 @@ if $ac_init_version; then cat <<\_ACEOF [LLVM] configure [1.0] -generated by GNU Autoconf 2.53 +generated by GNU Autoconf 2.57 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. @@ -1130,7 +1147,7 @@ running configure, to aid debugging if configure makes a mistake. It was created by [LLVM] $as_me [1.0], which was -generated by GNU Autoconf 2.53. Invocation command line was +generated by GNU Autoconf 2.57. Invocation command line was $ $0 $@ @@ -1182,27 +1199,54 @@ # Keep a trace of the command line. # Strip out --no-create and --no-recursion so they do not pile up. +# Strip out --silent because we don't want to record it for future runs. # Also quote any args containing shell meta-characters. +# Make two passes to allow for proper duplicate-argument suppression. ac_configure_args= +ac_configure_args0= +ac_configure_args1= ac_sep= -for ac_arg +ac_must_keep_next=false +for ac_pass in 1 2 do - case $ac_arg in - -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c | -n ) continue ;; - -no-recursion | --no-recursion | --no-recursio | --no-recursi \ - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) - continue ;; - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) - ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - case " $ac_configure_args " in - *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. - *) ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" - ac_sep=" " ;; - esac - # Get rid of the leading space. + for ac_arg + do + case $ac_arg in + -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil) + continue ;; + *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) + ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + case $ac_pass in + 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; + 2) + ac_configure_args1="$ac_configure_args1 '$ac_arg'" + if test $ac_must_keep_next = true; then + ac_must_keep_next=false # Got value, back to normal. + else + case $ac_arg in + *=* | --config-cache | -C | -disable-* | --disable-* \ + | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ + | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ + | -with-* | --with-* | -without-* | --without-* | --x) + case "$ac_configure_args0 " in + "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; + esac + ;; + -* ) ac_must_keep_next=true ;; + esac + fi + ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" + # Get rid of the leading space. + ac_sep=" " + ;; + esac + done done +$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } +$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } # When interrupted or exit'd, cleanup temporary files, and complete # config.log. We remove comments because anyway the quotes in there @@ -1213,6 +1257,7 @@ # Save into config.log some information that might help in debugging. { echo + cat <<\_ASBOX ## ---------------- ## ## Cache variables. ## @@ -1235,6 +1280,35 @@ esac; } echo + + cat <<\_ASBOX +## ----------------- ## +## Output variables. ## +## ----------------- ## +_ASBOX + echo + for ac_var in $ac_subst_vars + do + eval ac_val=$`echo $ac_var` + echo "$ac_var='"'"'$ac_val'"'"'" + done | sort + echo + + if test -n "$ac_subst_files"; then + cat <<\_ASBOX +## ------------- ## +## Output files. ## +## ------------- ## +_ASBOX + echo + for ac_var in $ac_subst_files + do + eval ac_val=$`echo $ac_var` + echo "$ac_var='"'"'$ac_val'"'"'" + done | sort + echo + fi + if test -s confdefs.h; then cat <<\_ASBOX ## ----------- ## @@ -1242,7 +1316,7 @@ ## ----------- ## _ASBOX echo - sed "/^$/d" confdefs.h + sed "/^$/d" confdefs.h | sort echo fi test "$ac_signal" != 0 && @@ -1408,6 +1482,7 @@ + ac_aux_dir= for ac_dir in autoconf $srcdir/autoconf; do if test -f $ac_dir/install-sh; then @@ -1434,492 +1509,492 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. -ac_config_headers="$ac_config_headers include/Config/config.h" + ac_config_headers="$ac_config_headers include/Config/config.h" -ac_config_commands="$ac_config_commands Makefile" + ac_config_commands="$ac_config_commands Makefile" -ac_config_commands="$ac_config_commands Makefile.common" + ac_config_commands="$ac_config_commands Makefile.common" -ac_config_commands="$ac_config_commands Makefile.rules" + ac_config_commands="$ac_config_commands Makefile.rules" -ac_config_commands="$ac_config_commands lib/Makefile" + ac_config_commands="$ac_config_commands lib/Makefile" -ac_config_commands="$ac_config_commands lib/Analysis/Makefile" + ac_config_commands="$ac_config_commands lib/Analysis/Makefile" -ac_config_commands="$ac_config_commands lib/Analysis/DataStructure/Makefile" + ac_config_commands="$ac_config_commands lib/Analysis/DataStructure/Makefile" -ac_config_commands="$ac_config_commands lib/Analysis/IPA/Makefile" + ac_config_commands="$ac_config_commands lib/Analysis/IPA/Makefile" -ac_config_commands="$ac_config_commands lib/Analysis/LiveVar/Makefile" + ac_config_commands="$ac_config_commands lib/Analysis/LiveVar/Makefile" -ac_config_commands="$ac_config_commands lib/AsmParser/Makefile" + ac_config_commands="$ac_config_commands lib/AsmParser/Makefile" -ac_config_commands="$ac_config_commands lib/Bytecode/Makefile" + ac_config_commands="$ac_config_commands lib/Bytecode/Makefile" -ac_config_commands="$ac_config_commands lib/Bytecode/Reader/Makefile" + ac_config_commands="$ac_config_commands lib/Bytecode/Reader/Makefile" -ac_config_commands="$ac_config_commands lib/Bytecode/Writer/Makefile" + ac_config_commands="$ac_config_commands lib/Bytecode/Writer/Makefile" -ac_config_commands="$ac_config_commands lib/CWriter/Makefile" + ac_config_commands="$ac_config_commands lib/CWriter/Makefile" -ac_config_commands="$ac_config_commands lib/CodeGen/Makefile" + ac_config_commands="$ac_config_commands lib/CodeGen/Makefile" -ac_config_commands="$ac_config_commands lib/CodeGen/InstrSched/Makefile" + ac_config_commands="$ac_config_commands lib/CodeGen/InstrSched/Makefile" -ac_config_commands="$ac_config_commands lib/CodeGen/InstrSelection/Makefile" + ac_config_commands="$ac_config_commands lib/CodeGen/InstrSelection/Makefile" -ac_config_commands="$ac_config_commands lib/CodeGen/ModuloScheduling/Makefile" + ac_config_commands="$ac_config_commands lib/CodeGen/ModuloScheduling/Makefile" -ac_config_commands="$ac_config_commands lib/CodeGen/RegAlloc/Makefile" + ac_config_commands="$ac_config_commands lib/CodeGen/RegAlloc/Makefile" -ac_config_commands="$ac_config_commands lib/CodeGen/SelectionDAG/Makefile" + ac_config_commands="$ac_config_commands lib/CodeGen/SelectionDAG/Makefile" -ac_config_commands="$ac_config_commands lib/ExecutionEngine/Makefile" + ac_config_commands="$ac_config_commands lib/ExecutionEngine/Makefile" -ac_config_commands="$ac_config_commands lib/ExecutionEngine/Interpreter/Makefile" + ac_config_commands="$ac_config_commands lib/ExecutionEngine/Interpreter/Makefile" -ac_config_commands="$ac_config_commands lib/ExecutionEngine/JIT/Makefile" + ac_config_commands="$ac_config_commands lib/ExecutionEngine/JIT/Makefile" -ac_config_commands="$ac_config_commands lib/Support/Makefile" + ac_config_commands="$ac_config_commands lib/Support/Makefile" -ac_config_commands="$ac_config_commands lib/Target/Makefile" + ac_config_commands="$ac_config_commands lib/Target/Makefile" -ac_config_commands="$ac_config_commands lib/Target/Sparc/Makefile" + ac_config_commands="$ac_config_commands lib/Target/Sparc/Makefile" -ac_config_commands="$ac_config_commands lib/Target/X86/Makefile" + ac_config_commands="$ac_config_commands lib/Target/X86/Makefile" -ac_config_commands="$ac_config_commands lib/Transforms/Makefile" + ac_config_commands="$ac_config_commands lib/Transforms/Makefile" -ac_config_commands="$ac_config_commands lib/Transforms/Hello/Makefile" + ac_config_commands="$ac_config_commands lib/Transforms/Hello/Makefile" -ac_config_commands="$ac_config_commands lib/Transforms/IPO/Makefile" + ac_config_commands="$ac_config_commands lib/Transforms/IPO/Makefile" -ac_config_commands="$ac_config_commands lib/Transforms/Instrumentation/Makefile" + ac_config_commands="$ac_config_commands lib/Transforms/Instrumentation/Makefile" -ac_config_commands="$ac_config_commands lib/Transforms/Instrumentation/ProfilePaths/Makefile" + ac_config_commands="$ac_config_commands lib/Transforms/Instrumentation/ProfilePaths/Makefile" -ac_config_commands="$ac_config_commands lib/Transforms/Scalar/Makefile" + ac_config_commands="$ac_config_commands lib/Transforms/Scalar/Makefile" -ac_config_commands="$ac_config_commands lib/Transforms/Utils/Makefile" + ac_config_commands="$ac_config_commands lib/Transforms/Utils/Makefile" -ac_config_commands="$ac_config_commands lib/VMCore/Makefile" + ac_config_commands="$ac_config_commands lib/VMCore/Makefile" -ac_config_commands="$ac_config_commands runtime/Makefile" + ac_config_commands="$ac_config_commands runtime/Makefile" -ac_config_commands="$ac_config_commands runtime/GCCLibraries/Makefile" + ac_config_commands="$ac_config_commands runtime/GCCLibraries/Makefile" -ac_config_commands="$ac_config_commands runtime/GCCLibraries/crtend/Makefile" + ac_config_commands="$ac_config_commands runtime/GCCLibraries/crtend/Makefile" -ac_config_commands="$ac_config_commands runtime/GCCLibraries/libc/Makefile" + ac_config_commands="$ac_config_commands runtime/GCCLibraries/libc/Makefile" -ac_config_commands="$ac_config_commands runtime/GCCLibraries/libg/Makefile" + ac_config_commands="$ac_config_commands runtime/GCCLibraries/libg/Makefile" -ac_config_commands="$ac_config_commands runtime/GCCLibraries/libgcc/Makefile" + ac_config_commands="$ac_config_commands runtime/GCCLibraries/libgcc/Makefile" -ac_config_commands="$ac_config_commands runtime/GCCLibraries/libm/Makefile" + ac_config_commands="$ac_config_commands runtime/GCCLibraries/libm/Makefile" -ac_config_commands="$ac_config_commands runtime/GCCLibraries/libmalloc/Makefile" + ac_config_commands="$ac_config_commands runtime/GCCLibraries/libmalloc/Makefile" -ac_config_commands="$ac_config_commands runtime/GCCLibraries/libucb/Makefile" + ac_config_commands="$ac_config_commands runtime/GCCLibraries/libucb/Makefile" -ac_config_commands="$ac_config_commands runtime/libdummy/Makefile" + ac_config_commands="$ac_config_commands runtime/libdummy/Makefile" -ac_config_commands="$ac_config_commands runtime/libtrace/Makefile" + ac_config_commands="$ac_config_commands runtime/libtrace/Makefile" -ac_config_commands="$ac_config_commands test/Makefile" + ac_config_commands="$ac_config_commands test/Makefile" -ac_config_commands="$ac_config_commands test/Makefile.tests" + ac_config_commands="$ac_config_commands test/Makefile.tests" -ac_config_commands="$ac_config_commands test/Programs/Makefile" + ac_config_commands="$ac_config_commands test/Programs/Makefile" -ac_config_commands="$ac_config_commands test/Programs/Makefile.programs" + ac_config_commands="$ac_config_commands test/Programs/Makefile.programs" -ac_config_commands="$ac_config_commands test/Programs/TEST.aa.Makefile" + ac_config_commands="$ac_config_commands test/Programs/TEST.aa.Makefile" -ac_config_commands="$ac_config_commands test/Programs/TEST.dsgraph.report" + ac_config_commands="$ac_config_commands test/Programs/TEST.dsgraph.report" -ac_config_commands="$ac_config_commands test/Programs/TEST.micro.report" + ac_config_commands="$ac_config_commands test/Programs/TEST.micro.report" -ac_config_commands="$ac_config_commands test/Programs/TEST.aa.report" + ac_config_commands="$ac_config_commands test/Programs/TEST.aa.report" -ac_config_commands="$ac_config_commands test/Programs/TEST.example.Makefile" + ac_config_commands="$ac_config_commands test/Programs/TEST.example.Makefile" -ac_config_commands="$ac_config_commands test/Programs/TEST.nightly.Makefile" + ac_config_commands="$ac_config_commands test/Programs/TEST.nightly.Makefile" -ac_config_commands="$ac_config_commands test/Programs/TEST.buildrepo.Makefile" + ac_config_commands="$ac_config_commands test/Programs/TEST.buildrepo.Makefile" -ac_config_commands="$ac_config_commands test/Programs/TEST.jit.Makefile" + ac_config_commands="$ac_config_commands test/Programs/TEST.jit.Makefile" -ac_config_commands="$ac_config_commands test/Programs/TEST.nightly.report" + ac_config_commands="$ac_config_commands test/Programs/TEST.nightly.report" -ac_config_commands="$ac_config_commands test/Programs/TEST.dsgraph.Makefile" + ac_config_commands="$ac_config_commands test/Programs/TEST.dsgraph.Makefile" -ac_config_commands="$ac_config_commands test/Programs/TEST.jit.report" + ac_config_commands="$ac_config_commands test/Programs/TEST.jit.report" -ac_config_commands="$ac_config_commands test/Programs/TEST.typesafe.Makefile" + ac_config_commands="$ac_config_commands test/Programs/TEST.typesafe.Makefile" -ac_config_commands="$ac_config_commands test/Programs/TEST.dsgraph.gnuplot" + ac_config_commands="$ac_config_commands test/Programs/TEST.dsgraph.gnuplot" -ac_config_commands="$ac_config_commands test/Programs/TEST.micro.Makefile" + ac_config_commands="$ac_config_commands test/Programs/TEST.micro.Makefile" -ac_config_commands="$ac_config_commands test/Programs/External/Makefile" + ac_config_commands="$ac_config_commands test/Programs/External/Makefile" -ac_config_commands="$ac_config_commands test/Programs/External/SPEC/Makefile" + ac_config_commands="$ac_config_commands test/Programs/External/SPEC/Makefile" -ac_config_commands="$ac_config_commands test/Programs/External/SPEC/CFP2000/Makefile" + ac_config_commands="$ac_config_commands test/Programs/External/SPEC/CFP2000/Makefile" -ac_config_commands="$ac_config_commands test/Programs/External/SPEC/CFP2000/179.art/Makefile" + ac_config_commands="$ac_config_commands test/Programs/External/SPEC/CFP2000/179.art/Makefile" -ac_config_commands="$ac_config_commands test/Programs/External/SPEC/CFP2000/183.equake/Makefile" + ac_config_commands="$ac_config_commands test/Programs/External/SPEC/CFP2000/183.equake/Makefile" -ac_config_commands="$ac_config_commands test/Programs/External/SPEC/CFP2000/188.ammp/Makefile" + ac_config_commands="$ac_config_commands test/Programs/External/SPEC/CFP2000/188.ammp/Makefile" -ac_config_commands="$ac_config_commands test/Programs/External/SPEC/CINT2000/Makefile" + ac_config_commands="$ac_config_commands test/Programs/External/SPEC/CINT2000/Makefile" -ac_config_commands="$ac_config_commands test/Programs/External/SPEC/CINT2000/164.gzip/Makefile" + ac_config_commands="$ac_config_commands test/Programs/External/SPEC/CINT2000/164.gzip/Makefile" -ac_config_commands="$ac_config_commands test/Programs/External/SPEC/CINT2000/175.vpr/Makefile" + ac_config_commands="$ac_config_commands test/Programs/External/SPEC/CINT2000/175.vpr/Makefile" -ac_config_commands="$ac_config_commands test/Programs/External/SPEC/CINT2000/176.gcc/Makefile" + ac_config_commands="$ac_config_commands test/Programs/External/SPEC/CINT2000/176.gcc/Makefile" -ac_config_commands="$ac_config_commands test/Programs/External/SPEC/CINT2000/181.mcf/Makefile" + ac_config_commands="$ac_config_commands test/Programs/External/SPEC/CINT2000/181.mcf/Makefile" -ac_config_commands="$ac_config_commands test/Programs/External/SPEC/CINT2000/186.crafty/Makefile" + ac_config_commands="$ac_config_commands test/Programs/External/SPEC/CINT2000/186.crafty/Makefile" -ac_config_commands="$ac_config_commands test/Programs/External/SPEC/CINT2000/197.parser/Makefile" + ac_config_commands="$ac_config_commands test/Programs/External/SPEC/CINT2000/197.parser/Makefile" -ac_config_commands="$ac_config_commands test/Programs/External/SPEC/CINT2000/254.gap/Makefile" + ac_config_commands="$ac_config_commands test/Programs/External/SPEC/CINT2000/254.gap/Makefile" -ac_config_commands="$ac_config_commands test/Programs/External/SPEC/CINT2000/255.vortex/Makefile" + ac_config_commands="$ac_config_commands test/Programs/External/SPEC/CINT2000/255.vortex/Makefile" -ac_config_commands="$ac_config_commands test/Programs/External/SPEC/CINT2000/256.bzip2/Makefile" + ac_config_commands="$ac_config_commands test/Programs/External/SPEC/CINT2000/256.bzip2/Makefile" -ac_config_commands="$ac_config_commands test/Programs/External/SPEC/CINT2000/300.twolf/Makefile" + ac_config_commands="$ac_config_commands test/Programs/External/SPEC/CINT2000/300.twolf/Makefile" -ac_config_commands="$ac_config_commands test/Programs/LLVMSource/Makefile" + ac_config_commands="$ac_config_commands test/Programs/LLVMSource/Makefile" -ac_config_commands="$ac_config_commands test/Programs/MultiSource/Makefile" + ac_config_commands="$ac_config_commands test/Programs/MultiSource/Makefile" -ac_config_commands="$ac_config_commands test/Programs/MultiSource/Makefile.multisrc" + ac_config_commands="$ac_config_commands test/Programs/MultiSource/Makefile.multisrc" -ac_config_commands="$ac_config_commands test/Programs/MultiSource/Burg/Makefile" + ac_config_commands="$ac_config_commands test/Programs/MultiSource/Burg/Makefile" -ac_config_commands="$ac_config_commands test/Programs/MultiSource/Fhourstones/Makefile" + ac_config_commands="$ac_config_commands test/Programs/MultiSource/Fhourstones/Makefile" -ac_config_commands="$ac_config_commands test/Programs/MultiSource/McCat/Makefile" + ac_config_commands="$ac_config_commands test/Programs/MultiSource/McCat/Makefile" -ac_config_commands="$ac_config_commands test/Programs/MultiSource/McCat/01-qbsort/Makefile" + ac_config_commands="$ac_config_commands test/Programs/MultiSource/McCat/01-qbsort/Makefile" -ac_config_commands="$ac_config_commands test/Programs/MultiSource/McCat/03-testtrie/Makefile" + ac_config_commands="$ac_config_commands test/Programs/MultiSource/McCat/03-testtrie/Makefile" -ac_config_commands="$ac_config_commands test/Programs/MultiSource/McCat/04-bisect/Makefile" + ac_config_commands="$ac_config_commands test/Programs/MultiSource/McCat/04-bisect/Makefile" -ac_config_commands="$ac_config_commands test/Programs/MultiSource/McCat/05-eks/Makefile" + ac_config_commands="$ac_config_commands test/Programs/MultiSource/McCat/05-eks/Makefile" -ac_config_commands="$ac_config_commands test/Programs/MultiSource/McCat/08-main/Makefile" + ac_config_commands="$ac_config_commands test/Programs/MultiSource/McCat/08-main/Makefile" -ac_config_commands="$ac_config_commands test/Programs/MultiSource/McCat/09-vor/Makefile" + ac_config_commands="$ac_config_commands test/Programs/MultiSource/McCat/09-vor/Makefile" -ac_config_commands="$ac_config_commands test/Programs/MultiSource/McCat/12-IOtest/Makefile" + ac_config_commands="$ac_config_commands test/Programs/MultiSource/McCat/12-IOtest/Makefile" -ac_config_commands="$ac_config_commands test/Programs/MultiSource/McCat/15-trie/Makefile" + ac_config_commands="$ac_config_commands test/Programs/MultiSource/McCat/15-trie/Makefile" -ac_config_commands="$ac_config_commands test/Programs/MultiSource/McCat/17-bintr/Makefile" + ac_config_commands="$ac_config_commands test/Programs/MultiSource/McCat/17-bintr/Makefile" -ac_config_commands="$ac_config_commands test/Programs/MultiSource/McCat/18-imp/Makefile" + ac_config_commands="$ac_config_commands test/Programs/MultiSource/McCat/18-imp/Makefile" -ac_config_commands="$ac_config_commands test/Programs/MultiSource/Olden/Makefile" + ac_config_commands="$ac_config_commands test/Programs/MultiSource/Olden/Makefile" -ac_config_commands="$ac_config_commands test/Programs/MultiSource/Olden/bh/Makefile" + ac_config_commands="$ac_config_commands test/Programs/MultiSource/Olden/bh/Makefile" -ac_config_commands="$ac_config_commands test/Programs/MultiSource/Olden/bisort/Makefile" + ac_config_commands="$ac_config_commands test/Programs/MultiSource/Olden/bisort/Makefile" -ac_config_commands="$ac_config_commands test/Programs/MultiSource/Olden/em3d/Makefile" + ac_config_commands="$ac_config_commands test/Programs/MultiSource/Olden/em3d/Makefile" -ac_config_commands="$ac_config_commands test/Programs/MultiSource/Olden/health/Makefile" + ac_config_commands="$ac_config_commands test/Programs/MultiSource/Olden/health/Makefile" -ac_config_commands="$ac_config_commands test/Programs/MultiSource/Olden/mst/Makefile" + ac_config_commands="$ac_config_commands test/Programs/MultiSource/Olden/mst/Makefile" -ac_config_commands="$ac_config_commands test/Programs/MultiSource/Olden/perimeter/Makefile" + ac_config_commands="$ac_config_commands test/Programs/MultiSource/Olden/perimeter/Makefile" -ac_config_commands="$ac_config_commands test/Programs/MultiSource/Olden/power/Makefile" + ac_config_commands="$ac_config_commands test/Programs/MultiSource/Olden/power/Makefile" -ac_config_commands="$ac_config_commands test/Programs/MultiSource/Olden/treeadd/Makefile" + ac_config_commands="$ac_config_commands test/Programs/MultiSource/Olden/treeadd/Makefile" -ac_config_commands="$ac_config_commands test/Programs/MultiSource/Olden/tsp/Makefile" + ac_config_commands="$ac_config_commands test/Programs/MultiSource/Olden/tsp/Makefile" -ac_config_commands="$ac_config_commands test/Programs/MultiSource/Olden/voronoi/Makefile" + ac_config_commands="$ac_config_commands test/Programs/MultiSource/Olden/voronoi/Makefile" -ac_config_commands="$ac_config_commands test/Programs/MultiSource/OptimizerEval/Makefile" + ac_config_commands="$ac_config_commands test/Programs/MultiSource/OptimizerEval/Makefile" -ac_config_commands="$ac_config_commands test/Programs/MultiSource/Ptrdist/Makefile" + ac_config_commands="$ac_config_commands test/Programs/MultiSource/Ptrdist/Makefile" -ac_config_commands="$ac_config_commands test/Programs/MultiSource/Ptrdist/anagram/Makefile" + ac_config_commands="$ac_config_commands test/Programs/MultiSource/Ptrdist/anagram/Makefile" -ac_config_commands="$ac_config_commands test/Programs/MultiSource/Ptrdist/bc/Makefile" + ac_config_commands="$ac_config_commands test/Programs/MultiSource/Ptrdist/bc/Makefile" -ac_config_commands="$ac_config_commands test/Programs/MultiSource/Ptrdist/ft/Makefile" + ac_config_commands="$ac_config_commands test/Programs/MultiSource/Ptrdist/ft/Makefile" -ac_config_commands="$ac_config_commands test/Programs/MultiSource/Ptrdist/ks/Makefile" + ac_config_commands="$ac_config_commands test/Programs/MultiSource/Ptrdist/ks/Makefile" -ac_config_commands="$ac_config_commands test/Programs/MultiSource/Ptrdist/yacr2/Makefile" + ac_config_commands="$ac_config_commands test/Programs/MultiSource/Ptrdist/yacr2/Makefile" -ac_config_commands="$ac_config_commands test/Programs/MultiSource/aha/Makefile" + ac_config_commands="$ac_config_commands test/Programs/MultiSource/aha/Makefile" -ac_config_commands="$ac_config_commands test/Programs/MultiSource/llubenchmark/Makefile" + ac_config_commands="$ac_config_commands test/Programs/MultiSource/llubenchmark/Makefile" -ac_config_commands="$ac_config_commands test/Programs/MultiSource/sgefa/Makefile" + ac_config_commands="$ac_config_commands test/Programs/MultiSource/sgefa/Makefile" -ac_config_commands="$ac_config_commands test/Programs/MultiSource/sim/Makefile" + ac_config_commands="$ac_config_commands test/Programs/MultiSource/sim/Makefile" -ac_config_commands="$ac_config_commands test/Programs/NoSource/Makefile" + ac_config_commands="$ac_config_commands test/Programs/NoSource/Makefile" -ac_config_commands="$ac_config_commands test/Programs/NoSource/Flex/Makefile" + ac_config_commands="$ac_config_commands test/Programs/NoSource/Flex/Makefile" -ac_config_commands="$ac_config_commands test/Programs/NoSource/Larn/Makefile" + ac_config_commands="$ac_config_commands test/Programs/NoSource/Larn/Makefile" -ac_config_commands="$ac_config_commands test/Programs/NoSource/Moria-5.5.2/Makefile" + ac_config_commands="$ac_config_commands test/Programs/NoSource/Moria-5.5.2/Makefile" -ac_config_commands="$ac_config_commands test/Programs/NoSource/Povray31/Makefile" + ac_config_commands="$ac_config_commands test/Programs/NoSource/Povray31/Makefile" -ac_config_commands="$ac_config_commands test/Programs/NoSource/m4/Makefile" + ac_config_commands="$ac_config_commands test/Programs/NoSource/m4/Makefile" -ac_config_commands="$ac_config_commands test/Programs/SingleSource/Makefile" + ac_config_commands="$ac_config_commands test/Programs/SingleSource/Makefile" -ac_config_commands="$ac_config_commands test/Programs/SingleSource/Makefile.singlesrc" + ac_config_commands="$ac_config_commands test/Programs/SingleSource/Makefile.singlesrc" -ac_config_commands="$ac_config_commands test/Programs/SingleSource/CustomChecked/Makefile" + ac_config_commands="$ac_config_commands test/Programs/SingleSource/CustomChecked/Makefile" -ac_config_commands="$ac_config_commands test/Programs/SingleSource/Shootout/Makefile" + ac_config_commands="$ac_config_commands test/Programs/SingleSource/Shootout/Makefile" -ac_config_commands="$ac_config_commands test/Programs/SingleSource/Stanford/Makefile" + ac_config_commands="$ac_config_commands test/Programs/SingleSource/Stanford/Makefile" -ac_config_commands="$ac_config_commands test/Programs/SingleSource/UnitTests/Makefile" + ac_config_commands="$ac_config_commands test/Programs/SingleSource/UnitTests/Makefile" -ac_config_commands="$ac_config_commands tools/Makefile" + ac_config_commands="$ac_config_commands tools/Makefile" -ac_config_commands="$ac_config_commands tools/analyze/Makefile" + ac_config_commands="$ac_config_commands tools/analyze/Makefile" -ac_config_commands="$ac_config_commands tools/as/Makefile" + ac_config_commands="$ac_config_commands tools/as/Makefile" -ac_config_commands="$ac_config_commands tools/bugpoint/Makefile" + ac_config_commands="$ac_config_commands tools/bugpoint/Makefile" -ac_config_commands="$ac_config_commands tools/dis/Makefile" + ac_config_commands="$ac_config_commands tools/dis/Makefile" -ac_config_commands="$ac_config_commands tools/extract/Makefile" + ac_config_commands="$ac_config_commands tools/extract/Makefile" -ac_config_commands="$ac_config_commands tools/gccas/Makefile" + ac_config_commands="$ac_config_commands tools/gccas/Makefile" -ac_config_commands="$ac_config_commands tools/gccld/Makefile" + ac_config_commands="$ac_config_commands tools/gccld/Makefile" -ac_config_commands="$ac_config_commands tools/link/Makefile" + ac_config_commands="$ac_config_commands tools/link/Makefile" -ac_config_commands="$ac_config_commands tools/llc/Makefile" + ac_config_commands="$ac_config_commands tools/llc/Makefile" -ac_config_commands="$ac_config_commands tools/lli/Makefile" + ac_config_commands="$ac_config_commands tools/lli/Makefile" -ac_config_commands="$ac_config_commands tools/opt/Makefile" + ac_config_commands="$ac_config_commands tools/opt/Makefile" -ac_config_commands="$ac_config_commands tools/llee/Makefile" + ac_config_commands="$ac_config_commands tools/llee/Makefile" -ac_config_commands="$ac_config_commands tools/llvm-as/Makefile" + ac_config_commands="$ac_config_commands tools/llvm-as/Makefile" -ac_config_commands="$ac_config_commands tools/llvm-dis/Makefile" + ac_config_commands="$ac_config_commands tools/llvm-dis/Makefile" -ac_config_commands="$ac_config_commands utils/Makefile" + ac_config_commands="$ac_config_commands utils/Makefile" -ac_config_commands="$ac_config_commands utils/Burg/Makefile" + ac_config_commands="$ac_config_commands utils/Burg/Makefile" -ac_config_commands="$ac_config_commands utils/Burg/Doc/Makefile" + ac_config_commands="$ac_config_commands utils/Burg/Doc/Makefile" -ac_config_commands="$ac_config_commands utils/TableGen/Makefile" + ac_config_commands="$ac_config_commands utils/TableGen/Makefile" -ac_config_commands="$ac_config_commands www/docs/Makefile" + ac_config_commands="$ac_config_commands www/docs/Makefile" -ac_config_commands="$ac_config_commands projects/Makefile" + ac_config_commands="$ac_config_commands projects/Makefile" -ac_config_commands="$ac_config_commands projects/sample/Makefile" + ac_config_commands="$ac_config_commands projects/sample/Makefile" -ac_config_commands="$ac_config_commands projects/sample/Makefile.common" + ac_config_commands="$ac_config_commands projects/sample/Makefile.common" -ac_config_commands="$ac_config_commands projects/sample/Makefile.config" + ac_config_commands="$ac_config_commands projects/sample/Makefile.config" -ac_config_commands="$ac_config_commands projects/sample/lib/Makefile" + ac_config_commands="$ac_config_commands projects/sample/lib/Makefile" -ac_config_commands="$ac_config_commands projects/sample/lib/sample/Makefile" + ac_config_commands="$ac_config_commands projects/sample/lib/sample/Makefile" -ac_config_commands="$ac_config_commands projects/sample/tools/Makefile" + ac_config_commands="$ac_config_commands projects/sample/tools/Makefile" -ac_config_commands="$ac_config_commands projects/sample/tools/sample/Makefile" + ac_config_commands="$ac_config_commands projects/sample/tools/sample/Makefile" -ac_config_commands="$ac_config_commands projects/ModuleMaker/Makefile" + ac_config_commands="$ac_config_commands projects/ModuleMaker/Makefile" -ac_config_commands="$ac_config_commands projects/ModuleMaker/Makefile.common" + ac_config_commands="$ac_config_commands projects/ModuleMaker/Makefile.common" -ac_config_commands="$ac_config_commands projects/ModuleMaker/tools/Makefile" + ac_config_commands="$ac_config_commands projects/ModuleMaker/tools/Makefile" -ac_config_commands="$ac_config_commands projects/ModuleMaker/tools/ModuleMaker/Makefile" + ac_config_commands="$ac_config_commands projects/ModuleMaker/tools/ModuleMaker/Makefile" @@ -2234,14 +2309,12 @@ cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -2251,7 +2324,7 @@ } _ACEOF ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files a.out a.exe" +ac_clean_files="$ac_clean_files a.out a.exe b.out" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. @@ -2270,26 +2343,39 @@ # Be careful to initialize this variable, since it used to be cached. # Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. ac_cv_exeext= -for ac_file in `ls a_out.exe a.exe conftest.exe 2>/dev/null; - ls a.out conftest 2>/dev/null; - ls a.* conftest.* 2>/dev/null`; do +# b.out is created by i960 compilers. +for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out +do + test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb | *.xSYM ) ;; - a.out ) # We found the default executable, but exeext='' is most - # certainly right. - break;; - *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - # FIXME: I believe we export ac_cv_exeext for Libtool --akim. - export ac_cv_exeext - break;; - * ) break;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) + ;; + conftest.$ac_ext ) + # This is the source file. + ;; + [ab].out ) + # We found the default executable, but exeext='' is most + # certainly right. + break;; + *.* ) + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + # FIXME: I believe we export ac_cv_exeext for Libtool, + # but it would be cool to find out if it's true. Does anybody + # maintain Libtool? --akim. + export ac_cv_exeext + break;; + * ) + break;; esac done else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -{ { echo "$as_me:$LINENO: error: C++ compiler cannot create executables" >&5 -echo "$as_me: error: C++ compiler cannot create executables" >&2;} +sed 's/^/| /' conftest.$ac_ext >&5 + +{ { echo "$as_me:$LINENO: error: C++ compiler cannot create executables +See \`config.log' for more details." >&5 +echo "$as_me: error: C++ compiler cannot create executables +See \`config.log' for more details." >&2;} { (exit 77); exit 77; }; } fi @@ -2316,9 +2402,11 @@ cross_compiling=yes else { { echo "$as_me:$LINENO: error: cannot run C++ compiled programs. -If you meant to cross compile, use \`--host'." >&5 +If you meant to cross compile, use \`--host'. +See \`config.log' for more details." >&5 echo "$as_me: error: cannot run C++ compiled programs. -If you meant to cross compile, use \`--host'." >&2;} +If you meant to cross compile, use \`--host'. +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi fi @@ -2326,7 +2414,7 @@ echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 -rm -f a.out a.exe conftest$ac_cv_exeext +rm -f a.out a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save # Check the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. @@ -2346,9 +2434,10 @@ # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will # work properly (i.e., refer to `conftest.exe'), while it won't with # `rm'. -for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do +for ac_file in conftest.exe conftest conftest.*; do + test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` export ac_cv_exeext break;; @@ -2356,8 +2445,10 @@ esac done else - { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link" >&5 -echo "$as_me: error: cannot compute suffix of executables: cannot compile and link" >&2;} + { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi @@ -2375,14 +2466,12 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -2399,16 +2488,19 @@ (exit $ac_status); }; then for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;; *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` break;; esac done else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile" >&5 -echo "$as_me: error: cannot compute suffix of object files: cannot compile" >&2;} +sed 's/^/| /' conftest.$ac_ext >&5 + +{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute suffix of object files: cannot compile +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi @@ -2425,14 +2517,12 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -2459,7 +2549,8 @@ ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_compiler_gnu=no fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -2479,14 +2570,12 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -2510,7 +2599,8 @@ ac_cv_prog_cxx_g=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_prog_cxx_g=no fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -2543,15 +2633,13 @@ do cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include $ac_declaration -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -2575,20 +2663,19 @@ : else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + continue fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ $ac_declaration -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -2612,7 +2699,8 @@ break else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi rm -f conftest.$ac_objext conftest.$ac_ext done @@ -2721,8 +2809,10 @@ fi -test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH" >&5 -echo "$as_me: error: no acceptable C compiler found in \$PATH" >&2;} +test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH +See \`config.log' for more details." >&5 +echo "$as_me: error: no acceptable C compiler found in \$PATH +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } # Provide some information about the compiler. @@ -2752,14 +2842,12 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -2786,7 +2874,8 @@ ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_compiler_gnu=no fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -2806,14 +2895,12 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -2837,7 +2924,8 @@ ac_cv_prog_cc_g=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_prog_cc_g=no fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -2859,6 +2947,102 @@ CFLAGS= fi fi +echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 +echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 +if test "${ac_cv_prog_cc_stdc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_prog_cc_stdc=no +ac_save_CC=$CC +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +#include +#include +#include +/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ +struct buf { int x; }; +FILE * (*rcsopen) (struct buf *, struct stat *, int); +static char *e (p, i) + char **p; + int i; +{ + return p[i]; +} +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; +} +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +int argc; +char **argv; +int +main () +{ +return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; + ; + return 0; +} +_ACEOF +# Don't try gcc -ansi; that turns off useful extensions and +# breaks some systems' header files. +# AIX -qlanglvl=ansi +# Ultrix and OSF/1 -std1 +# HP-UX 10.20 and later -Ae +# HP-UX older versions -Aa -D_HPUX_SOURCE +# SVR4 -Xc -D__EXTENSIONS__ +for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +do + CC="$ac_save_CC $ac_arg" + rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_prog_cc_stdc=$ac_arg +break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.$ac_objext +done +rm -f conftest.$ac_ext conftest.$ac_objext +CC=$ac_save_CC + +fi + +case "x$ac_cv_prog_cc_stdc" in + x|xno) + echo "$as_me:$LINENO: result: none needed" >&5 +echo "${ECHO_T}none needed" >&6 ;; + *) + echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 +echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 + CC="$CC $ac_cv_prog_cc_stdc" ;; +esac + # Some people use a C++ compiler to compile C. Since we use `exit', # in C++ we need to declare it. In case someone uses the same compiler # for both compiling C and C++ we need to have the C++ compiler decide @@ -2891,15 +3075,13 @@ do cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include $ac_declaration -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -2923,20 +3105,19 @@ : else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + continue fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ $ac_declaration -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -2960,7 +3141,8 @@ break else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi rm -f conftest.$ac_objext conftest.$ac_ext done @@ -2973,7 +3155,8 @@ else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi rm -f conftest.$ac_objext conftest.$ac_ext ac_ext=c @@ -3005,18 +3188,28 @@ do # Use a header file that comes with gcc, so configuring glibc # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" -#include +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif Syntax error _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -3033,7 +3226,8 @@ : else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + # Broken: fails on valid input. continue fi @@ -3043,13 +3237,17 @@ # can be detected and how. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -3067,7 +3265,8 @@ continue else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + # Passes both tests. ac_preproc_ok=: break @@ -3096,18 +3295,28 @@ do # Use a header file that comes with gcc, so configuring glibc # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" -#include +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif Syntax error _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -3124,7 +3333,8 @@ : else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + # Broken: fails on valid input. continue fi @@ -3134,13 +3344,17 @@ # can be detected and how. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -3158,7 +3372,8 @@ continue else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + # Passes both tests. ac_preproc_ok=: break @@ -3171,8 +3386,10 @@ if $ac_preproc_ok; then : else - { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check" >&5 -echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} + { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details." >&5 +echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi @@ -3296,7 +3513,11 @@ LIBS="-lfl $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -3305,12 +3526,6 @@ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char yywrap (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -3334,7 +3549,8 @@ ac_cv_lib_fl_yywrap=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_lib_fl_yywrap=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -3354,7 +3570,11 @@ LIBS="-ll $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -3363,12 +3583,6 @@ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char yywrap (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -3392,7 +3606,8 @@ ac_cv_lib_l_yywrap=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_lib_l_yywrap=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -3470,7 +3685,8 @@ ac_cv_prog_lex_yytext_pointer=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_save_LIBS @@ -4128,7 +4344,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4131 "configure"' > conftest.$ac_ext + echo '#line 4347 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -4226,14 +4442,12 @@ cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -4257,7 +4471,8 @@ lt_cv_cc_needs_belf=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + lt_cv_cc_needs_belf=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -4289,48 +4504,59 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include #include #include #include +int +main () +{ + + ; + return 0; +} _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_header_stdc=yes else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - ac_cv_header_stdc=no +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_header_stdc=no fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "memchr" >/dev/null 2>&1; then + $EGREP "memchr" >/dev/null 2>&1; then : else ac_cv_header_stdc=no @@ -4343,12 +4569,16 @@ # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "free" >/dev/null 2>&1; then + $EGREP "free" >/dev/null 2>&1; then : else ac_cv_header_stdc=no @@ -4364,13 +4594,18 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include #if ((' ' & 0x0FF) == 0x020) # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) #else -# define ISLOWER(c) (('a' <= (c) && (c) <= 'i') \ +# define ISLOWER(c) \ + (('a' <= (c) && (c) <= 'i') \ || ('j' <= (c) && (c) <= 'r') \ || ('s' <= (c) && (c) <= 'z')) # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) @@ -4403,11 +4638,12 @@ else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ( exit $ac_status ) ac_cv_header_stdc=no fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi fi @@ -4442,7 +4678,11 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ $ac_includes_default #include <$ac_header> @@ -4462,7 +4702,8 @@ eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + eval "$as_ac_Header=no" fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -4497,7 +4738,11 @@ echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ $ac_includes_default #include <$ac_header> _ACEOF @@ -4516,7 +4761,8 @@ ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_header_compiler=no fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -4528,13 +4774,17 @@ echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include <$ac_header> _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -4551,7 +4801,8 @@ ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext @@ -4564,14 +4815,32 @@ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf at gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; no:yes ) { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf at gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; esac echo "$as_me:$LINENO: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 @@ -4612,18 +4881,28 @@ do # Use a header file that comes with gcc, so configuring glibc # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" -#include +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif Syntax error _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -4640,7 +4919,8 @@ : else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + # Broken: fails on valid input. continue fi @@ -4650,13 +4930,17 @@ # can be detected and how. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -4674,7 +4958,8 @@ continue else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + # Passes both tests. ac_preproc_ok=: break @@ -4703,18 +4988,28 @@ do # Use a header file that comes with gcc, so configuring glibc # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" -#include +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif Syntax error _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -4731,7 +5026,8 @@ : else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + # Broken: fails on valid input. continue fi @@ -4741,13 +5037,17 @@ # can be detected and how. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -4765,7 +5065,8 @@ continue else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + # Passes both tests. ac_preproc_ok=: break @@ -4778,8 +5079,10 @@ if $ac_preproc_ok; then : else - { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5 -echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;} + { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check +See \`config.log' for more details." >&5 +echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi @@ -4795,7 +5098,7 @@ ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_f77_compiler_gnu if test -n "$ac_tool_prefix"; then - for ac_prog in g77 f77 xlf cf77 cft77 frt pgf77 fl32 af77 fort77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 lf95 g95 fc + for ac_prog in g77 f77 xlf frt pgf77 fl32 af77 fort77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 lf95 g95 do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 @@ -4837,7 +5140,7 @@ fi if test -z "$F77"; then ac_ct_F77=$F77 - for ac_prog in g77 f77 xlf cf77 cft77 frt pgf77 fl32 af77 fort77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 lf95 g95 fc + for ac_prog in g77 f77 xlf frt pgf77 fl32 af77 fort77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 lf95 g95 do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -4882,7 +5185,7 @@ # Provide some information about the compiler. -echo "$as_me:4885:" \ +echo "$as_me:5188:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 @@ -4933,7 +5236,8 @@ ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_compiler_gnu=no fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -4973,7 +5277,8 @@ ac_cv_prog_f77_g=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_prog_f77_g=no fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -5889,11 +6194,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:5892: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6197: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:5896: \$? = $ac_status" >&5 + echo "$as_me:6201: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -6121,11 +6426,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6124: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6429: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6128: \$? = $ac_status" >&5 + echo "$as_me:6433: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -6188,11 +6493,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6191: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6496: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:6195: \$? = $ac_status" >&5 + echo "$as_me:6500: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -6529,14 +6834,12 @@ # Determine the default libpath from the value encoded in an empty executable. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -6565,7 +6868,8 @@ }'`; fi else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -6581,14 +6885,12 @@ # Determine the default libpath from the value encoded in an empty executable. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -6617,7 +6919,8 @@ }'`; fi else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -7719,7 +8022,11 @@ LIBS="-ldl $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -7728,12 +8035,6 @@ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char dlopen (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -7757,7 +8058,8 @@ ac_cv_lib_dl_dlopen=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_lib_dl_dlopen=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -7785,37 +8087,44 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char shl_load (); below. */ -#include + which can conflict with char shl_load (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ +#ifdef __STDC__ +# include +#else +# include +#endif /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char shl_load (); -char (*f) (); - -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif -int -main () -{ /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_shl_load) || defined (__stub___shl_load) choke me #else -f = shl_load; +char (*f) () = shl_load; +#endif +#ifdef __cplusplus +} #endif +int +main () +{ +return f != shl_load; ; return 0; } @@ -7835,7 +8144,8 @@ ac_cv_func_shl_load=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_func_shl_load=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -7854,7 +8164,11 @@ LIBS="-ldld $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -7863,12 +8177,6 @@ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char shl_load (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -7892,7 +8200,8 @@ ac_cv_lib_dld_shl_load=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_lib_dld_shl_load=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -7910,37 +8219,44 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char dlopen (); below. */ -#include + which can conflict with char dlopen (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ +#ifdef __STDC__ +# include +#else +# include +#endif /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char dlopen (); -char (*f) (); - -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif -int -main () -{ /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_dlopen) || defined (__stub___dlopen) choke me #else -f = dlopen; +char (*f) () = dlopen; +#endif +#ifdef __cplusplus +} #endif +int +main () +{ +return f != dlopen; ; return 0; } @@ -7960,7 +8276,8 @@ ac_cv_func_dlopen=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_func_dlopen=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -7979,7 +8296,11 @@ LIBS="-ldl $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -7988,12 +8309,6 @@ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char dlopen (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -8017,7 +8332,8 @@ ac_cv_lib_dl_dlopen=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_lib_dl_dlopen=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -8037,7 +8353,11 @@ LIBS="-lsvld $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -8046,12 +8366,6 @@ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char dlopen (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -8075,7 +8389,8 @@ ac_cv_lib_svld_dlopen=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_lib_svld_dlopen=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -8095,7 +8410,11 @@ LIBS="-ldld $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -8104,12 +8423,6 @@ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char dld_link (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -8133,7 +8446,8 @@ ac_cv_lib_dld_dld_link=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_lib_dld_dld_link=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -8191,7 +8505,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -9362,7 +9674,8 @@ }'`; fi else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -9379,14 +9692,12 @@ # Determine the default libpath from the value encoded in an empty executable. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -9415,7 +9726,8 @@ }'`; fi else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -10427,11 +10739,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10430: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10742: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:10434: \$? = $ac_status" >&5 + echo "$as_me:10746: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -10494,11 +10806,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10497: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10809: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:10501: \$? = $ac_status" >&5 + echo "$as_me:10813: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -11254,7 +11566,11 @@ LIBS="-ldl $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -11263,12 +11579,6 @@ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char dlopen (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -11292,7 +11602,8 @@ ac_cv_lib_dl_dlopen=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_lib_dl_dlopen=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -11320,37 +11631,44 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char shl_load (); below. */ -#include + which can conflict with char shl_load (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ +#ifdef __STDC__ +# include +#else +# include +#endif /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char shl_load (); -char (*f) (); - -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif -int -main () -{ /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_shl_load) || defined (__stub___shl_load) choke me #else -f = shl_load; +char (*f) () = shl_load; +#endif +#ifdef __cplusplus +} #endif +int +main () +{ +return f != shl_load; ; return 0; } @@ -11370,7 +11688,8 @@ ac_cv_func_shl_load=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_func_shl_load=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -11389,7 +11708,11 @@ LIBS="-ldld $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -11398,12 +11721,6 @@ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char shl_load (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -11427,7 +11744,8 @@ ac_cv_lib_dld_shl_load=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_lib_dld_shl_load=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -11445,37 +11763,44 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char dlopen (); below. */ -#include + which can conflict with char dlopen (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ +#ifdef __STDC__ +# include +#else +# include +#endif /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char dlopen (); -char (*f) (); - -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif -int -main () -{ /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_dlopen) || defined (__stub___dlopen) choke me #else -f = dlopen; +char (*f) () = dlopen; +#endif +#ifdef __cplusplus +} #endif +int +main () +{ +return f != dlopen; ; return 0; } @@ -11495,7 +11820,8 @@ ac_cv_func_dlopen=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_func_dlopen=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -11514,7 +11840,11 @@ LIBS="-ldl $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -11523,12 +11853,6 @@ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char dlopen (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -11552,7 +11876,8 @@ ac_cv_lib_dl_dlopen=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_lib_dl_dlopen=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -11572,7 +11897,11 @@ LIBS="-lsvld $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -11581,12 +11910,6 @@ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char dlopen (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -11610,7 +11933,8 @@ ac_cv_lib_svld_dlopen=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_lib_svld_dlopen=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -11630,7 +11954,11 @@ LIBS="-ldld $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -11639,12 +11967,6 @@ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char dld_link (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -11668,7 +11990,8 @@ ac_cv_lib_dld_dld_link=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_lib_dld_dld_link=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -11726,7 +12049,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:12972: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12653: \$? = $ac_status" >&5 + echo "$as_me:12976: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -12713,11 +13036,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12716: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13039: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12720: \$? = $ac_status" >&5 + echo "$as_me:13043: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -13077,7 +13400,8 @@ }'`; fi else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -13116,7 +13440,8 @@ }'`; fi else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -14655,11 +14980,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14658: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14983: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14662: \$? = $ac_status" >&5 + echo "$as_me:14987: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -14887,11 +15212,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14890: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15215: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14894: \$? = $ac_status" >&5 + echo "$as_me:15219: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -14954,11 +15279,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14957: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15282: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14961: \$? = $ac_status" >&5 + echo "$as_me:15286: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -15295,14 +15620,12 @@ # Determine the default libpath from the value encoded in an empty executable. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -15331,7 +15654,8 @@ }'`; fi else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -15347,14 +15671,12 @@ # Determine the default libpath from the value encoded in an empty executable. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -15383,7 +15705,8 @@ }'`; fi else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -16485,7 +16808,11 @@ LIBS="-ldl $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -16494,12 +16821,6 @@ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char dlopen (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -16523,7 +16844,8 @@ ac_cv_lib_dl_dlopen=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_lib_dl_dlopen=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -16551,37 +16873,44 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char shl_load (); below. */ -#include + which can conflict with char shl_load (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ +#ifdef __STDC__ +# include +#else +# include +#endif /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char shl_load (); -char (*f) (); - -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif -int -main () -{ /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_shl_load) || defined (__stub___shl_load) choke me #else -f = shl_load; +char (*f) () = shl_load; +#endif +#ifdef __cplusplus +} #endif +int +main () +{ +return f != shl_load; ; return 0; } @@ -16601,7 +16930,8 @@ ac_cv_func_shl_load=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_func_shl_load=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -16620,7 +16950,11 @@ LIBS="-ldld $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -16629,12 +16963,6 @@ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char shl_load (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -16658,7 +16986,8 @@ ac_cv_lib_dld_shl_load=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_lib_dld_shl_load=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -16676,37 +17005,44 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char dlopen (); below. */ -#include + which can conflict with char dlopen (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ +#ifdef __STDC__ +# include +#else +# include +#endif /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char dlopen (); -char (*f) (); - -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif -int -main () -{ /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_dlopen) || defined (__stub___dlopen) choke me #else -f = dlopen; +char (*f) () = dlopen; +#endif +#ifdef __cplusplus +} #endif +int +main () +{ +return f != dlopen; ; return 0; } @@ -16726,7 +17062,8 @@ ac_cv_func_dlopen=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_func_dlopen=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -16745,7 +17082,11 @@ LIBS="-ldl $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -16754,12 +17095,6 @@ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char dlopen (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -16783,7 +17118,8 @@ ac_cv_lib_dl_dlopen=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_lib_dl_dlopen=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -16803,7 +17139,11 @@ LIBS="-lsvld $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -16812,12 +17152,6 @@ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char dlopen (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -16841,7 +17175,8 @@ ac_cv_lib_svld_dlopen=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_lib_svld_dlopen=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -16861,7 +17196,11 @@ LIBS="-ldld $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -16870,12 +17209,6 @@ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char dld_link (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -16899,7 +17232,8 @@ ac_cv_lib_dld_dld_link=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_lib_dld_dld_link=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -16957,7 +17291,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -18613,12 +18951,6 @@ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char elf_begin (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -18642,7 +18974,8 @@ ac_cv_lib_elf_elf_begin=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_lib_elf_elf_begin=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -18669,7 +19002,11 @@ ac_cv_search_dlopen=no cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -18678,12 +19015,6 @@ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char dlopen (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -18707,7 +19038,8 @@ ac_cv_search_dlopen="none required" else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test "$ac_cv_search_dlopen" = no; then @@ -18715,7 +19047,11 @@ LIBS="-l$ac_lib $ac_func_search_save_LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -18724,12 +19060,6 @@ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char dlopen (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -18754,7 +19084,8 @@ break else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext done @@ -18782,7 +19113,11 @@ ac_cv_search_mallinfo=no cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -18791,12 +19126,6 @@ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char mallinfo (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -18820,7 +19149,8 @@ ac_cv_search_mallinfo="none required" else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test "$ac_cv_search_mallinfo" = no; then @@ -18828,7 +19158,11 @@ LIBS="-l$ac_lib $ac_func_search_save_LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -18837,12 +19171,6 @@ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char mallinfo (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -18867,7 +19195,8 @@ break else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext done @@ -18893,48 +19222,59 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include #include #include #include +int +main () +{ + + ; + return 0; +} _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_header_stdc=yes else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - ac_cv_header_stdc=no +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_header_stdc=no fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "memchr" >/dev/null 2>&1; then + $EGREP "memchr" >/dev/null 2>&1; then : else ac_cv_header_stdc=no @@ -18947,12 +19287,16 @@ # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "free" >/dev/null 2>&1; then + $EGREP "free" >/dev/null 2>&1; then : else ac_cv_header_stdc=no @@ -18968,13 +19312,18 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include #if ((' ' & 0x0FF) == 0x020) # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) #else -# define ISLOWER(c) (('a' <= (c) && (c) <= 'i') \ +# define ISLOWER(c) \ + (('a' <= (c) && (c) <= 'i') \ || ('j' <= (c) && (c) <= 'r') \ || ('s' <= (c) && (c) <= 'z')) # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) @@ -19007,11 +19356,12 @@ else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ( exit $ac_status ) ac_cv_header_stdc=no fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi fi @@ -19032,7 +19382,11 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include #include #ifndef WEXITSTATUS @@ -19042,12 +19396,6 @@ # define WIFEXITED(stat_val) (((stat_val) & 255) == 0) #endif -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -19073,7 +19421,8 @@ ac_cv_header_sys_wait_h=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_header_sys_wait_h=no fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -19114,7 +19463,11 @@ echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ $ac_includes_default #include <$ac_header> _ACEOF @@ -19133,7 +19486,8 @@ ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_header_compiler=no fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -19145,13 +19499,17 @@ echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include <$ac_header> _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -19168,7 +19526,8 @@ ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext @@ -19181,14 +19540,32 @@ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf at gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; no:yes ) { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf at gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; esac echo "$as_me:$LINENO: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 @@ -19232,7 +19609,11 @@ echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ $ac_includes_default #include <$ac_header> _ACEOF @@ -19251,7 +19632,8 @@ ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_header_compiler=no fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -19263,13 +19645,17 @@ echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include <$ac_header> _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -19286,7 +19672,8 @@ ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext @@ -19299,14 +19686,32 @@ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf at gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; no:yes ) { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf at gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; esac echo "$as_me:$LINENO: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 @@ -19348,7 +19753,11 @@ echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ $ac_includes_default #include <$ac_header> _ACEOF @@ -19367,7 +19776,8 @@ ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_header_compiler=no fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -19379,13 +19789,17 @@ echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include <$ac_header> _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -19402,7 +19816,8 @@ ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext @@ -19415,14 +19830,32 @@ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf at gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; no:yes ) { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf at gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; esac echo "$as_me:$LINENO: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 @@ -19446,103 +19879,6 @@ -echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 -echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 -if test "${ac_cv_prog_cc_stdc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_prog_cc_stdc=no -ac_save_CC=$CC -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" -#include -#include -#include -#include -/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ -struct buf { int x; }; -FILE * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; -{ - return p[i]; -} -static char *f (char * (*g) (char **, int), char **p, ...) -{ - char *s; - va_list v; - va_start (v,p); - s = g (p, va_arg (v,int)); - va_end (v); - return s; -} -int test (int i, double x); -struct s1 {int (*f) (int a);}; -struct s2 {int (*f) (double a);}; -int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); -int argc; -char **argv; -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif -int -main () -{ -return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; - ; - return 0; -} -_ACEOF -# Don't try gcc -ansi; that turns off useful extensions and -# breaks some systems' header files. -# AIX -qlanglvl=ansi -# Ultrix and OSF/1 -std1 -# HP-UX 10.20 and later -Ae -# HP-UX older versions -Aa -D_HPUX_SOURCE -# SVR4 -Xc -D__EXTENSIONS__ -for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" -do - CC="$ac_save_CC $ac_arg" - rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_prog_cc_stdc=$ac_arg -break -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -fi -rm -f conftest.$ac_objext -done -rm -f conftest.$ac_ext conftest.$ac_objext -CC=$ac_save_CC - -fi - -case "x$ac_cv_prog_cc_stdc" in - x|xno) - echo "$as_me:$LINENO: result: none needed" >&5 -echo "${ECHO_T}none needed" >&6 ;; - *) - echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 - CC="$CC $ac_cv_prog_cc_stdc" ;; -esac - echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 if test "${ac_cv_c_const+set}" = set; then @@ -19550,14 +19886,12 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -19627,7 +19961,8 @@ ac_cv_c_const=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_c_const=no fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -19651,10 +19986,15 @@ for ac_kw in inline __inline__ __inline; do cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #ifndef __cplusplus -static $ac_kw int static_foo () {return 0; } -$ac_kw int foo () {return 0; } +typedef int foo_t; +static $ac_kw foo_t static_foo () {return 0; } +$ac_kw foo_t foo () {return 0; } #endif _ACEOF @@ -19673,7 +20013,8 @@ ac_cv_c_inline=$ac_kw; break else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi rm -f conftest.$ac_objext conftest.$ac_ext done @@ -19703,16 +20044,14 @@ # See if sys/param.h defines the BYTE_ORDER macro. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include #include -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -19739,16 +20078,14 @@ # It does; now see whether it defined to BIG_ENDIAN or not. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include #include -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -19775,32 +20112,32 @@ ac_cv_c_bigendian=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_c_bigendian=no fi rm -f conftest.$ac_objext conftest.$ac_ext else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + # It does not; compile a test program. if test "$cross_compiling" = yes; then - # try to guess the endianess by grep'ing values into an object file + # try to guess the endianness by grepping values into an object file ac_cv_c_bigendian=unknown cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; } short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; } -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -19821,10 +20158,10 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - if fgrep BIGenDianSyS conftest.$ac_objext >/dev/null ; then + if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then ac_cv_c_bigendian=yes fi -if fgrep LiTTleEnDian conftest.$ac_objext >/dev/null ; then +if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then if test "$ac_cv_c_bigendian" = unknown; then ac_cv_c_bigendian=no else @@ -19834,13 +20171,18 @@ fi else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi rm -f conftest.$ac_objext conftest.$ac_ext else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () { @@ -19869,11 +20211,12 @@ else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ( exit $ac_status ) ac_cv_c_bigendian=yes fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -19892,9 +20235,9 @@ _ACEOF ;; *) - { { echo "$as_me:$LINENO: error: unknown endianess + { { echo "$as_me:$LINENO: error: unknown endianness presetting ac_cv_c_bigendian=no (or yes) will help" >&5 -echo "$as_me: error: unknown endianess +echo "$as_me: error: unknown endianness presetting ac_cv_c_bigendian=no (or yes) will help" >&2;} { (exit 1); exit 1; }; } ;; esac @@ -19907,14 +20250,12 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ $ac_includes_default -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -19941,7 +20282,8 @@ ac_cv_type_pid_t=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_type_pid_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -19965,14 +20307,12 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ $ac_includes_default -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -19999,7 +20339,8 @@ ac_cv_type_size_t=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_type_size_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -20023,14 +20364,12 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ $ac_includes_default -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -20057,7 +20396,8 @@ ac_cv_type_int64_t=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_type_int64_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -20084,14 +20424,12 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ $ac_includes_default -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -20118,7 +20456,8 @@ ac_cv_type_uint64_t=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_type_uint64_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -20145,17 +20484,15 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include #include #include -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -20180,7 +20517,8 @@ ac_cv_header_time=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_header_time=no fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -20202,16 +20540,14 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include #include -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -20235,7 +20571,8 @@ ac_cv_struct_tm=time.h else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_struct_tm=sys/time.h fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -20266,14 +20603,12 @@ cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ namespace Outer { namespace Inner { int i = 0; }} -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -20297,7 +20632,8 @@ ac_cv_cxx_namespaces=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_cxx_namespaces=no fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -20335,17 +20671,15 @@ cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include #ifdef HAVE_NAMESPACES using namespace std; #endif -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -20369,23 +20703,22 @@ ac_cv_cxx_have_ext_hash_map=std else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_cxx_have_ext_hash_map=no fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include #ifdef HAVE_NAMESPACES using namespace __gnu_cxx; #endif -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -20409,7 +20742,8 @@ ac_cv_cxx_have_ext_hash_map=gnu else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_cxx_have_ext_hash_map=no fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -20454,17 +20788,15 @@ cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include #ifdef HAVE_NAMESPACES using namespace std; #endif -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -20488,23 +20820,22 @@ ac_cv_cxx_have_ext_hash_set=std else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_cxx_have_ext_hash_set=no fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include #ifdef HAVE_NAMESPACES using namespace __gnu_cxx; #endif -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -20528,7 +20859,8 @@ ac_cv_cxx_have_ext_hash_set=gnu else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_cxx_have_ext_hash_set=no fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -20573,17 +20905,15 @@ cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include #ifdef HAVE_NAMESPACES using namespace std; #endif -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -20607,23 +20937,22 @@ ac_cv_cxx_have_ext_slist=std else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_cxx_have_ext_slist=no fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include #ifdef HAVE_NAMESPACES using namespace __gnu_cxx; #endif -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -20647,7 +20976,8 @@ ac_cv_cxx_have_ext_slist=gnu else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_cxx_have_ext_slist=no fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -20693,17 +21023,15 @@ cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include #ifdef HAVE_NAMESPACES using namespace std; #endif -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -20727,7 +21055,8 @@ ac_cv_cxx_have_std_iterator=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_cxx_have_std_iterator=no fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -20765,17 +21094,15 @@ cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include #ifdef HAVE_NAMESPACES using namespace std; #endif -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -20799,7 +21126,8 @@ ac_cv_cxx_have_bi_iterator=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_cxx_have_bi_iterator=no fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -20837,17 +21165,15 @@ cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include #ifdef HAVE_NAMESPACES using namespace std; #endif -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -20871,7 +21197,8 @@ ac_cv_cxx_have_fwd_iterator=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_cxx_have_fwd_iterator=no fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -20903,14 +21230,12 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -20934,7 +21259,8 @@ ac_cv_working_alloca_h=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_working_alloca_h=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -20956,7 +21282,11 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #ifdef __GNUC__ # define alloca __builtin_alloca #else @@ -20978,12 +21308,6 @@ # endif #endif -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -21007,7 +21331,8 @@ ac_cv_func_alloca_works=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_func_alloca_works=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -21041,7 +21366,11 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #if defined(CRAY) && ! defined(CRAY2) webecray #else @@ -21050,7 +21379,7 @@ _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "webecray" >/dev/null 2>&1; then + $EGREP "webecray" >/dev/null 2>&1; then ac_cv_os_cray=yes else ac_cv_os_cray=no @@ -21070,37 +21399,44 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. */ -#include + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ +#ifdef __STDC__ +# include +#else +# include +#endif /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func (); -char (*f) (); - -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif -int -main () -{ /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -f = $ac_func; +char (*f) () = $ac_func; +#endif +#ifdef __cplusplus +} #endif +int +main () +{ +return f != $ac_func; ; return 0; } @@ -21120,7 +21456,8 @@ eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -21149,7 +21486,11 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int find_stack_direction () { @@ -21185,11 +21526,12 @@ else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ( exit $ac_status ) ac_cv_c_stack_direction=-1 fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5 @@ -21211,12 +21553,16 @@ ac_pattern="Autoconf.*'x'" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include Autoconf TIOCGETP _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "$ac_pattern" >/dev/null 2>&1; then + $EGREP "$ac_pattern" >/dev/null 2>&1; then ac_cv_prog_gcc_traditional=yes else ac_cv_prog_gcc_traditional=no @@ -21227,12 +21573,16 @@ if test $ac_cv_prog_gcc_traditional = no; then cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include Autoconf TCGETA _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "$ac_pattern" >/dev/null 2>&1; then + $EGREP "$ac_pattern" >/dev/null 2>&1; then ac_cv_prog_gcc_traditional=yes fi rm -f conftest* @@ -21256,14 +21606,12 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -21311,11 +21659,12 @@ else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ( exit $ac_status ) ac_cv_func_memcmp_working=no fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi echo "$as_me:$LINENO: result: $ac_cv_func_memcmp_working" >&5 @@ -21341,7 +21690,11 @@ echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ $ac_includes_default #include <$ac_header> _ACEOF @@ -21360,7 +21713,8 @@ ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_header_compiler=no fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -21372,13 +21726,17 @@ echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include <$ac_header> _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -21395,7 +21753,8 @@ ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext @@ -21408,14 +21767,32 @@ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf at gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; no:yes ) { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf at gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; esac echo "$as_me:$LINENO: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 @@ -21448,37 +21825,44 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. */ -#include + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ +#ifdef __STDC__ +# include +#else +# include +#endif /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func (); -char (*f) (); - -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif -int -main () -{ /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -f = $ac_func; +char (*f) () = $ac_func; +#endif +#ifdef __cplusplus +} #endif +int +main () +{ +return f != $ac_func; ; return 0; } @@ -21498,7 +21882,8 @@ eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -21523,7 +21908,11 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ $ac_includes_default /* malloc might have been renamed as rpl_malloc. */ #undef malloc @@ -21666,11 +22055,12 @@ else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ( exit $ac_status ) ac_cv_func_mmap_fixed_mapped=no fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5 @@ -21698,13 +22088,19 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test "$cross_compiling" = yes; then - { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling" >&5 -echo "$as_me: error: cannot run test program while cross compiling" >&2;} + { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot run test program while cross compiling +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #ifdef HAVE_SYS_MMAN_H #include @@ -21737,11 +22133,12 @@ else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ( exit $ac_status ) ac_cv_func_mmap_file=no fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -21783,16 +22180,14 @@ cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include #include #include -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -21816,7 +22211,8 @@ ac_cv_header_mmap_anon=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_header_mmap_anon=no fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -21844,7 +22240,11 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include #include #ifdef signal @@ -21856,12 +22256,6 @@ void (*signal ()) (); #endif -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -21885,7 +22279,8 @@ ac_cv_type_signal=void else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_type_signal=int fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -21917,37 +22312,44 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. */ -#include + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ +#ifdef __STDC__ +# include +#else +# include +#endif /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func (); -char (*f) (); - -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif -int -main () -{ /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -f = $ac_func; +char (*f) () = $ac_func; +#endif +#ifdef __cplusplus +} #endif +int +main () +{ +return f != $ac_func; ; return 0; } @@ -21967,7 +22369,8 @@ eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -21991,37 +22394,44 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char mmap (); below. */ -#include + which can conflict with char mmap (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ +#ifdef __STDC__ +# include +#else +# include +#endif /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char mmap (); -char (*f) (); - -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif -int -main () -{ /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_mmap) || defined (__stub___mmap) choke me #else -f = mmap; +char (*f) () = mmap; +#endif +#ifdef __cplusplus +} #endif +int +main () +{ +return f != mmap; ; return 0; } @@ -22041,7 +22451,8 @@ ac_cv_func_mmap=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_func_mmap=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -22063,37 +22474,44 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char mprotect (); below. */ -#include + which can conflict with char mprotect (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ +#ifdef __STDC__ +# include +#else +# include +#endif /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char mprotect (); -char (*f) (); - -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif -int -main () -{ /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_mprotect) || defined (__stub___mprotect) choke me #else -f = mprotect; +char (*f) () = mprotect; +#endif +#ifdef __cplusplus +} #endif +int +main () +{ +return f != mprotect; ; return 0; } @@ -22113,7 +22531,8 @@ ac_cv_func_mprotect=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_func_mprotect=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -22291,7 +22710,7 @@ fi; -ac_config_files="$ac_config_files Makefile.config" + ac_config_files="$ac_config_files Makefile.config" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -22302,7 +22721,7 @@ # config.status only pays attention to the cache file if you give it # the --recheck option to rerun configure. # -# `ac_cv_env_foo' variables (set or unset) will be overriden when +# `ac_cv_env_foo' variables (set or unset) will be overridden when # loading this file, other *unset* `ac_cv_foo' will be assigned the # following values. @@ -22337,7 +22756,7 @@ t end /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ : end' >>confcache -if cmp -s $cache_file confcache; then :; else +if diff $cache_file confcache >/dev/null 2>&1; then :; else if test -w $cache_file; then test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" cat confcache >$cache_file @@ -22368,6 +22787,21 @@ DEFS=-DHAVE_CONFIG_H +ac_libobjs= +ac_ltlibobjs= +for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue + # 1. Remove the extension, and $U if already installed. + ac_i=`echo "$ac_i" | + sed 's/\$U\././;s/\.o$//;s/\.obj$//'` + # 2. Add them. + ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" + ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' +done +LIBOBJS=$ac_libobjs + +LTLIBOBJS=$ac_ltlibobjs + + : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files @@ -22382,11 +22816,12 @@ # configure, is in config.log if it exists. debug=false +ac_cs_recheck=false +ac_cs_silent=false SHELL=\${CONFIG_SHELL-$SHELL} _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF - ## --------------------- ## ## M4sh Initialization. ## ## --------------------- ## @@ -22395,11 +22830,13 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then set -o posix fi -# NLS nuisances. # Support unset when possible. if (FOO=FOO; unset FOO) >/dev/null 2>&1; then as_unset=unset @@ -22407,34 +22844,42 @@ as_unset=false fi -(set +x; test -n "`(LANG=C; export LANG) 2>&1`") && - { $as_unset LANG || test "${LANG+set}" != set; } || - { LANG=C; export LANG; } -(set +x; test -n "`(LC_ALL=C; export LC_ALL) 2>&1`") && - { $as_unset LC_ALL || test "${LC_ALL+set}" != set; } || - { LC_ALL=C; export LC_ALL; } -(set +x; test -n "`(LC_TIME=C; export LC_TIME) 2>&1`") && - { $as_unset LC_TIME || test "${LC_TIME+set}" != set; } || - { LC_TIME=C; export LC_TIME; } -(set +x; test -n "`(LC_CTYPE=C; export LC_CTYPE) 2>&1`") && - { $as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set; } || - { LC_CTYPE=C; export LC_CTYPE; } -(set +x; test -n "`(LANGUAGE=C; export LANGUAGE) 2>&1`") && - { $as_unset LANGUAGE || test "${LANGUAGE+set}" != set; } || - { LANGUAGE=C; export LANGUAGE; } -(set +x; test -n "`(LC_COLLATE=C; export LC_COLLATE) 2>&1`") && - { $as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set; } || - { LC_COLLATE=C; export LC_COLLATE; } -(set +x; test -n "`(LC_NUMERIC=C; export LC_NUMERIC) 2>&1`") && - { $as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set; } || - { LC_NUMERIC=C; export LC_NUMERIC; } -(set +x; test -n "`(LC_MESSAGES=C; export LC_MESSAGES) 2>&1`") && - { $as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set; } || - { LC_MESSAGES=C; export LC_MESSAGES; } + +# Work around bugs in pre-3.0 UWIN ksh. +$as_unset ENV MAIL MAILPATH +PS1='$ ' +PS2='> ' +PS4='+ ' + +# NLS nuisances. +for as_var in \ + LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ + LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ + LC_TELEPHONE LC_TIME +do + if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then + eval $as_var=C; export $as_var + else + $as_unset $as_var + fi +done + +# Required to use basename. +if expr a : '\(a\)' >/dev/null 2>&1; then + as_expr=expr +else + as_expr=false +fi + +if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false +fi # Name of the executable. -as_me=`(basename "$0") 2>/dev/null || +as_me=`$as_basename "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)$' \| \ @@ -22445,6 +22890,7 @@ /^X\/\(\/\).*/{ s//\1/; q; } s/.*/./; q'` + # PATH needs CR, and LINENO needs CR and PATH. # Avoid depending upon Character Ranges. as_cr_letters='abcdefghijklmnopqrstuvwxyz' @@ -22455,15 +22901,15 @@ # The user is always right. if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conftest.sh - echo "exit 0" >>conftest.sh - chmod +x conftest.sh - if (PATH=".;."; conftest.sh) >/dev/null 2>&1; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then PATH_SEPARATOR=';' else PATH_SEPARATOR=: fi - rm -f conftest.sh + rm -f conf$$.sh fi @@ -22512,6 +22958,8 @@ as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` test "x$as_lineno_1" != "x$as_lineno_2" && test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then + $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } + $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } CONFIG_SHELL=$as_dir/$as_base export CONFIG_SHELL exec "$CONFIG_SHELL" "$0" ${1+"$@"} @@ -22585,6 +23033,12 @@ fi rm -f conf$$ conf$$.exe conf$$.file +if mkdir -p . 2>/dev/null; then + as_mkdir_p=: +else + as_mkdir_p=false +fi + as_executable_p="test -f" # Sed expression to map a string onto a valid CPP name. @@ -22601,7 +23055,7 @@ IFS=" $as_nl" # CDPATH. -$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=$PATH_SEPARATOR; export CDPATH; } +$as_unset CDPATH exec 6>&1 @@ -22618,7 +23072,7 @@ cat >&5 <<_CSEOF This file was extended by [LLVM] $as_me [1.0], which was -generated by GNU Autoconf 2.53. Invocation command line was +generated by GNU Autoconf 2.57. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -22658,6 +23112,7 @@ -h, --help print this help, then exit -V, --version print version number, then exit + -q, --quiet do not print progress messages -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions --file=FILE[:TEMPLATE] @@ -22680,7 +23135,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ [LLVM] config.status [1.0] -configured by $0, generated by GNU Autoconf 2.53, +configured by $0, generated by GNU Autoconf 2.57, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 @@ -22701,25 +23156,25 @@ --*=*) ac_option=`expr "x$1" : 'x\([^=]*\)='` ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` - shift - set dummy "$ac_option" "$ac_optarg" ${1+"$@"} - shift + ac_shift=: + ;; + -*) + ac_option=$1 + ac_optarg=$2 + ac_shift=shift ;; - -*);; *) # This is not an option, so the user has probably given explicit # arguments. + ac_option=$1 ac_need_defaults=false;; esac - case $1 in + case $ac_option in # Handling of the options. _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - echo "running $SHELL $0 " $ac_configure_args " --no-create --no-recursion" - exec $SHELL $0 $ac_configure_args --no-create --no-recursion ;; -_ACEOF cat >>$CONFIG_STATUS <<\_ACEOF + -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) + ac_cs_recheck=: ;; --version | --vers* | -V ) echo "$ac_cs_version"; exit 0 ;; --he | --h) @@ -22734,13 +23189,16 @@ --debug | --d* | -d ) debug=: ;; --file | --fil | --fi | --f ) - shift - CONFIG_FILES="$CONFIG_FILES $1" + $ac_shift + CONFIG_FILES="$CONFIG_FILES $ac_optarg" ac_need_defaults=false;; --header | --heade | --head | --hea ) - shift - CONFIG_HEADERS="$CONFIG_HEADERS $1" + $ac_shift + CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" ac_need_defaults=false;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil | --si | --s) + ac_cs_silent=: ;; # This is an error. -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 @@ -22755,6 +23213,20 @@ shift done +ac_configure_extra_args= + +if $ac_cs_silent; then + exec 6>/dev/null + ac_configure_extra_args="$ac_configure_extra_args --silent" +fi + +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF +if \$ac_cs_recheck; then + echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 + exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion +fi + _ACEOF cat >>$CONFIG_STATUS <<_ACEOF @@ -23114,6 +23586,9 @@ test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands fi +# Have a temporary directory for convenience. Make it in the build tree +# simply because there is no reason to put it here, and in addition, +# creating and moving files from /tmp can sometimes cause problems. # Create a temporary directory, and hook for its removal unless debugging. $debug || { @@ -23122,17 +23597,17 @@ } # Create a (secure) tmp directory for tmp files. -: ${TMPDIR=/tmp} + { - tmp=`(umask 077 && mktemp -d -q "$TMPDIR/csXXXXXX") 2>/dev/null` && + tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" } || { - tmp=$TMPDIR/cs$$-$RANDOM + tmp=./confstat$$-$RANDOM (umask 077 && mkdir $tmp) } || { - echo "$me: cannot create a temporary directory in $TMPDIR" >&2 + echo "$me: cannot create a temporary directory in ." >&2 { (exit 1); exit 1; } } @@ -23251,6 +23726,7 @@ s, at SPEC_ROOT@,$SPEC_ROOT,;t t s, at BCR@,$BCR,;t t s, at PAPIDIR@,$PAPIDIR,;t t +s, at LTLIBOBJS@,$LTLIBOBJS,;t t CEOF _ACEOF @@ -23321,25 +23797,30 @@ /^X\(\/\/\)$/{ s//\1/; q; } /^X\(\/\).*/{ s//\1/; q; } s/.*/./; q'` - { case "$ac_dir" in - [\\/]* | ?:[\\/]* ) as_incr_dir=;; - *) as_incr_dir=.;; -esac -as_dummy="$ac_dir" -for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do - case $as_mkdir_dir in - # Skip DOS drivespec - ?:) as_incr_dir=$as_mkdir_dir ;; - *) - as_incr_dir=$as_incr_dir/$as_mkdir_dir - test -d "$as_incr_dir" || - mkdir "$as_incr_dir" || - { { echo "$as_me:$LINENO: error: cannot create \"$ac_dir\"" >&5 -echo "$as_me: error: cannot create \"$ac_dir\"" >&2;} - { (exit 1); exit 1; }; } - ;; - esac -done; } + { if $as_mkdir_p; then + mkdir -p "$ac_dir" + else + as_dir="$ac_dir" + as_dirs= + while test ! -d "$as_dir"; do + as_dirs="$as_dir $as_dirs" + as_dir=`(dirname "$as_dir") 2>/dev/null || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + done + test ! -n "$as_dirs" || mkdir $as_dirs + fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 +echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} + { (exit 1); exit 1; }; }; } ac_builddir=. @@ -23369,7 +23850,7 @@ # Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be # absolute. ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` -ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd` +ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` @@ -23559,7 +24040,7 @@ # Break up conftest.defines because some shells have a limit on the size # of here documents, and old seds have small limits too (100 cmds). echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS -echo ' if egrep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS +echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS echo ' :' >>$CONFIG_STATUS rm -f conftest.tail @@ -23583,7 +24064,7 @@ mv conftest.tail conftest.defines done rm -f conftest.defines -echo ' fi # egrep' >>$CONFIG_STATUS +echo ' fi # grep' >>$CONFIG_STATUS echo >>$CONFIG_STATUS # Break up conftest.undefs because some shells have a limit on the size @@ -23623,7 +24104,7 @@ cat $tmp/in >>$tmp/config.h rm -f $tmp/in if test x"$ac_file" != x-; then - if cmp -s $ac_file $tmp/config.h 2>/dev/null; then + if diff $ac_file $tmp/config.h >/dev/null 2>&1; then { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else @@ -23639,25 +24120,30 @@ /^X\(\/\/\)$/{ s//\1/; q; } /^X\(\/\).*/{ s//\1/; q; } s/.*/./; q'` - { case "$ac_dir" in - [\\/]* | ?:[\\/]* ) as_incr_dir=;; - *) as_incr_dir=.;; -esac -as_dummy="$ac_dir" -for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do - case $as_mkdir_dir in - # Skip DOS drivespec - ?:) as_incr_dir=$as_mkdir_dir ;; - *) - as_incr_dir=$as_incr_dir/$as_mkdir_dir - test -d "$as_incr_dir" || - mkdir "$as_incr_dir" || - { { echo "$as_me:$LINENO: error: cannot create \"$ac_dir\"" >&5 -echo "$as_me: error: cannot create \"$ac_dir\"" >&2;} - { (exit 1); exit 1; }; } - ;; - esac -done; } + { if $as_mkdir_p; then + mkdir -p "$ac_dir" + else + as_dir="$ac_dir" + as_dirs= + while test ! -d "$as_dir"; do + as_dirs="$as_dir $as_dirs" + as_dir=`(dirname "$as_dir") 2>/dev/null || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + done + test ! -n "$as_dirs" || mkdir $as_dirs + fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 +echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} + { (exit 1); exit 1; }; }; } rm -f $ac_file mv $tmp/config.h $ac_file @@ -23716,7 +24202,7 @@ # Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be # absolute. ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` -ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd` +ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` @@ -23908,8 +24394,11 @@ # need to make the FD available again. if test "$no_create" != yes; then ac_cs_success=: + ac_config_status_args= + test "$silent" = yes && + ac_config_status_args="$ac_config_status_args --quiet" exec 5>/dev/null - $SHELL $CONFIG_STATUS || ac_cs_success=false + $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. From lattner at cs.uiuc.edu Wed Sep 10 10:34:02 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Wed Sep 10 10:34:02 2003 Subject: [llvm-commits] CVS: llvm/test/Regression/Transforms/ADCE/2003-09-10-UnwindInstFail.ll Message-ID: <200309101533.KAA20546@apoc.cs.uiuc.edu> Changes in directory llvm/test/Regression/Transforms/ADCE: 2003-09-10-UnwindInstFail.ll added (r1.1) --- Log message: New testcase --- Diffs of the changes: Index: llvm/test/Regression/Transforms/ADCE/2003-09-10-UnwindInstFail.ll diff -c /dev/null llvm/test/Regression/Transforms/ADCE/2003-09-10-UnwindInstFail.ll:1.1 *** /dev/null Wed Sep 10 10:33:43 2003 --- llvm/test/Regression/Transforms/ADCE/2003-09-10-UnwindInstFail.ll Wed Sep 10 10:33:33 2003 *************** *** 0 **** --- 1,20 ---- + ; RUN: as < %s | opt -adce -disable-output + + implementation ; Functions: + + void %test() { + br bool false, label %then, label %endif + + then: + invoke void null( sbyte* null ) + to label %invoke_cont except label %invoke_catch + + invoke_catch: + unwind + + invoke_cont: + ret void + + endif: + ret void + } From criswell at cs.uiuc.edu Wed Sep 10 10:43:02 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Wed Sep 10 10:43:02 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/SingleSource/Gizmos/ Message-ID: <200309101542.KAA07333@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/SingleSource/Gizmos: --- Log message: Directory /home/vadve/vadve/Research/DynOpt/CVSRepository/llvm/test/Programs/SingleSource/Gizmos added to the repository --- Diffs of the changes: From criswell at cs.uiuc.edu Wed Sep 10 10:50:01 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Wed Sep 10 10:50:01 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/SingleSource/Gizmos/Makefile Message-ID: <200309101549.KAA29355@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/SingleSource/Gizmos: Makefile added (r1.1) --- Log message: Adding Makefile for building the Gizmos directory. --- Diffs of the changes: Index: llvm/test/Programs/SingleSource/Gizmos/Makefile diff -c /dev/null llvm/test/Programs/SingleSource/Gizmos/Makefile:1.1 *** /dev/null Wed Sep 10 10:49:13 2003 --- llvm/test/Programs/SingleSource/Gizmos/Makefile Wed Sep 10 10:49:03 2003 *************** *** 0 **** --- 1,4 ---- + LEVEL = ../../../.. + LDFLAGS += -lm + + include ../Makefile.singlesrc From criswell at cs.uiuc.edu Wed Sep 10 10:51:02 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Wed Sep 10 10:51:02 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/SingleSource/Benchmarks/ Message-ID: <200309101550.KAA29370@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/SingleSource/Benchmarks: --- Log message: Directory /home/vadve/vadve/Research/DynOpt/CVSRepository/llvm/test/Programs/SingleSource/Benchmarks added to the repository --- Diffs of the changes: From criswell at cs.uiuc.edu Wed Sep 10 10:51:10 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Wed Sep 10 10:51:10 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/SingleSource/Benchmarks/Dhrystone/ Message-ID: <200309101550.KAA29380@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/SingleSource/Benchmarks/Dhrystone: --- Log message: Directory /home/vadve/vadve/Research/DynOpt/CVSRepository/llvm/test/Programs/SingleSource/Benchmarks/Dhrystone added to the repository --- Diffs of the changes: From lattner at cs.uiuc.edu Wed Sep 10 11:09:04 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Wed Sep 10 11:09:04 2003 Subject: [llvm-commits] CVS: llvm/lib/Analysis/PostDominators.cpp Message-ID: <200309101608.LAA02087@apoc.cs.uiuc.edu> Changes in directory llvm/lib/Analysis: PostDominators.cpp updated: 1.38 -> 1.39 --- Log message: Remove using declarations --- Diffs of the changes: Index: llvm/lib/Analysis/PostDominators.cpp diff -u llvm/lib/Analysis/PostDominators.cpp:1.38 llvm/lib/Analysis/PostDominators.cpp:1.39 --- llvm/lib/Analysis/PostDominators.cpp:1.38 Fri Oct 4 09:50:20 2002 +++ llvm/lib/Analysis/PostDominators.cpp Wed Sep 10 11:08:03 2003 @@ -9,7 +9,6 @@ #include "llvm/Support/CFG.h" #include "Support/DepthFirstIterator.h" #include "Support/SetOperations.h" -using std::set; //===----------------------------------------------------------------------===// // PostDominatorSet Implementation @@ -40,7 +39,7 @@ do { Changed = false; - set Visited; + std::set Visited; DomSetType WorkingSet; idf_iterator It = idf_begin(Root), End = idf_end(Root); for ( ; It != End; ++It) { From criswell at cs.uiuc.edu Wed Sep 10 11:26:02 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Wed Sep 10 11:26:02 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/SingleSource/Benchmarks/Shootout/Makefile Message-ID: <200309101625.LAA28318@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/SingleSource/Benchmarks/Shootout: Makefile updated: 1.1 -> 1.2 --- Log message: Updated Makefiles for their new home. --- Diffs of the changes: Index: llvm/test/Programs/SingleSource/Benchmarks/Shootout/Makefile diff -u llvm/test/Programs/SingleSource/Benchmarks/Shootout/Makefile:1.1 llvm/test/Programs/SingleSource/Benchmarks/Shootout/Makefile:1.2 --- llvm/test/Programs/SingleSource/Benchmarks/Shootout/Makefile:1.1 Tue Jan 22 09:31:59 2002 +++ llvm/test/Programs/SingleSource/Benchmarks/Shootout/Makefile Wed Sep 10 11:25:46 2003 @@ -1,5 +1,5 @@ # Shootout/Makefile -LEVEL = ../../../.. -include ../Makefile.singlesrc +LEVEL = ../../../../.. +include ../../Makefile.singlesrc From criswell at cs.uiuc.edu Wed Sep 10 11:26:10 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Wed Sep 10 11:26:10 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/SingleSource/Benchmarks/Stanford/Makefile Message-ID: <200309101625.LAA28325@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/SingleSource/Benchmarks/Stanford: Makefile updated: 1.1 -> 1.2 --- Log message: Updated Makefiles for their new home. --- Diffs of the changes: Index: llvm/test/Programs/SingleSource/Benchmarks/Stanford/Makefile diff -u llvm/test/Programs/SingleSource/Benchmarks/Stanford/Makefile:1.1 llvm/test/Programs/SingleSource/Benchmarks/Stanford/Makefile:1.2 --- llvm/test/Programs/SingleSource/Benchmarks/Stanford/Makefile:1.1 Mon May 12 12:39:14 2003 +++ llvm/test/Programs/SingleSource/Benchmarks/Stanford/Makefile Wed Sep 10 11:25:48 2003 @@ -1,3 +1,3 @@ -LEVEL = ../../../.. +LEVEL = ../../../../.. -include ../Makefile.singlesrc +include ../../Makefile.singlesrc From criswell at cs.uiuc.edu Wed Sep 10 11:32:02 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Wed Sep 10 11:32:02 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/SingleSource/Benchmarks/Misc/ Message-ID: <200309101631.LAA28413@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/SingleSource/Benchmarks/Misc: --- Log message: Directory /home/vadve/vadve/Research/DynOpt/CVSRepository/llvm/test/Programs/SingleSource/Benchmarks/Misc added to the repository --- Diffs of the changes: From criswell at cs.uiuc.edu Wed Sep 10 11:58:02 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Wed Sep 10 11:58:02 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/SingleSource/Makefile DuffsDevice.c dry.c fldry.c mandel.c matrixTranspose.c pi.c richards_benchmark.c sumarray.c sumarray2d.c sumarraymalloc.c test_indvars.c Message-ID: <200309101657.LAA29839@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/SingleSource: Makefile updated: 1.8 -> 1.9 DuffsDevice.c (r1.1) removed dry.c (r1.4) removed fldry.c (r1.4) removed mandel.c (r1.6) removed matrixTranspose.c (r1.2) removed pi.c (r1.3) removed richards_benchmark.c (r1.1) removed sumarray.c (r1.1) removed sumarray2d.c (r1.1) removed sumarraymalloc.c (r1.1) removed test_indvars.c (r1.3) removed --- Log message: Implementing new placement of SingleSource programs: o Gizmos holds programs that do little, nifty things, like summing array, computing pi, or showing how strange C code can look (DuffsDevice). o Benchmarks holds all of the benchmark programs. --- Diffs of the changes: Index: llvm/test/Programs/SingleSource/Makefile diff -u llvm/test/Programs/SingleSource/Makefile:1.8 llvm/test/Programs/SingleSource/Makefile:1.9 --- llvm/test/Programs/SingleSource/Makefile:1.8 Fri May 30 13:05:03 2003 +++ llvm/test/Programs/SingleSource/Makefile Wed Sep 10 11:56:59 2003 @@ -1,5 +1,5 @@ LEVEL = ../../.. -PARALLEL_DIRS = UnitTests Shootout Stanford CustomChecked +PARALLEL_DIRS = UnitTests Benchmarks Gizmos CustomChecked LDFLAGS += -lm include Makefile.singlesrc From criswell at cs.uiuc.edu Wed Sep 10 13:26:02 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Wed Sep 10 13:26:02 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/SingleSource/Shootout/ackermann.c ary3.c fib2.c hash.c heapsort.c hello.c lists.c matrix.c methcall.c nestedloop.c objinst.c random.c sieve.c strcat.c Message-ID: <200309101825.NAA30004@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/SingleSource/Shootout: ackermann.c (r1.2) removed ary3.c (r1.2) removed fib2.c (r1.1) removed hash.c (r1.1) removed heapsort.c (r1.1) removed hello.c (r1.1) removed lists.c (r1.5) removed matrix.c (r1.2) removed methcall.c (r1.1) removed nestedloop.c (r1.1) removed objinst.c (r1.2) removed random.c (r1.3) removed sieve.c (r1.2) removed strcat.c (r1.1) removed --- Log message: Moved to test/Programs/SingleSource/Benchmarks/Shootout. --- Diffs of the changes: From criswell at cs.uiuc.edu Wed Sep 10 13:26:10 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Wed Sep 10 13:26:10 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/SingleSource/Shootout/Makefile README.txt simple_hash.h Message-ID: <200309101825.NAA30018@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/SingleSource/Shootout: Makefile (r1.1) removed README.txt (r1.1) removed simple_hash.h (r1.2) removed --- Log message: Moved to test/Programs/SingleSource/Benchmarks/Shootout. --- Diffs of the changes: From criswell at cs.uiuc.edu Wed Sep 10 13:27:01 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Wed Sep 10 13:27:01 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/SingleSource/Stanford/Bubblesort.c IntMM.c Makefile Oscar.c Perm.c Puzzle.c Queens.c Quicksort.c RealMM.c Towers.c Treesort.c Message-ID: <200309101826.NAA30038@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/SingleSource/Stanford: Bubblesort.c (r1.1) removed IntMM.c (r1.1) removed Makefile (r1.1) removed Oscar.c (r1.1) removed Perm.c (r1.1) removed Puzzle.c (r1.1) removed Queens.c (r1.1) removed Quicksort.c (r1.1) removed RealMM.c (r1.1) removed Towers.c (r1.1) removed Treesort.c (r1.1) removed --- Log message: Moved to test/Programs/SingleSource/Benchmarks/Stanford. --- Diffs of the changes: From criswell at cs.uiuc.edu Wed Sep 10 13:39:03 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Wed Sep 10 13:39:03 2003 Subject: [llvm-commits] CVS: llvm/configure Message-ID: <200309101838.NAA30147@choi.cs.uiuc.edu> Changes in directory llvm: configure updated: 1.16 -> 1.17 --- Log message: Updated to reflect the new locations of SingleSource tests. --- Diffs of the changes: Index: llvm/configure diff -u llvm/configure:1.16 llvm/configure:1.17 --- llvm/configure:1.16 Wed Sep 10 10:17:25 2003 +++ llvm/configure Wed Sep 10 13:38:42 2003 @@ -1889,13 +1889,25 @@ ac_config_commands="$ac_config_commands test/Programs/SingleSource/Makefile.singlesrc" - ac_config_commands="$ac_config_commands test/Programs/SingleSource/CustomChecked/Makefile" + ac_config_commands="$ac_config_commands test/Programs/SingleSource/Gizmos/Makefile" + + + ac_config_commands="$ac_config_commands test/Programs/SingleSource/Benchmarks/Makefile" + + + ac_config_commands="$ac_config_commands test/Programs/SingleSource/Benchmarks/Dhrystone/Makefile" - ac_config_commands="$ac_config_commands test/Programs/SingleSource/Shootout/Makefile" + ac_config_commands="$ac_config_commands test/Programs/SingleSource/Benchmarks/Shootout/Makefile" - ac_config_commands="$ac_config_commands test/Programs/SingleSource/Stanford/Makefile" + ac_config_commands="$ac_config_commands test/Programs/SingleSource/Benchmarks/Stanford/Makefile" + + + ac_config_commands="$ac_config_commands test/Programs/SingleSource/Benchmarks/Misc/Makefile" + + + ac_config_commands="$ac_config_commands test/Programs/SingleSource/CustomChecked/Makefile" ac_config_commands="$ac_config_commands test/Programs/SingleSource/UnitTests/Makefile" @@ -4344,7 +4356,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4347 "configure"' > conftest.$ac_ext + echo '#line 4359 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5185,7 +5197,7 @@ # Provide some information about the compiler. -echo "$as_me:5188:" \ +echo "$as_me:5200:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 @@ -6194,11 +6206,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6197: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6209: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6201: \$? = $ac_status" >&5 + echo "$as_me:6213: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -6426,11 +6438,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6429: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6441: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6433: \$? = $ac_status" >&5 + echo "$as_me:6445: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -6493,11 +6505,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6496: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6508: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:6500: \$? = $ac_status" >&5 + echo "$as_me:6512: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8505,7 +8517,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:10754: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:10746: \$? = $ac_status" >&5 + echo "$as_me:10758: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -10806,11 +10818,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10809: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10821: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:10813: \$? = $ac_status" >&5 + echo "$as_me:10825: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12049,7 +12061,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:12984: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12976: \$? = $ac_status" >&5 + echo "$as_me:12988: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -13036,11 +13048,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13039: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13051: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13043: \$? = $ac_status" >&5 + echo "$as_me:13055: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14980,11 +14992,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14983: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14995: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14987: \$? = $ac_status" >&5 + echo "$as_me:14999: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -15212,11 +15224,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15215: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15227: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15219: \$? = $ac_status" >&5 + echo "$as_me:15231: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -15279,11 +15291,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15282: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15294: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15286: \$? = $ac_status" >&5 + echo "$as_me:15298: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17291,7 +17303,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext < Changes in directory llvm/autoconf: configure.ac updated: 1.9 -> 1.10 --- Log message: Updated to reflect the new locations of SingleSource tests. --- Diffs of the changes: Index: llvm/autoconf/configure.ac diff -u llvm/autoconf/configure.ac:1.9 llvm/autoconf/configure.ac:1.10 --- llvm/autoconf/configure.ac:1.9 Wed Sep 10 10:13:21 2003 +++ llvm/autoconf/configure.ac Wed Sep 10 13:38:44 2003 @@ -153,9 +153,13 @@ AC_CONFIG_MAKEFILE(test/Programs/NoSource/m4/Makefile) AC_CONFIG_MAKEFILE(test/Programs/SingleSource/Makefile) AC_CONFIG_MAKEFILE(test/Programs/SingleSource/Makefile.singlesrc) +AC_CONFIG_MAKEFILE(test/Programs/SingleSource/Gizmos/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/SingleSource/Benchmarks/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/SingleSource/Benchmarks/Dhrystone/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/SingleSource/Benchmarks/Shootout/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/SingleSource/Benchmarks/Stanford/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/SingleSource/Benchmarks/Misc/Makefile) AC_CONFIG_MAKEFILE(test/Programs/SingleSource/CustomChecked/Makefile) -AC_CONFIG_MAKEFILE(test/Programs/SingleSource/Shootout/Makefile) -AC_CONFIG_MAKEFILE(test/Programs/SingleSource/Stanford/Makefile) AC_CONFIG_MAKEFILE(test/Programs/SingleSource/UnitTests/Makefile) AC_CONFIG_MAKEFILE(tools/Makefile) AC_CONFIG_MAKEFILE(tools/analyze/Makefile) From criswell at cs.uiuc.edu Wed Sep 10 13:45:03 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Wed Sep 10 13:45:03 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/SingleSource/FloatPrecision.c StructModifyTest.c TestLoop.c printargs.c Message-ID: <200309101844.NAA30218@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/SingleSource: FloatPrecision.c (r1.1) removed StructModifyTest.c (r1.1) removed TestLoop.c (r1.1) removed printargs.c (r1.2) removed --- Log message: Moved FloatPrecision.c, StructModifyTest.c, TestLoop.c, and printargs.c to UnitTests. --- Diffs of the changes: From gaeke at cs.uiuc.edu Wed Sep 10 13:47:02 2003 From: gaeke at cs.uiuc.edu (Brian Gaeke) Date: Wed Sep 10 13:47:02 2003 Subject: [llvm-commits] CVS: reopt/lib/README Message-ID: <200309101846.NAA27226@gally.cs.uiuc.edu> Changes in directory reopt/lib: README updated: 1.4 -> 1.5 --- Log message: Add some portability observations. --- Diffs of the changes: Index: reopt/lib/README diff -u reopt/lib/README:1.4 reopt/lib/README:1.5 --- reopt/lib/README:1.4 Fri Aug 22 12:42:50 2003 +++ reopt/lib/README Wed Sep 10 13:46:21 2003 @@ -8,6 +8,11 @@ Inst - Joel Stanley's project. - The mkexcl tool that used to be here was moved to reopt/tools/mkexcl. + - Portability notes: + Inst/lib/ElfReader - Depends on libelf from Solaris. + Inst/lib/InstManip - Unportable assumptions about pointer sizes. + Inst/lib/SparcInstManip - Unportable assumptions about pointer sizes. + Inst/lib/Phases - Uses getexecname(), presumably from Solaris. SSAPRE - Contains a project by Tanya Brethour that does loop invariant @@ -25,6 +30,13 @@ - Anand's redesigned reoptimizer. Uses first-level and second-level instrumentation. - This used to be in LightWtProfiling/Trigger. + - Portability notes: + SecondTrigger + - Depends on libcpc.h from Solaris - port to use PAPI. + - Unportable pointer size assumptions + - Uses SPARC inline assembly. + FirstTrigger + - Uses SPARC inline assembly. TraceCache - Manages traces for the reoptimizers. @@ -43,3 +55,6 @@ Cameron Buschardt. - Used by: Trigger, SSAPRE/RuntimeLICM.cpp (only LLVMTrace), Inst/lib/SparcInstManip.{cpp,h} + - Portability notes: Supports SPARC binaries only. Should compile & + link fine on X86. + From gaeke at cs.uiuc.edu Wed Sep 10 13:48:03 2003 From: gaeke at cs.uiuc.edu (Brian Gaeke) Date: Wed Sep 10 13:48:03 2003 Subject: [llvm-commits] CVS: reopt/lib/LightWtProfiling/Timer.cpp Message-ID: <200309101847.NAA27289@gally.cs.uiuc.edu> Changes in directory reopt/lib/LightWtProfiling: Timer.cpp updated: 1.2 -> 1.3 --- Log message: Remove some gratuitous uses of C-only headers and printf. This compiles on Linux/x86 now. --- Diffs of the changes: Index: reopt/lib/LightWtProfiling/Timer.cpp diff -u reopt/lib/LightWtProfiling/Timer.cpp:1.2 reopt/lib/LightWtProfiling/Timer.cpp:1.3 --- reopt/lib/LightWtProfiling/Timer.cpp:1.2 Tue Aug 5 13:21:27 2003 +++ reopt/lib/LightWtProfiling/Timer.cpp Wed Sep 10 13:47:14 2003 @@ -1,10 +1,10 @@ -#include -#include -#include -#include +#include "Support/DataTypes.h" +#include "GetTimer.h" +#include #include #include -#include "GetTimer.h" +#include +#include extern "C" void do_timer_interval(); uint64_t llvm_interval_counter; @@ -37,10 +37,8 @@ { //mask_all_interrupt(); signal(SIGUSR2, SIG_IGN); - //printf("---------------------ding\n"); llvm_interval_counter++; do_timer_interval(); - //printf("---------------------dong\n"); signal(SIGUSR2, &timer_handler); //unmask_all_interrupt(); } @@ -67,7 +65,7 @@ else duration_msec = DEFAULT_LLVM_TIMER_INTERVAL_MSEC; if(timer_create(CLOCK_REALTIME, &timer_evp, &timer_id)<0) - printf(" error\n"); + std::cerr << "Error initializing timer.\n"; //initializing the timer timer_spec.it_value.tv_sec = duration_sec; From gaeke at cs.uiuc.edu Wed Sep 10 14:38:04 2003 From: gaeke at cs.uiuc.edu (Brian Gaeke) Date: Wed Sep 10 14:38:04 2003 Subject: [llvm-commits] CVS: llvm/lib/VMCore/Verifier.cpp Message-ID: <200309101937.OAA13959@zion.cs.uiuc.edu> Changes in directory llvm/lib/VMCore: Verifier.cpp updated: 1.59 -> 1.60 --- Log message: Make createVerifierPass return a FunctionPass *. --- Diffs of the changes: Index: llvm/lib/VMCore/Verifier.cpp diff -u llvm/lib/VMCore/Verifier.cpp:1.59 llvm/lib/VMCore/Verifier.cpp:1.60 --- llvm/lib/VMCore/Verifier.cpp:1.59 Mon Sep 8 14:44:26 2003 +++ llvm/lib/VMCore/Verifier.cpp Wed Sep 10 14:37:01 2003 @@ -557,7 +557,7 @@ // Implement the public interfaces to this file... //===----------------------------------------------------------------------===// -Pass *createVerifierPass() { +FunctionPass *createVerifierPass() { return new Verifier(); } From gaeke at cs.uiuc.edu Wed Sep 10 14:38:12 2003 From: gaeke at cs.uiuc.edu (Brian Gaeke) Date: Wed Sep 10 14:38:12 2003 Subject: [llvm-commits] CVS: llvm/include/llvm/Analysis/Verifier.h Message-ID: <200309101937.OAA13966@zion.cs.uiuc.edu> Changes in directory llvm/include/llvm/Analysis: Verifier.h updated: 1.8 -> 1.9 --- Log message: Make createVerifierPass return a FunctionPass *. --- Diffs of the changes: Index: llvm/include/llvm/Analysis/Verifier.h diff -u llvm/include/llvm/Analysis/Verifier.h:1.8 llvm/include/llvm/Analysis/Verifier.h:1.9 --- llvm/include/llvm/Analysis/Verifier.h:1.8 Fri Aug 30 17:51:08 2002 +++ llvm/include/llvm/Analysis/Verifier.h Wed Sep 10 14:37:03 2003 @@ -14,14 +14,14 @@ #ifndef LLVM_ANALYSIS_VERIFIER_H #define LLVM_ANALYSIS_VERIFIER_H -class Pass; +class FunctionPass; class Module; class Function; // createVerifierPass - Check a module or function for validity. If errors are // detected, error messages corresponding to the problem are printed to stderr. // -Pass *createVerifierPass(); +FunctionPass *createVerifierPass(); // verifyModule - Check a module for errors, printing messages on stderr. // Return true if the module is corrupt. This should only be used for From gaeke at cs.uiuc.edu Wed Sep 10 14:38:20 2003 From: gaeke at cs.uiuc.edu (Brian Gaeke) Date: Wed Sep 10 14:38:20 2003 Subject: [llvm-commits] CVS: llvm/tools/extract/extract.cpp Message-ID: <200309101937.OAA13973@zion.cs.uiuc.edu> Changes in directory llvm/tools/extract: extract.cpp updated: 1.13 -> 1.14 --- Log message: Make createVerifierPass return a FunctionPass *. --- Diffs of the changes: Index: llvm/tools/extract/extract.cpp diff -u llvm/tools/extract/extract.cpp:1.13 llvm/tools/extract/extract.cpp:1.14 --- llvm/tools/extract/extract.cpp:1.13 Tue Nov 19 12:42:59 2002 +++ llvm/tools/extract/extract.cpp Wed Sep 10 14:37:04 2003 @@ -8,6 +8,7 @@ #include "llvm/Module.h" #include "llvm/PassManager.h" +#include "llvm/Pass.h" #include "llvm/Bytecode/Reader.h" #include "llvm/Bytecode/WriteBytecodePass.h" #include "llvm/Transforms/IPO.h" From lattner at cs.uiuc.edu Wed Sep 10 14:39:02 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Wed Sep 10 14:39:02 2003 Subject: [llvm-commits] CVS: llvm/Makefile.rules Message-ID: <200309101938.OAA27650@apoc.cs.uiuc.edu> Changes in directory llvm: Makefile.rules updated: 1.133 -> 1.134 --- Log message: Avoid dumping runtime library bytecode files into lib/Bytecode if building into the source directory --- Diffs of the changes: Index: llvm/Makefile.rules diff -u llvm/Makefile.rules:1.133 llvm/Makefile.rules:1.134 --- llvm/Makefile.rules:1.133 Tue Sep 9 15:56:56 2003 +++ llvm/Makefile.rules Wed Sep 10 14:37:51 2003 @@ -159,7 +159,7 @@ DESTLIBDEBUG := $(BUILD_OBJ_ROOT)/lib/Debug DESTLIBRELEASE := $(BUILD_OBJ_ROOT)/lib/Release DESTLIBPROFILE := $(BUILD_OBJ_ROOT)/lib/Profile -DESTLIBBYTECODE := $(BUILD_OBJ_ROOT)/lib/Bytecode +DESTLIBBYTECODE := $(BUILD_OBJ_ROOT)/lib/BytecodeLibs DESTLIBCURRENT := $(BUILD_OBJ_ROOT)/lib/$(CONFIGURATION) # LLVM libraries used for linking From lattner at cs.uiuc.edu Wed Sep 10 14:44:01 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Wed Sep 10 14:44:01 2003 Subject: [llvm-commits] CVS: llvm/tools/extract/extract.cpp Message-ID: <200309101943.OAA27949@apoc.cs.uiuc.edu> Changes in directory llvm/tools/extract: extract.cpp updated: 1.14 -> 1.15 --- Log message: Clean up header, remove extra #include --- Diffs of the changes: Index: llvm/tools/extract/extract.cpp diff -u llvm/tools/extract/extract.cpp:1.14 llvm/tools/extract/extract.cpp:1.15 --- llvm/tools/extract/extract.cpp:1.14 Wed Sep 10 14:37:04 2003 +++ llvm/tools/extract/extract.cpp Wed Sep 10 14:42:51 2003 @@ -1,5 +1,4 @@ -//===----------------------------------------------------------------------===// -// LLVM extract Utility +//===- extract.cpp - LLVM function extraction utility ---------------------===// // // This utility changes the input module to only contain a single function, // which is primarily used for debugging transformations. @@ -8,7 +7,6 @@ #include "llvm/Module.h" #include "llvm/PassManager.h" -#include "llvm/Pass.h" #include "llvm/Bytecode/Reader.h" #include "llvm/Bytecode/WriteBytecodePass.h" #include "llvm/Transforms/IPO.h" From lattner at cs.uiuc.edu Wed Sep 10 14:54:02 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Wed Sep 10 14:54:02 2003 Subject: [llvm-commits] CVS: llvm/lib/Target/X86/Makefile Message-ID: <200309101953.OAA28382@apoc.cs.uiuc.edu> Changes in directory llvm/lib/Target/X86: Makefile updated: 1.11 -> 1.12 --- Log message: Be a little more specific about what is begin generated. Only print command line if VERBOSE=1 --- Diffs of the changes: Index: llvm/lib/Target/X86/Makefile diff -u llvm/lib/Target/X86/Makefile:1.11 llvm/lib/Target/X86/Makefile:1.12 --- llvm/lib/Target/X86/Makefile:1.11 Tue Sep 9 15:57:00 2003 +++ llvm/lib/Target/X86/Makefile Wed Sep 10 14:52:54 2003 @@ -8,28 +8,28 @@ X86GenInstrInfo.inc X86GenInstrSelector.inc X86GenRegisterNames.inc:: X86.td X86RegisterInfo.td ../Target.td $(TBLGEN) - @echo "Tblgen'ing $<" - $(TBLGEN) -I $(BUILD_SRC_DIR) $< -gen-register-enums -o $@ + @echo "Building $< register names with tblgen" + $(VERB) $(TBLGEN) -I $(BUILD_SRC_DIR) $< -gen-register-enums -o $@ X86GenRegisterInfo.h.inc:: X86.td X86RegisterInfo.td ../Target.td $(TBLGEN) - @echo "Tblgen'ing $<" - $(TBLGEN) -I $(BUILD_SRC_DIR) $< -gen-register-desc-header -o $@ + @echo "Building $< register information header with tblgen" + $(VERB) $(TBLGEN) -I $(BUILD_SRC_DIR) $< -gen-register-desc-header -o $@ X86GenRegisterInfo.inc:: X86.td X86RegisterInfo.td ../Target.td $(TBLGEN) - @echo "Tblgen'ing $<" - $(TBLGEN) -I $(BUILD_SRC_DIR) $< -gen-register-desc -o $@ + @echo "Building $< register information implementation with tblgen" + $(VERB) $(TBLGEN) -I $(BUILD_SRC_DIR) $< -gen-register-desc -o $@ X86GenInstrNames.inc:: X86.td X86InstrInfo.td ../Target.td $(TBLGEN) - @echo "Tblgen'ing $<" - $(TBLGEN) -I $(BUILD_SRC_DIR) $< -gen-instr-enums -o $@ + @echo "Building $< instruction names with tblgen" + $(VERB) $(TBLGEN) -I $(BUILD_SRC_DIR) $< -gen-instr-enums -o $@ X86GenInstrInfo.inc:: X86.td X86InstrInfo.td ../Target.td $(TBLGEN) - @echo "Tblgen'ing $<" - $(TBLGEN) -I $(BUILD_SRC_DIR) $< -gen-instr-desc -o $@ + @echo "Building $< instruction information with tblgen" + $(VERB) $(TBLGEN) -I $(BUILD_SRC_DIR) $< -gen-instr-desc -o $@ X86GenInstrSelector.inc:: X86.td X86InstrInfo.td ../Target.td $(TBLGEN) - @echo "Tblgen'ing $<" - $(TBLGEN) -I $(BUILD_SRC_DIR) $< -gen-instr-selector -o $@ + @echo "Building $< instruction selector with tblgen" + $(VERB) $(TBLGEN) -I $(BUILD_SRC_DIR) $< -gen-instr-selector -o $@ clean:: $(VERB) rm -f *.inc From lattner at cs.uiuc.edu Wed Sep 10 14:54:10 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Wed Sep 10 14:54:10 2003 Subject: [llvm-commits] CVS: llvm/lib/Target/X86/Printer.cpp Message-ID: <200309101953.OAA28387@apoc.cs.uiuc.edu> Changes in directory llvm/lib/Target/X86: Printer.cpp updated: 1.60 -> 1.61 --- Log message: Only emit inter-field-padding if the amount of padding is != 0 --- Diffs of the changes: Index: llvm/lib/Target/X86/Printer.cpp diff -u llvm/lib/Target/X86/Printer.cpp:1.60 llvm/lib/Target/X86/Printer.cpp:1.61 --- llvm/lib/Target/X86/Printer.cpp:1.60 Tue Sep 9 11:23:36 2003 +++ llvm/lib/Target/X86/Printer.cpp Wed Sep 10 14:52:24 2003 @@ -351,7 +351,8 @@ printConstantValueOnly(field); // Insert the field padding unless it's zero bytes... - O << "\t.zero\t " << padSize << "\n"; + if (padSize) + O << "\t.zero\t " << padSize << "\n"; } assert(sizeSoFar == cvsLayout->StructSize && "Layout of constant struct may be incorrect!"); From lattner at cs.uiuc.edu Wed Sep 10 15:09:06 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Wed Sep 10 15:09:06 2003 Subject: [llvm-commits] CVS: llvm/lib/CWriter/Writer.cpp Message-ID: <200309102008.PAA01917@apoc.cs.uiuc.edu> Changes in directory llvm/lib/CWriter: Writer.cpp updated: 1.122 -> 1.123 --- Log message: "the one true solution for compatibility with GCC 3.3+" ... or so I hope --- Diffs of the changes: Index: llvm/lib/CWriter/Writer.cpp diff -u llvm/lib/CWriter/Writer.cpp:1.122 llvm/lib/CWriter/Writer.cpp:1.123 --- llvm/lib/CWriter/Writer.cpp:1.122 Mon Sep 8 14:44:20 2003 +++ llvm/lib/CWriter/Writer.cpp Wed Sep 10 15:08:00 2003 @@ -1133,7 +1133,7 @@ switch (ID) { default: assert(0 && "Unknown LLVM intrinsic!"); case LLVMIntrinsic::va_start: - Out << "va_start((va_list)*"; + Out << "va_start(*(va_list*)"; writeOperand(I.getOperand(1)); Out << ", "; // Output the last argument to the enclosing function... @@ -1141,12 +1141,12 @@ Out << ")"; return; case LLVMIntrinsic::va_end: - Out << "va_end((va_list)*"; + Out << "va_end(*(va_list*)"; writeOperand(I.getOperand(1)); Out << ")"; return; case LLVMIntrinsic::va_copy: - Out << "va_copy((va_list)*"; + Out << "va_copy(*(va_list*)"; writeOperand(I.getOperand(1)); Out << ", (va_list)"; writeOperand(I.getOperand(2)); From lattner at cs.uiuc.edu Wed Sep 10 15:13:05 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Wed Sep 10 15:13:05 2003 Subject: [llvm-commits] CVS: llvm/lib/CWriter/Writer.cpp Message-ID: <200309102012.PAA05482@apoc.cs.uiuc.edu> Changes in directory llvm/lib/CWriter: Writer.cpp updated: 1.123 -> 1.124 --- Log message: Remove a bunch of warnings from the CBE generated C code --- Diffs of the changes: Index: llvm/lib/CWriter/Writer.cpp diff -u llvm/lib/CWriter/Writer.cpp:1.123 llvm/lib/CWriter/Writer.cpp:1.124 --- llvm/lib/CWriter/Writer.cpp:1.123 Wed Sep 10 15:08:00 2003 +++ llvm/lib/CWriter/Writer.cpp Wed Sep 10 15:12:09 2003 @@ -869,12 +869,12 @@ if (FPC->getType() == Type::DoubleTy) Out << " const ConstantDoubleTy FloatConstant" << FPCounter++ << " = 0x" << std::hex << *(unsigned long long*)&Val << std::dec - << "; /* " << Val << " */\n"; + << "ULL; /* " << Val << " */\n"; else if (FPC->getType() == Type::FloatTy) { float fVal = Val; Out << " const ConstantFloatTy FloatConstant" << FPCounter++ << " = 0x" << std::hex << *(unsigned*)&fVal << std::dec - << "; /* " << Val << " */\n"; + << "U; /* " << Val << " */\n"; } else assert(0 && "Unknown float type!"); } From lattner at cs.uiuc.edu Wed Sep 10 15:35:02 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Wed Sep 10 15:35:02 2003 Subject: [llvm-commits] CVS: llvm/include/llvm/Transforms/Utils/UnifyFunctionExitNodes.h Message-ID: <200309102034.PAA07979@apoc.cs.uiuc.edu> Changes in directory llvm/include/llvm/Transforms/Utils: UnifyFunctionExitNodes.h updated: 1.14 -> 1.15 --- Log message: Expand the pass to unify all of the unwind blocks as well --- Diffs of the changes: Index: llvm/include/llvm/Transforms/Utils/UnifyFunctionExitNodes.h diff -u llvm/include/llvm/Transforms/Utils/UnifyFunctionExitNodes.h:1.14 llvm/include/llvm/Transforms/Utils/UnifyFunctionExitNodes.h:1.15 --- llvm/include/llvm/Transforms/Utils/UnifyFunctionExitNodes.h:1.14 Mon Mar 31 11:29:18 2003 +++ llvm/include/llvm/Transforms/Utils/UnifyFunctionExitNodes.h Wed Sep 10 15:34:38 2003 @@ -1,9 +1,10 @@ -//===-- UnifyFunctionExitNodes.h - Ensure fn's have one return ---*- C++ -*--=// +//===-- UnifyFunctionExitNodes.h - Ensure fn's have one return --*- C++ -*-===// // -// This pass is used to ensure that functions have at most one return -// instruction in them. Additionally, it keeps track of which node is the new -// exit node of the CFG. If there are no exit nodes in the CFG, the getExitNode -// method will return a null pointer. +// This pass is used to ensure that functions have at most one return and one +// unwind instruction in them. Additionally, it keeps track of which node is +// the new exit node of the CFG. If there are no return or unwind instructions +// in the function, the getReturnBlock/getUnwindBlock methods will return a null +// pointer. // //===----------------------------------------------------------------------===// @@ -13,22 +14,22 @@ #include "llvm/Pass.h" struct UnifyFunctionExitNodes : public FunctionPass { - BasicBlock *ExitNode; + BasicBlock *ReturnBlock, *UnwindBlock; public: - UnifyFunctionExitNodes() : ExitNode(0) {} + UnifyFunctionExitNodes() : ReturnBlock(0), UnwindBlock(0) {} // We can preserve non-critical-edgeness when we unify function exit nodes virtual void getAnalysisUsage(AnalysisUsage &AU) const; - // getExitNode - Return the new single (or nonexistant) exit node of the CFG. + // getReturn|UnwindBlock - Return the new single (or nonexistant) return or + // unwind basic blocks in the CFG. // - BasicBlock *getExitNode() const { return ExitNode; } + BasicBlock *getReturnBlock() const { return ReturnBlock; } + BasicBlock *getUnwindBlock() const { return UnwindBlock; } virtual bool runOnFunction(Function &F); }; -static inline Pass *createUnifyFunctionExitNodesPass() { - return new UnifyFunctionExitNodes(); -} +Pass *createUnifyFunctionExitNodesPass(); #endif From lattner at cs.uiuc.edu Wed Sep 10 15:36:00 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Wed Sep 10 15:36:00 2003 Subject: [llvm-commits] CVS: llvm/lib/Transforms/Utils/UnifyFunctionExitNodes.cpp Message-ID: <200309102035.PAA07990@apoc.cs.uiuc.edu> Changes in directory llvm/lib/Transforms/Utils: UnifyFunctionExitNodes.cpp updated: 1.24 -> 1.25 --- Log message: Expand the pass to unify all of the unwind blocks as well --- Diffs of the changes: Index: llvm/lib/Transforms/Utils/UnifyFunctionExitNodes.cpp diff -u llvm/lib/Transforms/Utils/UnifyFunctionExitNodes.cpp:1.24 llvm/lib/Transforms/Utils/UnifyFunctionExitNodes.cpp:1.25 --- llvm/lib/Transforms/Utils/UnifyFunctionExitNodes.cpp:1.24 Thu May 22 17:00:07 2003 +++ llvm/lib/Transforms/Utils/UnifyFunctionExitNodes.cpp Wed Sep 10 15:34:51 2003 @@ -18,6 +18,10 @@ static RegisterOpt X("mergereturn", "Unify function exit nodes"); +Pass *createUnifyFunctionExitNodesPass() { + return new UnifyFunctionExitNodes(); +} + void UnifyFunctionExitNodes::getAnalysisUsage(AnalysisUsage &AU) const{ // We preserve the non-critical-edgeness property AU.addPreservedID(BreakCriticalEdgesID); @@ -34,15 +38,36 @@ // return. // std::vector ReturningBlocks; + std::vector UnwindingBlocks; for(Function::iterator I = F.begin(), E = F.end(); I != E; ++I) if (isa(I->getTerminator())) ReturningBlocks.push_back(I); + else if (isa(I->getTerminator())) + UnwindingBlocks.push_back(I); + + // Handle unwinding blocks first... + if (UnwindingBlocks.empty()) { + UnwindBlock = 0; + } else if (UnwindingBlocks.size() == 1) { + UnwindBlock = UnwindingBlocks.front(); + } else { + UnwindBlock = new BasicBlock("UnifiedUnwindBlock", &F); + UnwindBlock->getInstList().push_back(new UnwindInst()); + for (std::vector::iterator I = UnwindingBlocks.begin(), + E = UnwindingBlocks.end(); I != E; ++I) { + BasicBlock *BB = *I; + BB->getInstList().pop_back(); // Remove the return insn + BB->getInstList().push_back(new BranchInst(UnwindBlock)); + } + } + + // Now handle return blocks... if (ReturningBlocks.empty()) { - ExitNode = 0; + ReturnBlock = 0; return false; // No blocks return } else if (ReturningBlocks.size() == 1) { - ExitNode = ReturningBlocks.front(); // Already has a single return block + ReturnBlock = ReturningBlocks.front(); // Already has a single return block return false; } @@ -50,7 +75,7 @@ // node (if the function returns a value), and convert all of the return // instructions into unconditional branches. // - BasicBlock *NewRetBlock = new BasicBlock("UnifiedExitNode", &F); + BasicBlock *NewRetBlock = new BasicBlock("UnifiedReturnBlock", &F); PHINode *PN = 0; if (F.getReturnType() != Type::VoidTy) { @@ -77,7 +102,6 @@ BB->getInstList().pop_back(); // Remove the return insn BB->getInstList().push_back(new BranchInst(NewRetBlock)); } - ExitNode = NewRetBlock; - + ReturnBlock = NewRetBlock; return true; } From lattner at cs.uiuc.edu Wed Sep 10 15:36:55 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Wed Sep 10 15:36:55 2003 Subject: [llvm-commits] CVS: llvm/lib/Transforms/Instrumentation/ProfilePaths/ProfilePaths.cpp Message-ID: <200309102035.PAA08254@apoc.cs.uiuc.edu> Changes in directory llvm/lib/Transforms/Instrumentation/ProfilePaths: ProfilePaths.cpp updated: 1.30 -> 1.31 --- Log message: Update for new UnifyFunction... API Remove using decl --- Diffs of the changes: Index: llvm/lib/Transforms/Instrumentation/ProfilePaths/ProfilePaths.cpp diff -u llvm/lib/Transforms/Instrumentation/ProfilePaths/ProfilePaths.cpp:1.30 llvm/lib/Transforms/Instrumentation/ProfilePaths/ProfilePaths.cpp:1.31 --- llvm/lib/Transforms/Instrumentation/ProfilePaths/ProfilePaths.cpp:1.30 Sat Aug 30 19:21:59 2003 +++ llvm/lib/Transforms/Instrumentation/ProfilePaths/ProfilePaths.cpp Wed Sep 10 15:35:33 2003 @@ -35,7 +35,6 @@ #include "Graph.h" #include #include "Config/stdio.h" -using std::vector; struct ProfilePaths : public FunctionPass { bool runOnFunction(Function &F); @@ -72,7 +71,8 @@ mn++; // Transform the cfg s.t. we have just one exit node - BasicBlock *ExitNode = getAnalysis().getExitNode(); + BasicBlock *ExitNode = + getAnalysis().getReturnBlock(); //iterating over BBs and making graph std::vector nodes; @@ -118,13 +118,13 @@ // The graph is made acyclic: this is done // by removing back edges for now, and adding them later on - vector be; + std::vector be; std::map nodePriority; //it ranks nodes in depth first order traversal g.getBackEdges(be, nodePriority); #ifdef DEBUG_PATH_PROFILES std::cerr<<"BackEdges-------------\n"; - for(vector::iterator VI=be.begin(); VI!=be.end(); ++VI){ + for (std::vector::iterator VI=be.begin(); VI!=be.end(); ++VI){ printEdge(*VI); cerr<<"\n"; } @@ -140,8 +140,8 @@ //Then we add 2 back edges for it: //1. from root->b (in vector stDummy) //and 2. from a->exit (in vector exDummy) - vector stDummy; - vector exDummy; + std::vector stDummy; + std::vector exDummy; addDummyEdges(stDummy, exDummy, g, be); #ifdef DEBUG_PATH_PROFILES @@ -183,7 +183,7 @@ F.getParent()->getOrInsertFunction("reoptimizerInitialize", Type::VoidTy, PointerType::get(Type::IntTy), 0); - vector trargs; + std::vector trargs; trargs.push_back(threshold); new CallInst(initialize, trargs, "", fr->begin()); } From lattner at cs.uiuc.edu Wed Sep 10 15:38:01 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Wed Sep 10 15:38:01 2003 Subject: [llvm-commits] CVS: llvm/include/llvm/Analysis/Dominators.h PostDominators.h Message-ID: <200309102037.PAA08277@apoc.cs.uiuc.edu> Changes in directory llvm/include/llvm/Analysis: Dominators.h updated: 1.37 -> 1.38 PostDominators.h updated: 1.1 -> 1.2 --- Log message: Rework dominator and post dominator information so that we do not have to unify all exit nodes of a function to compute post-dominance information. This does not work with functions that have both unwind and return nodes, because we cannot unify these blocks. The new implementation is better anyway. :) --- Diffs of the changes: Index: llvm/include/llvm/Analysis/Dominators.h diff -u llvm/include/llvm/Analysis/Dominators.h:1.37 llvm/include/llvm/Analysis/Dominators.h:1.38 --- llvm/include/llvm/Analysis/Dominators.h:1.37 Mon Aug 18 17:10:57 2003 +++ llvm/include/llvm/Analysis/Dominators.h Wed Sep 10 15:36:51 2003 @@ -32,12 +32,15 @@ // class DominatorBase : public FunctionPass { protected: - BasicBlock *Root; + std::vector Roots; const bool IsPostDominators; - inline DominatorBase(bool isPostDom) : Root(0), IsPostDominators(isPostDom) {} + inline DominatorBase(bool isPostDom) : Roots(), IsPostDominators(isPostDom) {} public: - inline BasicBlock *getRoot() const { return Root; } + // Return the root blocks of the current CFG. This may include multiple + // blocks if we are computing post dominators. For forward dominators, this + // will always be a single block (the entry node). + inline const std::vector &getRoots() const { return Roots; } // Returns true if analysis based of postdoms bool isPostDominator() const { return IsPostDominators; } @@ -144,6 +147,11 @@ /// obviously really slow, so it should be avoided if at all possible. void recalculate(); + BasicBlock *getRoot() const { + assert(Roots.size() == 1 && "Should always have entry node!"); + return Roots[0]; + } + // getAnalysisUsage - This simply provides a dominator set virtual void getAnalysisUsage(AnalysisUsage &AU) const { AU.setPreservesAll(); @@ -219,10 +227,15 @@ struct ImmediateDominators : public ImmediateDominatorsBase { ImmediateDominators() : ImmediateDominatorsBase(false) {} + BasicBlock *getRoot() const { + assert(Roots.size() == 1 && "Should always have entry node!"); + return Roots[0]; + } + virtual bool runOnFunction(Function &F) { IDoms.clear(); // Reset from the last time we were run... DominatorSet &DS = getAnalysis(); - Root = DS.getRoot(); + Roots = DS.getRoots(); calcIDoms(DS); return false; } @@ -247,6 +260,8 @@ std::map Nodes; void reset(); typedef std::map NodeMapType; + + Node *RootNode; public: class Node2 { friend class DominatorTree; @@ -303,7 +318,18 @@ return getNode(BB); } - //===--------------------------------------------------------------------===// // API to update (Post)DominatorTree information based on modifications to + // getRootNode - This returns the entry node for the CFG of the function. If + // this tree represents the post-dominance relations for a function, however, + // this root may be a node with the block == NULL. This is the case when + // there are multiple exit nodes from a particular function. Consumers of + // post-dominance information must be capable of dealing with this + // possibility. + // + Node *getRootNode() { return RootNode; } + const Node *getRootNode() const { return RootNode; } + + //===--------------------------------------------------------------------===// + // API to update (Post)DominatorTree information based on modifications to // the CFG... /// createNewNode - Add a new node to the dominator tree information. This @@ -336,10 +362,15 @@ struct DominatorTree : public DominatorTreeBase { DominatorTree() : DominatorTreeBase(false) {} + BasicBlock *getRoot() const { + assert(Roots.size() == 1 && "Should always have entry node!"); + return Roots[0]; + } + virtual bool runOnFunction(Function &F) { reset(); // Reset from the last time we were run... DominatorSet &DS = getAnalysis(); - Root = DS.getRoot(); + Roots = DS.getRoots(); calculate(DS); return false; } @@ -374,7 +405,7 @@ template <> struct GraphTraits : public GraphTraits { static NodeType *getEntryNode(DominatorTree *DT) { - return DT->getNode(DT->getRoot()); + return DT->getRootNode(); } }; @@ -431,11 +462,17 @@ struct DominanceFrontier : public DominanceFrontierBase { DominanceFrontier() : DominanceFrontierBase(false) {} + BasicBlock *getRoot() const { + assert(Roots.size() == 1 && "Should always have entry node!"); + return Roots[0]; + } + virtual bool runOnFunction(Function &) { Frontiers.clear(); DominatorTree &DT = getAnalysis(); - Root = DT.getRoot(); - calculate(DT, DT[Root]); + Roots = DT.getRoots(); + assert(Roots.size() == 1 && "Only one entry block for forward domfronts!"); + calculate(DT, DT[Roots[0]]); return false; } Index: llvm/include/llvm/Analysis/PostDominators.h diff -u llvm/include/llvm/Analysis/PostDominators.h:1.1 llvm/include/llvm/Analysis/PostDominators.h:1.2 --- llvm/include/llvm/Analysis/PostDominators.h:1.1 Wed Aug 21 18:43:30 2002 +++ llvm/include/llvm/Analysis/PostDominators.h Wed Sep 10 15:36:51 2003 @@ -10,19 +10,23 @@ #include "llvm/Analysis/Dominators.h" -//===------------------------------------- -// DominatorSet Class - Concrete subclass of DominatorSetBase that is used to -// compute the post-dominator set. -// +/// PostDominatorSet Class - Concrete subclass of DominatorSetBase that is used +/// to compute the post-dominator set. Because there can be multiple exit nodes +/// in an LLVM function, we calculate post dominators with a special null block +/// which is the virtual exit node that the real exit nodes all virtually branch +/// to. Clients should be prepared to see an entry in the dominator sets with a +/// null BasicBlock*. +/// struct PostDominatorSet : public DominatorSetBase { PostDominatorSet() : DominatorSetBase(true) {} virtual bool runOnFunction(Function &F); - // getAnalysisUsage - This obviously provides a dominator set, but it also - // uses the UnifyFunctionExitNode pass if building post-dominators + // getAnalysisUsage - This pass does not modify the function at all. // - virtual void getAnalysisUsage(AnalysisUsage &AU) const; + virtual void getAnalysisUsage(AnalysisUsage &AU) const { + AU.setPreservesAll(); + } }; @@ -37,7 +41,7 @@ virtual bool runOnFunction(Function &F) { IDoms.clear(); // Reset from the last time we were run... PostDominatorSet &DS = getAnalysis(); - Root = DS.getRoot(); + Roots = DS.getRoots(); calcIDoms(DS); return false; } @@ -59,7 +63,7 @@ virtual bool runOnFunction(Function &F) { reset(); // Reset from the last time we were run... PostDominatorSet &DS = getAnalysis(); - Root = DS.getRoot(); + Roots = DS.getRoots(); calculate(DS); return false; } @@ -83,8 +87,8 @@ virtual bool runOnFunction(Function &) { Frontiers.clear(); PostDominatorTree &DT = getAnalysis(); - Root = DT.getRoot(); - calculate(DT, DT[Root]); + Roots = DT.getRoots(); + calculate(DT, DT.getRootNode()); return false; } From lattner at cs.uiuc.edu Wed Sep 10 15:38:10 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Wed Sep 10 15:38:10 2003 Subject: [llvm-commits] CVS: llvm/lib/Analysis/PostDominators.cpp Message-ID: <200309102037.PAA08289@apoc.cs.uiuc.edu> Changes in directory llvm/lib/Analysis: PostDominators.cpp updated: 1.39 -> 1.40 --- Log message: Rework post dominator information so that we do not have to unify all exit nodes of a function to compute post-dominance information. This does not work with functions that have both unwind and return nodes, because we cannot unify these blocks. The new implementation is better anyway. :) --- Diffs of the changes: Index: llvm/lib/Analysis/PostDominators.cpp diff -u llvm/lib/Analysis/PostDominators.cpp:1.39 llvm/lib/Analysis/PostDominators.cpp:1.40 --- llvm/lib/Analysis/PostDominators.cpp:1.39 Wed Sep 10 11:08:03 2003 +++ llvm/lib/Analysis/PostDominators.cpp Wed Sep 10 15:37:08 2003 @@ -5,7 +5,7 @@ //===----------------------------------------------------------------------===// #include "llvm/Analysis/PostDominators.h" -#include "llvm/Transforms/Utils/UnifyFunctionExitNodes.h" +#include "llvm/iTerminators.h" #include "llvm/Support/CFG.h" #include "Support/DepthFirstIterator.h" #include "Support/SetOperations.h" @@ -23,75 +23,77 @@ // bool PostDominatorSet::runOnFunction(Function &F) { Doms.clear(); // Reset from the last time we were run... - // Since we require that the unify all exit nodes pass has been run, we know - // that there can be at most one return instruction in the function left. - // Get it. - // - Root = getAnalysis().getExitNode(); - - if (Root == 0) { // No exit node for the function? Postdomsets are all empty - for (Function::iterator FI = F.begin(), FE = F.end(); FI != FE; ++FI) - Doms[FI] = DomSetType(); - return false; + + // Scan the function looking for the root nodes of the post-dominance + // relationships. These blocks end with return and unwind instructions. + // While we are iterating over the function, we also initialize all of the + // domsets to empty. + Roots.clear(); + for (Function::iterator I = F.begin(), E = F.end(); I != E; ++I) { + Doms[I]; // Initialize to empty + + if (isa(I->getTerminator()) || + isa(I->getTerminator())) + Roots.push_back(I); } + // If there are no exit nodes for the function, postdomsets are all empty. + // This can happen if the function just contains an infinite loop, for + // example. + if (Roots.empty()) return false; + + // If we have more than one root, we insert an artificial "null" exit, which + // has "virtual edges" to each of the real exit nodes. + if (Roots.size() > 1) + Doms[0].insert(0); + bool Changed; do { Changed = false; std::set Visited; DomSetType WorkingSet; - idf_iterator It = idf_begin(Root), End = idf_end(Root); - for ( ; It != End; ++It) { - BasicBlock *BB = *It; - succ_iterator PI = succ_begin(BB), PEnd = succ_end(BB); - if (PI != PEnd) { // Is there SOME predecessor? - // Loop until we get to a successor that has had it's dom set filled - // in at least once. We are guaranteed to have this because we are - // traversing the graph in DFO and have handled start nodes specially. - // - while (Doms[*PI].size() == 0) ++PI; - WorkingSet = Doms[*PI]; - - for (++PI; PI != PEnd; ++PI) { // Intersect all of the successor sets - DomSetType &PredSet = Doms[*PI]; - if (PredSet.size()) - set_intersect(WorkingSet, PredSet); - } - } else if (BB != Root) { - // If this isn't the root basic block and it has no successors, it must - // be an non-returning block. Fib a bit by saying that the root node - // postdominates this unreachable node. This isn't exactly true, - // because there is no path from this node to the root node, but it is - // sorta true because any paths to the exit node would have to go - // through this node. - // - // This allows for postdominator properties to be built for code that - // doesn't return in a reasonable manner. - // - WorkingSet = Doms[Root]; - } + + for (unsigned i = 0, e = Roots.size(); i != e; ++i) + for (idf_iterator It = idf_begin(Roots[i]), + E = idf_end(Roots[i]); It != E; ++It) { + BasicBlock *BB = *It; + succ_iterator SI = succ_begin(BB), SE = succ_end(BB); + if (SI != SE) { // Is there SOME successor? + // Loop until we get to a successor that has had it's dom set filled + // in at least once. We are guaranteed to have this because we are + // traversing the graph in DFO and have handled start nodes specially. + // + while (Doms[*SI].size() == 0) ++SI; + WorkingSet = Doms[*SI]; + + for (++SI; SI != SE; ++SI) { // Intersect all of the successor sets + DomSetType &SuccSet = Doms[*SI]; + if (SuccSet.size()) + set_intersect(WorkingSet, SuccSet); + } + } else { + // If this node has no successors, it must be one of the root nodes. + // We will already take care of the notion that the node + // post-dominates itself. The only thing we have to add is that if + // there are multiple root nodes, we want to insert a special "null" + // exit node which dominates the roots as well. + if (Roots.size() > 1) + WorkingSet.insert(0); + } - WorkingSet.insert(BB); // A block always dominates itself - DomSetType &BBSet = Doms[BB]; - if (BBSet != WorkingSet) { - BBSet.swap(WorkingSet); // Constant time operation! - Changed = true; // The sets changed. + WorkingSet.insert(BB); // A block always dominates itself + DomSetType &BBSet = Doms[BB]; + if (BBSet != WorkingSet) { + BBSet.swap(WorkingSet); // Constant time operation! + Changed = true; // The sets changed. + } + WorkingSet.clear(); // Clear out the set for next iteration } - WorkingSet.clear(); // Clear out the set for next iteration - } } while (Changed); return false; } -// getAnalysisUsage - This obviously provides a post-dominator set, but it also -// requires the UnifyFunctionExitNodes pass. -// -void PostDominatorSet::getAnalysisUsage(AnalysisUsage &AU) const { - AU.setPreservesAll(); - AU.addRequired(); -} - //===----------------------------------------------------------------------===// // ImmediatePostDominators Implementation //===----------------------------------------------------------------------===// @@ -107,17 +109,25 @@ F("postdomtree", "Post-Dominator Tree Construction", true); void PostDominatorTree::calculate(const PostDominatorSet &DS) { - Nodes[Root] = new Node(Root, 0); // Add a node for the root... + if (Roots.empty()) return; + BasicBlock *Root = Roots.size() == 1 ? Roots[0] : 0; - if (Root) { - // Iterate over all nodes in depth first order... - for (idf_iterator I = idf_begin(Root), E = idf_end(Root); - I != E; ++I) { + Nodes[Root] = RootNode = new Node(Root, 0); // Add a node for the root... + + // Iterate over all nodes in depth first order... + for (unsigned i = 0, e = Roots.size(); i != e; ++i) + for (idf_iterator I = idf_begin(Roots[i]), + E = idf_end(Roots[i]); I != E; ++I) { BasicBlock *BB = *I; const DominatorSet::DomSetType &Dominators = DS.getDominators(BB); unsigned DomSetSize = Dominators.size(); if (DomSetSize == 1) continue; // Root node... IDom = null - + + // If we have already computed the immediate dominator for this node, + // don't revisit. This can happen due to nodes reachable from multiple + // roots, but which the idf_iterator doesn't know about. + if (Nodes.find(BB) != Nodes.end()) continue; + // Loop over all dominators of this node. This corresponds to looping // over nodes in the dominator chain, looking for a node whose dominator // set is equal to the current nodes, except that the current node does @@ -130,28 +140,27 @@ DominatorSet::DomSetType::const_iterator I = Dominators.begin(); DominatorSet::DomSetType::const_iterator End = Dominators.end(); for (; I != End; ++I) { // Iterate over dominators... - // All of our dominators should form a chain, where the number - // of elements in the dominator set indicates what level the - // node is at in the chain. We want the node immediately - // above us, so it will have an identical dominator set, - // except that BB will not dominate it... therefore it's - // dominator set size will be one less than BB's... - // - if (DS.getDominators(*I).size() == DomSetSize - 1) { - // We know that the immediate dominator should already have a node, - // because we are traversing the CFG in depth first order! - // - Node *IDomNode = Nodes[*I]; - assert(IDomNode && "No node for IDOM?"); + // All of our dominators should form a chain, where the number + // of elements in the dominator set indicates what level the + // node is at in the chain. We want the node immediately + // above us, so it will have an identical dominator set, + // except that BB will not dominate it... therefore it's + // dominator set size will be one less than BB's... + // + if (DS.getDominators(*I).size() == DomSetSize - 1) { + // We know that the immediate dominator should already have a node, + // because we are traversing the CFG in depth first order! + // + Node *IDomNode = Nodes[*I]; + assert(IDomNode && "No node for IDOM?"); - // Add a new tree node for this BasicBlock, and link it as a child of - // IDomNode - Nodes[BB] = IDomNode->addChild(new Node(BB, IDomNode)); - break; - } + // Add a new tree node for this BasicBlock, and link it as a child of + // IDomNode + Nodes[BB] = IDomNode->addChild(new Node(BB, IDomNode)); + break; + } } } - } } //===----------------------------------------------------------------------===// @@ -167,14 +176,14 @@ // Loop over CFG successors to calculate DFlocal[Node] BasicBlock *BB = Node->getNode(); DomSetType &S = Frontiers[BB]; // The new set to fill in... - if (!Root) return S; + if (getRoots().empty()) return S; - for (pred_iterator SI = pred_begin(BB), SE = pred_end(BB); - SI != SE; ++SI) { - // Does Node immediately dominate this predeccessor? - if (DT[*SI]->getIDom() != Node) - S.insert(*SI); - } + if (BB) + for (pred_iterator SI = pred_begin(BB), SE = pred_end(BB); + SI != SE; ++SI) + // Does Node immediately dominate this predeccessor? + if (DT[*SI]->getIDom() != Node) + S.insert(*SI); // At this point, S is DFlocal. Now we union in DFup's of our children... // Loop through and visit the nodes that Node immediately dominates (Node's From lattner at cs.uiuc.edu Wed Sep 10 15:38:18 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Wed Sep 10 15:38:18 2003 Subject: [llvm-commits] CVS: llvm/lib/Transforms/Instrumentation/ProfilePaths/GraphAuxillary.cpp Message-ID: <200309102036.PAA08261@apoc.cs.uiuc.edu> Changes in directory llvm/lib/Transforms/Instrumentation/ProfilePaths: GraphAuxillary.cpp updated: 1.16 -> 1.17 --- Log message: Remove #include --- Diffs of the changes: Index: llvm/lib/Transforms/Instrumentation/ProfilePaths/GraphAuxillary.cpp diff -u llvm/lib/Transforms/Instrumentation/ProfilePaths/GraphAuxillary.cpp:1.16 llvm/lib/Transforms/Instrumentation/ProfilePaths/GraphAuxillary.cpp:1.17 --- llvm/lib/Transforms/Instrumentation/ProfilePaths/GraphAuxillary.cpp:1.16 Fri Aug 1 17:15:02 2003 +++ llvm/lib/Transforms/Instrumentation/ProfilePaths/GraphAuxillary.cpp Wed Sep 10 15:35:21 2003 @@ -6,7 +6,6 @@ // //===----------------------------------------------------------------------===// -#include "llvm/Transforms/Utils/UnifyFunctionExitNodes.h" #include "llvm/Pass.h" #include "llvm/Module.h" #include "llvm/iTerminators.h" From gaeke at cs.uiuc.edu Wed Sep 10 15:38:26 2003 From: gaeke at cs.uiuc.edu (Brian Gaeke) Date: Wed Sep 10 15:38:26 2003 Subject: [llvm-commits] CVS: reopt/lib/LightWtProfiling/Timer.h scheduler.cpp Message-ID: <200309102036.PAA07173@gally.cs.uiuc.edu> Changes in directory reopt/lib/LightWtProfiling: Timer.h updated: 1.1 -> 1.2 scheduler.cpp updated: 1.2 -> 1.3 --- Log message: Timer.h: Add prototypes for functions used by scheduler.cpp scheduler.cpp: Sort #includes. Don't use namespace std. Pretty up the end of it. --- Diffs of the changes: Index: reopt/lib/LightWtProfiling/Timer.h diff -u reopt/lib/LightWtProfiling/Timer.h:1.1 reopt/lib/LightWtProfiling/Timer.h:1.2 --- reopt/lib/LightWtProfiling/Timer.h:1.1 Wed Aug 6 16:48:30 2003 +++ reopt/lib/LightWtProfiling/Timer.h Wed Sep 10 15:35:55 2003 @@ -3,6 +3,8 @@ #include "Support/DataTypes.h" +extern void mask_interrupt (); +extern void unmask_interrupt (); extern int initialize_timer (); extern uint64_t llvm_interval_counter; Index: reopt/lib/LightWtProfiling/scheduler.cpp diff -u reopt/lib/LightWtProfiling/scheduler.cpp:1.2 reopt/lib/LightWtProfiling/scheduler.cpp:1.3 --- reopt/lib/LightWtProfiling/scheduler.cpp:1.2 Fri Aug 22 12:43:41 2003 +++ reopt/lib/LightWtProfiling/scheduler.cpp Wed Sep 10 15:35:55 2003 @@ -1,10 +1,8 @@ -#include -#include +#include "Globals.h" +#include "Timer.h" #include "reopt/VirtualMem.h" #include "reopt/InstrUtils.h" - - -using namespace std; +#include class priority_queue_entry { @@ -16,7 +14,6 @@ uint64_t addr; }; - bool operator<=(priority_queue_entry p1, priority_queue_entry p2) { return p1.cycle_to_process <= p2.cycle_to_process; @@ -57,65 +54,34 @@ } }; - -priority_queue, my_compare> pqueue; -extern uint64_t llvm_interval_counter; -extern VirtualMem* vm; -extern "C" void llvm_first_trigger(); - -void repair_trace(uint64_t){} - -extern "C" int do_timer_interval() -{ - // std::cerr<<"examining queue of size "<< pqueue.size()<writeInstToVM(p.addr, - getCallInstr((uint64_t)&llvm_first_trigger, p.addr)); - doFlush(p.addr-16, p.addr+16); - pqueue.pop(); - } - else - break; - } - else - break; - } - return 0; +std::priority_queue, + my_compare> pqueue; +extern "C" void llvm_first_trigger (); + +/// Examine the queue, processing and removing entries for which +/// cycle_to_process <= llvm_interval_counter. We process entries by +/// inserting a call to llvm_first_trigger() at addr. +/// +extern "C" void do_timer_interval () { + while(!pqueue.empty () + && pqueue.top ().cycle_to_process <= llvm_interval_counter) { + uint64_t addr = pqueue.top ().addr; + // Insert a call at ADDR to llvm_first_trigger. + vm->writeInstToVM (addr, + getCallInstr ((uint64_t)&llvm_first_trigger, addr)); + doFlush (addr-16, addr+16); + pqueue.pop (); + } } -extern "C" void mask_interrupt(); -extern "C" void unmask_interrupt(); - +/// Insert a new pair into the priority queue (with +/// interrupts masked, though these *_interrupt fns don't do anything +/// at the moment!) +/// int insert_address_at(uint64_t time, uint64_t addr) { - // mask_interrupt(); - //printf("\t\t\t inserting time = %lu\n", time); - pqueue.push(priority_queue_entry(time,addr)); - //printf("\t\t\t size = %lu\n", pqueue.size()); - // unmask_interrupt(); - return 0; -} - -//uint64_t elements[] = { 1,5,8,2,4,6,3,9,0,7 }; -// -//int main() -//{ -// for( int i = 0; i < 10; i++) -// { -// insert_address_at(elements[i], (uint64_t)&elements[i]); -// } -// -// llvm_interval_counter = 10; -// -// do_timer_interval(); -//} + mask_interrupt(); + pqueue.push(priority_queue_entry(time,addr)); + unmask_interrupt(); + return 0; +} From lattner at cs.uiuc.edu Wed Sep 10 15:39:02 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Wed Sep 10 15:39:02 2003 Subject: [llvm-commits] CVS: llvm/lib/Transforms/Scalar/ADCE.cpp Message-ID: <200309102038.PAA08312@apoc.cs.uiuc.edu> Changes in directory llvm/lib/Transforms/Scalar: ADCE.cpp updated: 1.59 -> 1.60 --- Log message: Unwind instructions are intrinsically alive, just like returns --- Diffs of the changes: Index: llvm/lib/Transforms/Scalar/ADCE.cpp diff -u llvm/lib/Transforms/Scalar/ADCE.cpp:1.59 llvm/lib/Transforms/Scalar/ADCE.cpp:1.60 --- llvm/lib/Transforms/Scalar/ADCE.cpp:1.59 Thu Aug 21 17:12:22 2003 +++ llvm/lib/Transforms/Scalar/ADCE.cpp Wed Sep 10 15:38:14 2003 @@ -84,8 +84,8 @@ } inline void markTerminatorLive(const BasicBlock *BB) { - DEBUG(std::cerr << "Terminat Live: " << BB->getTerminator()); - markInstructionLive((Instruction*)BB->getTerminator()); + DEBUG(std::cerr << "Terminator Live: " << BB->getTerminator()); + markInstructionLive(const_cast(BB->getTerminator())); } }; @@ -176,7 +176,7 @@ BBI != BBE; ++BBI) { BasicBlock *BB = *BBI; for (BasicBlock::iterator II = BB->begin(), EI = BB->end(); II != EI; ) { - if (II->mayWriteToMemory() || II->getOpcode() == Instruction::Ret) { + if (II->mayWriteToMemory() || isa(II) || isa(II)){ markInstructionLive(II); ++II; // Increment the inst iterator if the inst wasn't deleted } else if (isInstructionTriviallyDead(II)) { From lattner at cs.uiuc.edu Wed Sep 10 15:39:11 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Wed Sep 10 15:39:11 2003 Subject: [llvm-commits] CVS: llvm/lib/VMCore/Dominators.cpp Message-ID: <200309102038.PAA08299@apoc.cs.uiuc.edu> Changes in directory llvm/lib/VMCore: Dominators.cpp updated: 1.46 -> 1.47 --- Log message: Rework dominator interfaces to handle changes in the post-dominance construction. Now there may be multiple root blocks, and null is a special node used to mark the "virtual" exit node of a CFG. --- Diffs of the changes: Index: llvm/lib/VMCore/Dominators.cpp diff -u llvm/lib/VMCore/Dominators.cpp:1.46 llvm/lib/VMCore/Dominators.cpp:1.47 --- llvm/lib/VMCore/Dominators.cpp:1.46 Mon Aug 18 17:11:16 2003 +++ llvm/lib/VMCore/Dominators.cpp Wed Sep 10 15:37:51 2003 @@ -65,7 +65,8 @@ } } } else { - assert(BB == Root && "We got into unreachable code somehow!"); + assert(Roots.size() == 1 && BB == Roots[0] && + "We got into unreachable code somehow!"); } WorkingSet.insert(BB); // A block always dominates itself @@ -86,7 +87,9 @@ // specified function. // bool DominatorSet::runOnFunction(Function &F) { - Root = &F.getEntryNode(); + BasicBlock *Root = &F.getEntryNode(); + Roots.clear(); + Roots.push_back(Root); assert(pred_begin(Root) == pred_end(Root) && "Root node has predecessors in function!"); recalculate(); @@ -94,16 +97,17 @@ } void DominatorSet::recalculate() { + assert(Roots.size() == 1 && "DominatorSet should have single root block!"); Doms.clear(); // Reset from the last time we were run... // Calculate dominator sets for the reachable basic blocks... - calculateDominatorsFromBlock(Root); + calculateDominatorsFromBlock(Roots[0]); // Loop through the function, ensuring that every basic block has at least an // empty set of nodes. This is important for the case when there is // unreachable blocks. - Function *F = Root->getParent(); + Function *F = Roots[0]->getParent(); for (Function::iterator I = F->begin(), E = F->end(); I != E; ++I) Doms[I]; } @@ -111,20 +115,22 @@ static std::ostream &operator<<(std::ostream &o, const std::set &BBs) { for (std::set::const_iterator I = BBs.begin(), E = BBs.end(); - I != E; ++I) { - o << " "; - WriteAsOperand(o, *I, false); - o << "\n"; - } + I != E; ++I) + if (*I) + WriteAsOperand(o, *I, false); + else + o << " <>"; return o; } void DominatorSetBase::print(std::ostream &o) const { for (const_iterator I = begin(), E = end(); I != E; ++I) { - o << "=============================--------------------------------\n" - << "\nDominator Set For Basic Block: "; - WriteAsOperand(o, I->first, false); - o << "\n-------------------------------\n" << I->second << "\n"; + o << " DomSet For BB: "; + if (I->first) + WriteAsOperand(o, I->first, false); + else + o << " <>"; + o << " is:\t" << I->second << "\n"; } } @@ -173,13 +179,19 @@ void ImmediateDominatorsBase::print(std::ostream &o) const { for (const_iterator I = begin(), E = end(); I != E; ++I) { - o << "=============================--------------------------------\n" - << "\nImmediate Dominator For Basic Block:"; - WriteAsOperand(o, I->first, false); + o << " Immediate Dominator For Basic Block:"; + if (I->first) + WriteAsOperand(o, I->first, false); + else + o << " <>"; o << " is:"; - WriteAsOperand(o, I->second, false); + if (I->second) + WriteAsOperand(o, I->second, false); + else + o << " <>"; o << "\n"; } + o << "\n"; } @@ -196,6 +208,7 @@ for (NodeMapType::iterator I = Nodes.begin(), E = Nodes.end(); I != E; ++I) delete I->second; Nodes.clear(); + RootNode = 0; } void DominatorTreeBase::Node2::setIDom(Node2 *NewIDom) { @@ -217,7 +230,9 @@ void DominatorTree::calculate(const DominatorSet &DS) { - Nodes[Root] = new Node(Root, 0); // Add a node for the root... + assert(Roots.size() == 1 && "DominatorTree should have 1 root block!"); + BasicBlock *Root = Roots[0]; + Nodes[Root] = RootNode = new Node(Root, 0); // Add a node for the root... // Iterate over all nodes in depth first order... for (df_iterator I = df_begin(Root), E = df_end(Root); @@ -264,23 +279,25 @@ static std::ostream &operator<<(std::ostream &o, const DominatorTreeBase::Node *Node) { - return o << Node->getNode() - << "\n------------------------------------------\n"; + if (Node->getNode()) + WriteAsOperand(o, Node->getNode(), false); + else + o << " <>"; + return o << "\n"; } static void PrintDomTree(const DominatorTreeBase::Node *N, std::ostream &o, unsigned Lev) { - o << "Level #" << Lev << ": " << N; + o << std::string(2*Lev, ' ') << "[" << Lev << "] " << N; for (DominatorTreeBase::Node::const_iterator I = N->begin(), E = N->end(); - I != E; ++I) { + I != E; ++I) PrintDomTree(*I, o, Lev+1); - } } void DominatorTreeBase::print(std::ostream &o) const { o << "=============================--------------------------------\n" << "Inorder Dominator Tree:\n"; - PrintDomTree(Nodes.find(getRoot())->second, o, 1); + PrintDomTree(getRootNode(), o, 1); } @@ -326,9 +343,11 @@ void DominanceFrontierBase::print(std::ostream &o) const { for (const_iterator I = begin(), E = end(); I != E; ++I) { - o << "=============================--------------------------------\n" - << "\nDominance Frontier For Basic Block\n"; - WriteAsOperand(o, I->first, false); - o << " is: \n" << I->second << "\n"; + o << " DomFrontier for BB"; + if (I->first) + WriteAsOperand(o, I->first, false); + else + o << " <>"; + o << " is:\t" << I->second << "\n"; } } From brukman at cs.uiuc.edu Wed Sep 10 15:53:03 2003 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Wed Sep 10 15:53:03 2003 Subject: [llvm-commits] CVS: llvm/lib/ExecutionEngine/JIT/Emitter.cpp Message-ID: <200309102052.PAA17737@zion.cs.uiuc.edu> Changes in directory llvm/lib/ExecutionEngine/JIT: Emitter.cpp updated: 1.24 -> 1.25 --- Log message: * Move include files from middle of file to the top where they belong, moving the #define up there too * Since we're including system headers, use the ones in include/llvm/Config * While we're here, use the canonical LLVM header ordering algorithm --- Diffs of the changes: Index: llvm/lib/ExecutionEngine/JIT/Emitter.cpp diff -u llvm/lib/ExecutionEngine/JIT/Emitter.cpp:1.24 llvm/lib/ExecutionEngine/JIT/Emitter.cpp:1.25 --- llvm/lib/ExecutionEngine/JIT/Emitter.cpp:1.24 Wed Sep 10 10:09:45 2003 +++ llvm/lib/ExecutionEngine/JIT/Emitter.cpp Wed Sep 10 15:52:05 2003 @@ -6,8 +6,10 @@ //===----------------------------------------------------------------------===// #define DEBUG_TYPE "jit" +#ifndef _POSIX_MAPPED_FILES +#define _POSIX_MAPPED_FILES +#endif #include "VM.h" -#include "Config/sys/mman.h" #include "llvm/CodeGen/MachineCodeEmitter.h" #include "llvm/CodeGen/MachineFunction.h" #include "llvm/CodeGen/MachineConstantPool.h" @@ -15,6 +17,8 @@ #include "llvm/Module.h" #include "Support/Debug.h" #include "Support/Statistic.h" +#include "Config/unistd.h" +#include "Config/sys/mman.h" #include namespace { @@ -40,12 +44,6 @@ inline void endFunctionBody(unsigned char *FunctionEnd); }; } - -#ifndef _POSIX_MAPPED_FILES -#define _POSIX_MAPPED_FILES -#endif -#include -#include // getMemory - Return a pointer to the specified number of bytes, which is // mapped as executable readable and writable. From gaeke at cs.uiuc.edu Wed Sep 10 16:12:03 2003 From: gaeke at cs.uiuc.edu (Brian Gaeke) Date: Wed Sep 10 16:12:03 2003 Subject: [llvm-commits] CVS: llvm/tools/bugpoint/ExtractFunction.cpp Message-ID: <200309102111.QAA21656@zion.cs.uiuc.edu> Changes in directory llvm/tools/bugpoint: ExtractFunction.cpp updated: 1.13 -> 1.14 --- Log message: Check in the fix I meant to apply here, but mistakenly applied to tools/extract instead..... heh --- Diffs of the changes: Index: llvm/tools/bugpoint/ExtractFunction.cpp diff -u llvm/tools/bugpoint/ExtractFunction.cpp:1.13 llvm/tools/bugpoint/ExtractFunction.cpp:1.14 --- llvm/tools/bugpoint/ExtractFunction.cpp:1.13 Thu Aug 7 16:19:30 2003 +++ llvm/tools/bugpoint/ExtractFunction.cpp Wed Sep 10 16:11:42 2003 @@ -9,6 +9,7 @@ #include "llvm/Constant.h" #include "llvm/Module.h" #include "llvm/PassManager.h" +#include "llvm/Pass.h" #include "llvm/Type.h" #include "llvm/Analysis/Verifier.h" #include "llvm/Transforms/IPO.h" From lattner at cs.uiuc.edu Wed Sep 10 19:18:02 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Wed Sep 10 19:18:02 2003 Subject: [llvm-commits] CVS: llvm/www/www-index.html Message-ID: <200309110017.TAA21211@tank.cs.uiuc.edu> Changes in directory llvm/www: www-index.html updated: 1.48 -> 1.49 --- Log message: Add new status update Boldify section labels Group all status updates together --- Diffs of the changes: Index: llvm/www/www-index.html diff -u llvm/www/www-index.html:1.48 llvm/www/www-index.html:1.49 --- llvm/www/www-index.html:1.48 Sun Aug 24 12:28:57 2003 +++ llvm/www/www-index.html Wed Sep 10 19:17:41 2003 @@ -20,7 +20,7 @@ Overview + color="#000000" size="5">Overview @@ -73,8 +73,8 @@ Publications & - Papers + color="#000000" size="5">Publications & + Papers @@ -143,7 +143,7 @@ Releases + color="#000000" size="5">Releases @@ -168,7 +168,7 @@ Contributors + color="#000000" size="5">Contributors @@ -201,22 +201,18 @@ News + color="#000000" size="5">News + Status Updates: + - - - - - - - - - - + color="#000000" size="5">Documentation @@ -380,7 +376,7 @@ + color="#000000" size="5">Funding
Aug 15, 2003-Added a status update.
Jun 26, 2003-Added a status update.
May 21, 2003 - Added some new documents to the @@ -263,7 +259,7 @@
Documentation
@@ -340,7 +336,7 @@
Current Development + color="#000000" size="5">Current Development
Funding
From criswell at cs.uiuc.edu Thu Sep 11 10:17:02 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Thu Sep 11 10:17:02 2003 Subject: [llvm-commits] CVS: llvm/Makefile.rules Message-ID: <200309111516.KAA31136@choi.cs.uiuc.edu> Changes in directory llvm: Makefile.rules updated: 1.134 -> 1.135 --- Log message: Removed the aposthrophes endings and the elipses suffixes from build output. This makes the output more consistent, and I just find aposthrophes annoying. :) --- Diffs of the changes: Index: llvm/Makefile.rules diff -u llvm/Makefile.rules:1.134 llvm/Makefile.rules:1.135 --- llvm/Makefile.rules:1.134 Wed Sep 10 14:37:51 2003 +++ llvm/Makefile.rules Thu Sep 11 10:15:53 2003 @@ -696,7 +696,7 @@ # FIXME. (f.e. char Buffer[10000] ) # %.cpp: %.l - @echo Flex\'ing $<... + @echo Flexing $< $(VERB) $(FLEX) -t $< | \ $(SED) '/^find_rule/d' | \ $(SED) 's/void yyunput/inline void yyunput/' | \ @@ -711,7 +711,7 @@ %.c: %.y # Cancel built-in rules for yacc %.h: %.y # Cancel built-in rules for yacc %.cpp %.h : %.y - @echo Bison\'ing $<... + @echo Bisoning $< $(VERB) $(BISON) -v -d -p $( /dev/null || ${MV} -f $*.tab.c $*.cpp $(VERB) cmp -s $*.tab.h $*.h > /dev/null || ${MV} -f $*.tab.h $*.h From brukman at cs.uiuc.edu Thu Sep 11 10:32:01 2003 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Thu Sep 11 10:32:01 2003 Subject: [llvm-commits] CVS: llvm/lib/Analysis/LoadValueNumbering.cpp Message-ID: <200309111531.KAA23362@zion.cs.uiuc.edu> Changes in directory llvm/lib/Analysis: LoadValueNumbering.cpp updated: 1.6 -> 1.7 --- Log message: Spell `definitely' correctly. --- Diffs of the changes: Index: llvm/lib/Analysis/LoadValueNumbering.cpp diff -u llvm/lib/Analysis/LoadValueNumbering.cpp:1.6 llvm/lib/Analysis/LoadValueNumbering.cpp:1.7 --- llvm/lib/Analysis/LoadValueNumbering.cpp:1.6 Mon Sep 8 13:13:58 2003 +++ llvm/lib/Analysis/LoadValueNumbering.cpp Thu Sep 11 10:30:57 2003 @@ -85,7 +85,7 @@ void LoadVN::getEqualNumberNodes(Value *V, std::vector &RetVals) const { // If the alias analysis has any must alias information to share with us, we - // can definately use it. + // can definitely use it. if (isa(V->getType())) getAnalysis().getMustAliases(V, RetVals); From brukman at cs.uiuc.edu Thu Sep 11 10:32:11 2003 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Thu Sep 11 10:32:11 2003 Subject: [llvm-commits] CVS: llvm/lib/Transforms/IPO/DeadArgumentElimination.cpp Message-ID: <200309111531.KAA23379@zion.cs.uiuc.edu> Changes in directory llvm/lib/Transforms/IPO: DeadArgumentElimination.cpp updated: 1.4 -> 1.5 --- Log message: Spell `definitely' correctly. --- Diffs of the changes: Index: llvm/lib/Transforms/IPO/DeadArgumentElimination.cpp diff -u llvm/lib/Transforms/IPO/DeadArgumentElimination.cpp:1.4 llvm/lib/Transforms/IPO/DeadArgumentElimination.cpp:1.5 --- llvm/lib/Transforms/IPO/DeadArgumentElimination.cpp:1.4 Fri Aug 1 17:15:01 2003 +++ llvm/lib/Transforms/IPO/DeadArgumentElimination.cpp Thu Sep 11 10:31:17 2003 @@ -262,7 +262,7 @@ LiveArguments.insert(AI); break; case Dead: - DEBUG(std::cerr << " Arg definately dead: " <getName()<<"\n"); + DEBUG(std::cerr << " Arg definitely dead: " <getName()<<"\n"); DeadArguments.insert(AI); break; case MaybeLive: From brukman at cs.uiuc.edu Thu Sep 11 10:33:01 2003 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Thu Sep 11 10:33:01 2003 Subject: [llvm-commits] CVS: llvm/lib/Transforms/Scalar/LICM.cpp Message-ID: <200309111532.KAA23419@zion.cs.uiuc.edu> Changes in directory llvm/lib/Transforms/Scalar: LICM.cpp updated: 1.32 -> 1.33 --- Log message: Spell `definite' correctly. --- Diffs of the changes: Index: llvm/lib/Transforms/Scalar/LICM.cpp diff -u llvm/lib/Transforms/Scalar/LICM.cpp:1.32 llvm/lib/Transforms/Scalar/LICM.cpp:1.33 --- llvm/lib/Transforms/Scalar/LICM.cpp:1.32 Wed Sep 10 00:29:03 2003 +++ llvm/lib/Transforms/Scalar/LICM.cpp Thu Sep 11 10:32:37 2003 @@ -124,7 +124,7 @@ void PromoteValuesInLoop(); /// findPromotableValuesInLoop - Check the current loop for stores to - /// definate pointers, which are not loaded and stored through may aliases. + /// definite pointers, which are not loaded and stored through may aliases. /// If these are found, create an alloca for the value, add it to the /// PromotedValues list, and keep track of the mapping from value to /// alloca... @@ -409,7 +409,7 @@ AA->getTargetData()); } -/// findPromotableValuesInLoop - Check the current loop for stores to definate +/// findPromotableValuesInLoop - Check the current loop for stores to definite /// pointers, which are not loaded and stored through may aliases. If these are /// found, create an alloca for the value, add it to the PromotedValues list, /// and keep track of the mapping from value to alloca... From lattner at cs.uiuc.edu Thu Sep 11 11:26:03 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Thu Sep 11 11:26:03 2003 Subject: [llvm-commits] CVS: llvm/include/llvm/Analysis/Dominators.h Message-ID: <200309111625.LAA04231@apoc.cs.uiuc.edu> Changes in directory llvm/include/llvm/Analysis: Dominators.h updated: 1.38 -> 1.39 --- Log message: Get rid of the whole "Node2" business, rename getNode() ->getBlock() to be more descriptive --- Diffs of the changes: Index: llvm/include/llvm/Analysis/Dominators.h diff -u llvm/include/llvm/Analysis/Dominators.h:1.38 llvm/include/llvm/Analysis/Dominators.h:1.39 --- llvm/include/llvm/Analysis/Dominators.h:1.38 Wed Sep 10 15:36:51 2003 +++ llvm/include/llvm/Analysis/Dominators.h Thu Sep 11 11:25:06 2003 @@ -53,8 +53,7 @@ // is unreachable in this function, the set will be empty. This cannot happen // for reachable code, because every block dominates at least itself. // -class DominatorSetBase : public DominatorBase { -public: +struct DominatorSetBase : public DominatorBase { typedef std::set DomSetType; // Dom set for a bb // Map of dom sets typedef std::map DomSetMapType; @@ -251,11 +250,8 @@ // // DominatorTree - Calculate the immediate dominator tree for a function. // -class DominatorTreeBase : public DominatorBase { -protected: - class Node2; -public: - typedef Node2 Node; +struct DominatorTreeBase : public DominatorBase { + class Node; protected: std::map Nodes; void reset(); @@ -263,12 +259,12 @@ Node *RootNode; public: - class Node2 { + class Node { friend class DominatorTree; friend class PostDominatorTree; friend class DominatorTreeBase; - BasicBlock *TheNode; - Node2 *IDom; + BasicBlock *TheBB; + Node *IDom; std::vector Children; public: typedef std::vector::iterator iterator; @@ -279,25 +275,25 @@ const_iterator begin() const { return Children.begin(); } const_iterator end() const { return Children.end(); } - inline BasicBlock *getNode() const { return TheNode; } - inline Node2 *getIDom() const { return IDom; } + inline BasicBlock *getBlock() const { return TheBB; } + inline Node *getIDom() const { return IDom; } inline const std::vector &getChildren() const { return Children; } // dominates - Returns true iff this dominates N. Note that this is not a // constant time operation! - inline bool dominates(const Node2 *N) const { - const Node2 *IDom; + inline bool dominates(const Node *N) const { + const Node *IDom; while ((IDom = N->getIDom()) != 0 && IDom != this) N = IDom; // Walk up the tree return IDom != 0; } private: - inline Node2(BasicBlock *node, Node *iDom) - : TheNode(node), IDom(iDom) {} - inline Node2 *addChild(Node *C) { Children.push_back(C); return C; } + inline Node(BasicBlock *BB, Node *iDom) + : TheBB(BB), IDom(iDom) {} + inline Node *addChild(Node *C) { Children.push_back(C); return C; } - void setIDom(Node2 *NewIDom); + void setIDom(Node *NewIDom); }; public: @@ -413,8 +409,7 @@ // // DominanceFrontier - Calculate the dominance frontiers for a function. // -class DominanceFrontierBase : public DominatorBase { -public: +struct DominanceFrontierBase : public DominatorBase { typedef std::set DomSetType; // Dom set for a bb typedef std::map DomSetMapType; // Dom set map protected: From lattner at cs.uiuc.edu Thu Sep 11 11:27:02 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Thu Sep 11 11:27:02 2003 Subject: [llvm-commits] CVS: llvm/lib/Analysis/PostDominators.cpp Message-ID: <200309111626.LAA04565@apoc.cs.uiuc.edu> Changes in directory llvm/lib/Analysis: PostDominators.cpp updated: 1.40 -> 1.41 --- Log message: Renamed DominatorTree::Node::getNode() -> getBlock() --- Diffs of the changes: Index: llvm/lib/Analysis/PostDominators.cpp diff -u llvm/lib/Analysis/PostDominators.cpp:1.40 llvm/lib/Analysis/PostDominators.cpp:1.41 --- llvm/lib/Analysis/PostDominators.cpp:1.40 Wed Sep 10 15:37:08 2003 +++ llvm/lib/Analysis/PostDominators.cpp Thu Sep 11 11:26:09 2003 @@ -174,7 +174,7 @@ PostDominanceFrontier::calculate(const PostDominatorTree &DT, const DominatorTree::Node *Node) { // Loop over CFG successors to calculate DFlocal[Node] - BasicBlock *BB = Node->getNode(); + BasicBlock *BB = Node->getBlock(); DomSetType &S = Frontiers[BB]; // The new set to fill in... if (getRoots().empty()) return S; From lattner at cs.uiuc.edu Thu Sep 11 11:27:11 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Thu Sep 11 11:27:11 2003 Subject: [llvm-commits] CVS: llvm/lib/Transforms/Scalar/ADCE.cpp CorrelatedExprs.cpp LICM.cpp LoopPreheaders.cpp PRE.cpp Message-ID: <200309111626.LAA04580@apoc.cs.uiuc.edu> Changes in directory llvm/lib/Transforms/Scalar: ADCE.cpp updated: 1.60 -> 1.61 CorrelatedExprs.cpp updated: 1.12 -> 1.13 LICM.cpp updated: 1.33 -> 1.34 LoopPreheaders.cpp updated: 1.15 -> 1.16 PRE.cpp updated: 1.4 -> 1.5 --- Log message: Renamed DominatorTree::Node::getNode() -> getBlock() --- Diffs of the changes: Index: llvm/lib/Transforms/Scalar/ADCE.cpp diff -u llvm/lib/Transforms/Scalar/ADCE.cpp:1.60 llvm/lib/Transforms/Scalar/ADCE.cpp:1.61 --- llvm/lib/Transforms/Scalar/ADCE.cpp:1.60 Wed Sep 10 15:38:14 2003 +++ llvm/lib/Transforms/Scalar/ADCE.cpp Thu Sep 11 11:26:10 2003 @@ -344,14 +344,14 @@ } else { PostDominatorTree::Node *NextNode = LastNode->getIDom(); - while (!AliveBlocks.count(NextNode->getNode())) { + while (!AliveBlocks.count(NextNode->getBlock())) { LastNode = NextNode; NextNode = NextNode->getIDom(); } // Get the basic blocks that we need... - BasicBlock *LastDead = LastNode->getNode(); - BasicBlock *NextAlive = NextNode->getNode(); + BasicBlock *LastDead = LastNode->getBlock(); + BasicBlock *NextAlive = NextNode->getBlock(); // Make the conditional branch now go to the next alive block... TI->getSuccessor(i)->removePredecessor(BB); Index: llvm/lib/Transforms/Scalar/CorrelatedExprs.cpp diff -u llvm/lib/Transforms/Scalar/CorrelatedExprs.cpp:1.12 llvm/lib/Transforms/Scalar/CorrelatedExprs.cpp:1.13 --- llvm/lib/Transforms/Scalar/CorrelatedExprs.cpp:1.12 Wed Sep 10 00:29:03 2003 +++ llvm/lib/Transforms/Scalar/CorrelatedExprs.cpp Thu Sep 11 11:26:10 2003 @@ -338,7 +338,7 @@ DominatorTree::Node *BBN = (*DT)[BB]; if (!RI.empty()) // Time opt: only propagate if we can change something for (unsigned i = 0, e = BBN->getChildren().size(); i != e; ++i) { - BasicBlock *Dominated = BBN->getChildren()[i]->getNode(); + BasicBlock *Dominated = BBN->getChildren()[i]->getBlock(); assert(RegionInfoMap.find(Dominated) == RegionInfoMap.end() && "RegionInfo should be calculated in dominanace order!"); getRegionInfo(Dominated) = RI; @@ -363,7 +363,7 @@ // Now that all of our successors have information, recursively process them. for (unsigned i = 0, e = BBN->getChildren().size(); i != e; ++i) - Changed |= TransformRegion(BBN->getChildren()[i]->getNode(), VisitedBlocks); + Changed |= TransformRegion(BBN->getChildren()[i]->getBlock(),VisitedBlocks); return Changed; } Index: llvm/lib/Transforms/Scalar/LICM.cpp diff -u llvm/lib/Transforms/Scalar/LICM.cpp:1.33 llvm/lib/Transforms/Scalar/LICM.cpp:1.34 --- llvm/lib/Transforms/Scalar/LICM.cpp:1.33 Thu Sep 11 10:32:37 2003 +++ llvm/lib/Transforms/Scalar/LICM.cpp Thu Sep 11 11:26:10 2003 @@ -245,12 +245,12 @@ assert(N != 0 && "Null dominator tree node?"); // If this subregion is not in the top level loop at all, exit. - if (!CurLoop->contains(N->getNode())) return; + if (!CurLoop->contains(N->getBlock())) return; // Only need to hoist the contents of this block if it is not part of a // subloop (which would already have been hoisted) - if (!inSubLoop(N->getNode())) - visit(*N->getNode()); + if (!inSubLoop(N->getBlock())) + visit(*N->getBlock()); const std::vector &Children = N->getChildren(); for (unsigned i = 0, e = Children.size(); i != e; ++i) @@ -305,7 +305,7 @@ IDom = IDom->getIDom(); //See if we exited the loop. - if(!CurLoop->contains(IDom->getNode())) + if(!CurLoop->contains(IDom->getBlock())) return false; } } Index: llvm/lib/Transforms/Scalar/LoopPreheaders.cpp diff -u llvm/lib/Transforms/Scalar/LoopPreheaders.cpp:1.15 llvm/lib/Transforms/Scalar/LoopPreheaders.cpp:1.16 --- llvm/lib/Transforms/Scalar/LoopPreheaders.cpp:1.15 Tue Sep 9 16:54:45 2003 +++ llvm/lib/Transforms/Scalar/LoopPreheaders.cpp Thu Sep 11 11:26:11 2003 @@ -366,7 +366,7 @@ NewBBIDomNode = DT->getNode(NewBBIDom); } else { NewBBIDomNode = DT->getNode(LoopBlocks[0]); // Random pred - while (!NewBBDomSet.count(NewBBIDomNode->getNode())) { + while (!NewBBDomSet.count(NewBBIDomNode->getBlock())) { NewBBIDomNode = NewBBIDomNode->getIDom(); assert(NewBBIDomNode && "No shared dominator found??"); } Index: llvm/lib/Transforms/Scalar/PRE.cpp diff -u llvm/lib/Transforms/Scalar/PRE.cpp:1.4 llvm/lib/Transforms/Scalar/PRE.cpp:1.5 --- llvm/lib/Transforms/Scalar/PRE.cpp:1.4 Tue Sep 9 16:54:45 2003 +++ llvm/lib/Transforms/Scalar/PRE.cpp Thu Sep 11 11:26:11 2003 @@ -165,7 +165,7 @@ void PRE::MarkPostDominatingBlocksAnticipatible(PostDominatorTree::Node *N, std::vector &AntBlocks, Instruction *Occurrence) { - unsigned BlockNo = BlockNumbering[N->getNode()]; + unsigned BlockNo = BlockNumbering[N->getBlock()]; if (AntBlocks[BlockNo]) return; // Already known to be anticipatible?? @@ -174,7 +174,7 @@ // "transparency". for (unsigned i = 0, e = Occurrence->getNumOperands(); i != e; ++i) if (Instruction *I = dyn_cast(Occurrence->getOperand(i))) - if (I->getParent() == N->getNode()) // Operand is defined in this block! + if (I->getParent() == N->getBlock()) // Operand is defined in this block! return; if (isa(Occurrence)) @@ -246,14 +246,14 @@ DominatorTree::Node *N = DT->getNode(Occurrence->getParent()); for (df_iterator DI = df_begin(N), E = df_end(N); DI != E; ++DI) - AvailableBlocks[(*DI)->getNode()] = Occurrence; + AvailableBlocks[(*DI)->getBlock()] = Occurrence; } /// ReplaceDominatedAvailableOccurrencesWith - This loops over the region /// dominated by N, replacing any available expressions with NewOcc. void PRE::ReplaceDominatedAvailableOccurrencesWith(Instruction *NewOcc, DominatorTree::Node *N) { - BasicBlock *BB = N->getNode(); + BasicBlock *BB = N->getBlock(); Instruction *&ExistingAvailableVal = AvailableBlocks[BB]; // If there isn't a definition already active in this node, make this the new @@ -280,7 +280,7 @@ // Mark NewOCC as the Available expression in all blocks dominated by BB for (df_iterator DI = df_begin(N), E = df_end(N); DI != E; ++DI) - AvailableBlocks[(*DI)->getNode()] = NewOcc; + AvailableBlocks[(*DI)->getBlock()] = NewOcc; } } From lattner at cs.uiuc.edu Thu Sep 11 11:27:19 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Thu Sep 11 11:27:19 2003 Subject: [llvm-commits] CVS: llvm/lib/VMCore/Dominators.cpp Message-ID: <200309111626.LAA04587@apoc.cs.uiuc.edu> Changes in directory llvm/lib/VMCore: Dominators.cpp updated: 1.47 -> 1.48 --- Log message: Renamed DominatorTree::Node::getNode() -> getBlock() --- Diffs of the changes: Index: llvm/lib/VMCore/Dominators.cpp diff -u llvm/lib/VMCore/Dominators.cpp:1.47 llvm/lib/VMCore/Dominators.cpp:1.48 --- llvm/lib/VMCore/Dominators.cpp:1.47 Wed Sep 10 15:37:51 2003 +++ llvm/lib/VMCore/Dominators.cpp Thu Sep 11 11:26:13 2003 @@ -211,7 +211,7 @@ RootNode = 0; } -void DominatorTreeBase::Node2::setIDom(Node2 *NewIDom) { +void DominatorTreeBase::Node::setIDom(Node *NewIDom) { assert(IDom && "No immediate dominator?"); if (IDom != NewIDom) { std::vector::iterator I = @@ -279,8 +279,8 @@ static std::ostream &operator<<(std::ostream &o, const DominatorTreeBase::Node *Node) { - if (Node->getNode()) - WriteAsOperand(o, Node->getNode(), false); + if (Node->getBlock()) + WriteAsOperand(o, Node->getBlock(), false); else o << " <>"; return o << "\n"; @@ -312,7 +312,7 @@ DominanceFrontier::calculate(const DominatorTree &DT, const DominatorTree::Node *Node) { // Loop over CFG successors to calculate DFlocal[Node] - BasicBlock *BB = Node->getNode(); + BasicBlock *BB = Node->getBlock(); DomSetType &S = Frontiers[BB]; // The new set to fill in... for (succ_iterator SI = succ_begin(BB), SE = succ_end(BB); From lattner at cs.uiuc.edu Thu Sep 11 11:35:03 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Thu Sep 11 11:35:03 2003 Subject: [llvm-commits] CVS: llvm/tools/gccas/gccas.cpp Message-ID: <200309111634.LAA05030@apoc.cs.uiuc.edu> Changes in directory llvm/tools/gccas: gccas.cpp updated: 1.71 -> 1.72 --- Log message: Move the -indvars pass much later to where it is more likely to do good stuff --- Diffs of the changes: Index: llvm/tools/gccas/gccas.cpp diff -u llvm/tools/gccas/gccas.cpp:1.71 llvm/tools/gccas/gccas.cpp:1.72 --- llvm/tools/gccas/gccas.cpp:1.71 Mon Sep 1 15:45:46 2003 +++ llvm/tools/gccas/gccas.cpp Thu Sep 11 11:34:07 2003 @@ -60,7 +60,6 @@ addPass(PM, createInstructionCombiningPass()); // Combine silly seq's - addPass(PM, createIndVarSimplifyPass()); // Simplify indvars addPass(PM, createReassociatePass()); // Reassociate expressions addPass(PM, createInstructionCombiningPass()); // Combine silly seq's addPass(PM, createCFGSimplificationPass()); // Merge & remove BBs @@ -72,6 +71,7 @@ // Run instcombine after redundancy elimination to exploit opportunities // opened up by them. addPass(PM, createInstructionCombiningPass()); + addPass(PM, createIndVarSimplifyPass()); // Canonicalize indvars addPass(PM, createAggressiveDCEPass()); // SSA based 'Aggressive DCE' addPass(PM, createCFGSimplificationPass()); // Merge & remove BBs addPass(PM, createDeadTypeEliminationPass()); // Eliminate dead types From lattner at cs.uiuc.edu Thu Sep 11 11:47:01 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Thu Sep 11 11:47:01 2003 Subject: [llvm-commits] CVS: llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp Message-ID: <200309111646.LAA05878@apoc.cs.uiuc.edu> Changes in directory llvm/lib/Transforms/Scalar: ScalarReplAggregates.cpp updated: 1.9 -> 1.10 --- Log message: Integrate functionality of the mem2reg pass directly into this pass to make the combination more effective --- Diffs of the changes: Index: llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp diff -u llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp:1.9 llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp:1.10 --- llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp:1.9 Sat Aug 30 19:45:13 2003 +++ llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp Thu Sep 11 11:45:55 2003 @@ -3,29 +3,43 @@ // This transformation implements the well known scalar replacement of // aggregates transformation. This xform breaks up alloca instructions of // aggregate type (structure or array) into individual alloca instructions for -// each member (if possible). +// each member (if possible). Then, if possible, it transforms the individual +// alloca instructions into nice clean scalar SSA form. +// +// This combines a simple SRoA algorithm with the Mem2Reg algorithm because +// often interact, especially for C++ programs. As such, iterating between +// SRoA, then Mem2Reg until we run out of things to promote works well. // //===----------------------------------------------------------------------===// #include "llvm/Transforms/Scalar.h" +#include "llvm/Constants.h" +#include "llvm/DerivedTypes.h" #include "llvm/Function.h" #include "llvm/Pass.h" #include "llvm/iMemory.h" -#include "llvm/DerivedTypes.h" -#include "llvm/Constants.h" +#include "llvm/Analysis/Dominators.h" +#include "llvm/Target/TargetData.h" +#include "llvm/Transforms/Utils/PromoteMemToReg.h" #include "Support/Debug.h" #include "Support/Statistic.h" #include "Support/StringExtras.h" namespace { Statistic<> NumReplaced("scalarrepl", "Number of alloca's broken up"); + Statistic<> NumPromoted("scalarrepl", "Number of alloca's promoted"); struct SROA : public FunctionPass { bool runOnFunction(Function &F); + bool performScalarRepl(Function &F); + bool performPromotion(Function &F); + // getAnalysisUsage - This pass does not require any passes, but we know it // will not alter the CFG, so say so. virtual void getAnalysisUsage(AnalysisUsage &AU) const { + AU.addRequired(); + AU.addRequired(); AU.setPreservesCFG(); } @@ -43,11 +57,52 @@ Pass *createScalarReplAggregatesPass() { return new SROA(); } -// runOnFunction - This algorithm is a simple worklist driven algorithm, which -// runs on all of the malloc/alloca instructions in the function, removing them -// if they are only used by getelementptr instructions. -// bool SROA::runOnFunction(Function &F) { + bool Changed = false, LocalChange; + do { + LocalChange = performScalarRepl(F); + LocalChange |= performPromotion(F); + Changed |= LocalChange; + } while (LocalChange); + + return Changed; +} + + +bool SROA::performPromotion(Function &F) { + std::vector Allocas; + const TargetData &TD = getAnalysis(); + + BasicBlock &BB = F.getEntryNode(); // Get the entry node for the function + + bool Changed = false; + + while (1) { + Allocas.clear(); + + // Find allocas that are safe to promote, by looking at all instructions in + // the entry node + for (BasicBlock::iterator I = BB.begin(), E = --BB.end(); I != E; ++I) + if (AllocaInst *AI = dyn_cast(I)) // Is it an alloca? + if (isAllocaPromotable(AI, TD)) + Allocas.push_back(AI); + + if (Allocas.empty()) break; + + PromoteMemToReg(Allocas, getAnalysis(), TD); + NumPromoted += Allocas.size(); + Changed = true; + } + + return Changed; +} + + +// performScalarRepl - This algorithm is a simple worklist driven algorithm, +// which runs on all of the malloc/alloca instructions in the function, removing +// them if they are only used by getelementptr instructions. +// +bool SROA::performScalarRepl(Function &F) { std::vector WorkList; // Scan the entry basic block, adding any alloca's and mallocs to the worklist From lattner at cs.uiuc.edu Thu Sep 11 11:47:12 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Thu Sep 11 11:47:12 2003 Subject: [llvm-commits] CVS: llvm/tools/gccas/gccas.cpp Message-ID: <200309111646.LAA05887@apoc.cs.uiuc.edu> Changes in directory llvm/tools/gccas: gccas.cpp updated: 1.72 -> 1.73 --- Log message: scalarrepl now includes mem2reg --- Diffs of the changes: Index: llvm/tools/gccas/gccas.cpp diff -u llvm/tools/gccas/gccas.cpp:1.72 llvm/tools/gccas/gccas.cpp:1.73 --- llvm/tools/gccas/gccas.cpp:1.72 Thu Sep 11 11:34:07 2003 +++ llvm/tools/gccas/gccas.cpp Thu Sep 11 11:46:10 2003 @@ -56,7 +56,6 @@ addPass(PM, createTailDuplicationPass()); // Simplify cfg by copying code addPass(PM, createCFGSimplificationPass()); // Merge & remove BBs addPass(PM, createScalarReplAggregatesPass()); // Break up aggregate allocas - addPass(PM, createPromoteMemoryToRegister()); // Promote alloca's to regs addPass(PM, createInstructionCombiningPass()); // Combine silly seq's From brukman at cs.uiuc.edu Thu Sep 11 11:59:02 2003 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Thu Sep 11 11:59:02 2003 Subject: [llvm-commits] CVS: llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp Message-ID: <200309111658.LAA23965@zion.cs.uiuc.edu> Changes in directory llvm/lib/Transforms/Scalar: ScalarReplAggregates.cpp updated: 1.10 -> 1.11 --- Log message: Apostrophes are only used for possession and quoting. --- Diffs of the changes: Index: llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp diff -u llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp:1.10 llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp:1.11 --- llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp:1.10 Thu Sep 11 11:45:55 2003 +++ llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp Thu Sep 11 11:58:31 2003 @@ -26,8 +26,8 @@ #include "Support/StringExtras.h" namespace { - Statistic<> NumReplaced("scalarrepl", "Number of alloca's broken up"); - Statistic<> NumPromoted("scalarrepl", "Number of alloca's promoted"); + Statistic<> NumReplaced("scalarrepl", "Number of allocas broken up"); + Statistic<> NumPromoted("scalarrepl", "Number of allocas promoted"); struct SROA : public FunctionPass { bool runOnFunction(Function &F); From criswell at cs.uiuc.edu Thu Sep 11 12:59:01 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Thu Sep 11 12:59:01 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/SingleSource/Benchmarks/Misc/Makefile Message-ID: <200309111758.MAA25837@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/SingleSource/Benchmarks/Misc: Makefile added (r1.1) --- Log message: Adding Makefiles for the SingleSource Benchmark programs. --- Diffs of the changes: Index: llvm/test/Programs/SingleSource/Benchmarks/Misc/Makefile diff -c /dev/null llvm/test/Programs/SingleSource/Benchmarks/Misc/Makefile:1.1 *** /dev/null Thu Sep 11 12:58:34 2003 --- llvm/test/Programs/SingleSource/Benchmarks/Misc/Makefile Thu Sep 11 12:58:24 2003 *************** *** 0 **** --- 1,4 ---- + LEVEL = ../../../../.. + LDFLAGS += -lm + + include $(LEVEL)/test/Programs/SingleSource/Makefile.singlesrc From criswell at cs.uiuc.edu Thu Sep 11 12:59:10 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Thu Sep 11 12:59:10 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/SingleSource/Benchmarks/Makefile Message-ID: <200309111758.MAA25823@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/SingleSource/Benchmarks: Makefile added (r1.1) --- Log message: Adding Makefiles for the SingleSource Benchmark programs. --- Diffs of the changes: Index: llvm/test/Programs/SingleSource/Benchmarks/Makefile diff -c /dev/null llvm/test/Programs/SingleSource/Benchmarks/Makefile:1.1 *** /dev/null Thu Sep 11 12:58:32 2003 --- llvm/test/Programs/SingleSource/Benchmarks/Makefile Thu Sep 11 12:58:22 2003 *************** *** 0 **** --- 1,5 ---- + LEVEL = ../../../.. + PARALLEL_DIRS=Dhrystone Shootout Stanford Misc + LDFLAGS += -lm + + include $(LEVEL)/test/Programs/SingleSource/Makefile.singlesrc From criswell at cs.uiuc.edu Thu Sep 11 12:59:19 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Thu Sep 11 12:59:19 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/SingleSource/Benchmarks/Dhrystone/Makefile Message-ID: <200309111758.MAA25830@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/SingleSource/Benchmarks/Dhrystone: Makefile added (r1.1) --- Log message: Adding Makefiles for the SingleSource Benchmark programs. --- Diffs of the changes: Index: llvm/test/Programs/SingleSource/Benchmarks/Dhrystone/Makefile diff -c /dev/null llvm/test/Programs/SingleSource/Benchmarks/Dhrystone/Makefile:1.1 *** /dev/null Thu Sep 11 12:58:33 2003 --- llvm/test/Programs/SingleSource/Benchmarks/Dhrystone/Makefile Thu Sep 11 12:58:23 2003 *************** *** 0 **** --- 1,4 ---- + LEVEL = ../../../../.. + LDFLAGS += -lm + + include $(LEVEL)/test/Programs/SingleSource/Makefile.singlesrc From criswell at cs.uiuc.edu Thu Sep 11 12:59:27 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Thu Sep 11 12:59:27 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/SingleSource/Benchmarks/Shootout/Makefile Message-ID: <200309111758.MAA25845@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/SingleSource/Benchmarks/Shootout: Makefile updated: 1.2 -> 1.3 --- Log message: Adding Makefiles for the SingleSource Benchmark programs. --- Diffs of the changes: Index: llvm/test/Programs/SingleSource/Benchmarks/Shootout/Makefile diff -u llvm/test/Programs/SingleSource/Benchmarks/Shootout/Makefile:1.2 llvm/test/Programs/SingleSource/Benchmarks/Shootout/Makefile:1.3 --- llvm/test/Programs/SingleSource/Benchmarks/Shootout/Makefile:1.2 Wed Sep 10 11:25:46 2003 +++ llvm/test/Programs/SingleSource/Benchmarks/Shootout/Makefile Thu Sep 11 12:58:26 2003 @@ -1,5 +1,4 @@ -# Shootout/Makefile - LEVEL = ../../../../.. -include ../../Makefile.singlesrc +LDFLAGS += -lm +include $(LEVEL)/test/Programs/SingleSource/Makefile.singlesrc From criswell at cs.uiuc.edu Thu Sep 11 12:59:36 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Thu Sep 11 12:59:36 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/SingleSource/Benchmarks/Stanford/Makefile Message-ID: <200309111758.MAA25852@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/SingleSource/Benchmarks/Stanford: Makefile updated: 1.2 -> 1.3 --- Log message: Adding Makefiles for the SingleSource Benchmark programs. --- Diffs of the changes: Index: llvm/test/Programs/SingleSource/Benchmarks/Stanford/Makefile diff -u llvm/test/Programs/SingleSource/Benchmarks/Stanford/Makefile:1.2 llvm/test/Programs/SingleSource/Benchmarks/Stanford/Makefile:1.3 --- llvm/test/Programs/SingleSource/Benchmarks/Stanford/Makefile:1.2 Wed Sep 10 11:25:48 2003 +++ llvm/test/Programs/SingleSource/Benchmarks/Stanford/Makefile Thu Sep 11 12:58:27 2003 @@ -1,3 +1,4 @@ LEVEL = ../../../../.. +LDFLAGS += -lm -include ../../Makefile.singlesrc +include $(LEVEL)/test/Programs/SingleSource/Makefile.singlesrc From criswell at cs.uiuc.edu Thu Sep 11 13:05:02 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Thu Sep 11 13:05:02 2003 Subject: [llvm-commits] CVS: llvm/Makefile.config.in Makefile.rules configure Message-ID: <200309111804.NAA31135@choi.cs.uiuc.edu> Changes in directory llvm: Makefile.config.in updated: 1.11 -> 1.12 Makefile.rules updated: 1.135 -> 1.136 configure updated: 1.17 -> 1.18 --- Log message: Fixed SPEC so that it would run correctly with the new autoconf-style object directory. Added Makefile.spec to the list of files to copy to the object directory. Moved the configuration of $SourceDir to Makefile.config and corrected the conditional that surrounds it. This allows SPEC to reset it and get the correct VPATH. --- Diffs of the changes: Index: llvm/Makefile.config.in diff -u llvm/Makefile.config.in:1.11 llvm/Makefile.config.in:1.12 --- llvm/Makefile.config.in:1.11 Sat Sep 6 09:44:17 2003 +++ llvm/Makefile.config.in Thu Sep 11 13:03:50 2003 @@ -233,3 +233,10 @@ LLVM_SRC_ROOT := $(BUILD_SRC_ROOT) endif +# +# Set SourceDir for backwards compatbility. +# +ifndef SourceDir +SourceDir=$(BUILD_SRC_DIR) +endif + Index: llvm/Makefile.rules diff -u llvm/Makefile.rules:1.135 llvm/Makefile.rules:1.136 --- llvm/Makefile.rules:1.135 Thu Sep 11 10:15:53 2003 +++ llvm/Makefile.rules Thu Sep 11 13:03:50 2003 @@ -49,10 +49,8 @@ # # Set the VPATH so that we can find source files. -# Also set $SouceDir for backwards compatibility # -VPATH=$(BUILD_SRC_DIR) -SourceDir=$(BUILD_SRC_DIR) +VPATH=$(SourceDir) ########################################################################### # Default Targets: Index: llvm/configure diff -u llvm/configure:1.17 llvm/configure:1.18 --- llvm/configure:1.17 Wed Sep 10 13:38:42 2003 +++ llvm/configure Thu Sep 11 13:03:50 2003 @@ -1625,6 +1625,12 @@ ac_config_commands="$ac_config_commands runtime/GCCLibraries/libc/Makefile" + ac_config_commands="$ac_config_commands runtime/GCCLibraries/libcurses/Makefile" + + + ac_config_commands="$ac_config_commands runtime/GCCLibraries/libexception/Makefile" + + ac_config_commands="$ac_config_commands runtime/GCCLibraries/libg/Makefile" @@ -1637,9 +1643,18 @@ ac_config_commands="$ac_config_commands runtime/GCCLibraries/libmalloc/Makefile" + ac_config_commands="$ac_config_commands runtime/GCCLibraries/libtermcap/Makefile" + + ac_config_commands="$ac_config_commands runtime/GCCLibraries/libucb/Makefile" + ac_config_commands="$ac_config_commands runtime/GCCLibraries/libutempter/Makefile" + + + ac_config_commands="$ac_config_commands runtime/GCCLibraries/libutil/Makefile" + + ac_config_commands="$ac_config_commands runtime/libdummy/Makefile" @@ -1706,6 +1721,9 @@ ac_config_commands="$ac_config_commands test/Programs/External/SPEC/Makefile" + ac_config_commands="$ac_config_commands test/Programs/External/SPEC/Makefile.spec" + + ac_config_commands="$ac_config_commands test/Programs/External/SPEC/CFP2000/Makefile" @@ -4356,7 +4374,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4359 "configure"' > conftest.$ac_ext + echo '#line 4377 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5197,7 +5215,7 @@ # Provide some information about the compiler. -echo "$as_me:5200:" \ +echo "$as_me:5218:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 @@ -6206,11 +6224,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6209: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6227: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6213: \$? = $ac_status" >&5 + echo "$as_me:6231: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -6438,11 +6456,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6441: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6459: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6445: \$? = $ac_status" >&5 + echo "$as_me:6463: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -6505,11 +6523,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6508: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6526: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:6512: \$? = $ac_status" >&5 + echo "$as_me:6530: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8517,7 +8535,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:10772: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:10758: \$? = $ac_status" >&5 + echo "$as_me:10776: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -10818,11 +10836,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10821: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10839: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:10825: \$? = $ac_status" >&5 + echo "$as_me:10843: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12061,7 +12079,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:13002: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12988: \$? = $ac_status" >&5 + echo "$as_me:13006: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -13048,11 +13066,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13051: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13069: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13055: \$? = $ac_status" >&5 + echo "$as_me:13073: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14992,11 +15010,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14995: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15013: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14999: \$? = $ac_status" >&5 + echo "$as_me:15017: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -15224,11 +15242,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15227: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15245: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15231: \$? = $ac_status" >&5 + echo "$as_me:15249: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -15291,11 +15309,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15294: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15312: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15298: \$? = $ac_status" >&5 + echo "$as_me:15316: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17303,7 +17321,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext < Changes in directory llvm/test/Programs: Makefile.programs updated: 1.91 -> 1.92 --- Log message: Fixed SPEC so that it would run correctly with the new autoconf-style object directory. Cleaned up the Makefile so that it uses VPATH to find source files. --- Diffs of the changes: Index: llvm/test/Programs/Makefile.programs diff -u llvm/test/Programs/Makefile.programs:1.91 llvm/test/Programs/Makefile.programs:1.92 --- llvm/test/Programs/Makefile.programs:1.91 Sat Sep 6 10:12:45 2003 +++ llvm/test/Programs/Makefile.programs Thu Sep 11 13:04:23 2003 @@ -42,8 +42,6 @@ include $(LEVEL)/test/Makefile.tests -VPATH=$(SourceDir) - .PRECIOUS: Output/%.llvm Output/%.native Output/%.llc Output/%.llc.s .PRECIOUS: Output/%.cbe Output/%.cbe.c Output/%.llvm.bc .PRECIOUS: Output/%.linked.bc From criswell at cs.uiuc.edu Thu Sep 11 13:05:21 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Thu Sep 11 13:05:21 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/External/SPEC/Makefile.spec Message-ID: <200309111804.NAA31161@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/External/SPEC: Makefile.spec updated: 1.16 -> 1.17 --- Log message: Fixed SPEC so that it would run correctly with the new autoconf-style object directory. Cleaned up the Makefile so that it uses VPATH to find source files. --- Diffs of the changes: Index: llvm/test/Programs/External/SPEC/Makefile.spec diff -u llvm/test/Programs/External/SPEC/Makefile.spec:1.16 llvm/test/Programs/External/SPEC/Makefile.spec:1.17 --- llvm/test/Programs/External/SPEC/Makefile.spec:1.16 Sat Aug 23 11:04:31 2003 +++ llvm/test/Programs/External/SPEC/Makefile.spec Thu Sep 11 13:04:28 2003 @@ -50,7 +50,7 @@ LCXXFLAGS := -O2 CPPFLAGS += -DSPEC_CPU2000 -SPEC_SANDBOX := $(LEVEL)/test/Programs/External/SPEC/Sandbox.sh +SPEC_SANDBOX := $(LLVM_SRC_ROOT)/test/Programs/External/SPEC/Sandbox.sh # Information about testing the program... REF_IN_DIR := $(SPEC_BENCH_DIR)/data/$(RUN_TYPE)/input/ @@ -65,7 +65,7 @@ $(PROGRAMS_TO_TEST:%=Output/%.out-nat): \ Output/%.out-nat: Output/%.native $(SPEC_SANDBOX) nat-$(RUN_TYPE) $@ $(REF_IN_DIR) \ - ../../$(RUNSAFELY) $(STDIN_FILENAME) $(STDOUT_FILENAME) \ + $(RUNSAFELY) $(STDIN_FILENAME) $(STDOUT_FILENAME) \ ../../$< $(RUN_OPTIONS) -(cd Output/nat-$(RUN_TYPE); cat $(LOCAL_OUTPUTS)) > $@ -cp Output/nat-$(RUN_TYPE)/$(STDOUT_FILENAME).time $@.time @@ -73,7 +73,7 @@ $(PROGRAMS_TO_TEST:%=Output/%.out-lli): \ Output/%.out-lli: Output/%.llvm.bc $(LLI) $(SPEC_SANDBOX) lli-$(RUN_TYPE) $@ $(REF_IN_DIR) \ - ../../$(RUNSAFELY) $(STDIN_FILENAME) $(STDOUT_FILENAME) \ + $(RUNSAFELY) $(STDIN_FILENAME) $(STDOUT_FILENAME) \ $(LLI) $(LLI_OPTS) ../../$< $(RUN_OPTIONS) -(cd Output/lli-$(RUN_TYPE); cat $(LOCAL_OUTPUTS)) > $@ -cp Output/lli-$(RUN_TYPE)/$(STDOUT_FILENAME).time $@.time @@ -81,7 +81,7 @@ $(PROGRAMS_TO_TEST:%=Output/%.out-jit): \ Output/%.out-jit: Output/%.llvm.bc $(LLI) $(SPEC_SANDBOX) jit-$(RUN_TYPE) $@ $(REF_IN_DIR) \ - ../../$(RUNSAFELY) $(STDIN_FILENAME) $(STDOUT_FILENAME) \ + $(RUNSAFELY) $(STDIN_FILENAME) $(STDOUT_FILENAME) \ $(LLI) $(JIT_OPTS) ../../$< $(RUN_OPTIONS) -(cd Output/jit-$(RUN_TYPE); cat $(LOCAL_OUTPUTS)) > $@ -cp Output/jit-$(RUN_TYPE)/$(STDOUT_FILENAME).time $@.time @@ -89,7 +89,7 @@ $(PROGRAMS_TO_TEST:%=Output/%.out-llc): \ Output/%.out-llc: Output/%.llc $(SPEC_SANDBOX) llc-$(RUN_TYPE) $@ $(REF_IN_DIR) \ - ../../$(RUNSAFELY) $(STDIN_FILENAME) $(STDOUT_FILENAME) \ + $(RUNSAFELY) $(STDIN_FILENAME) $(STDOUT_FILENAME) \ ../../$< $(RUN_OPTIONS) -(cd Output/llc-$(RUN_TYPE); cat $(LOCAL_OUTPUTS)) > $@ -cp Output/llc-$(RUN_TYPE)/$(STDOUT_FILENAME).time $@.time @@ -97,7 +97,7 @@ $(PROGRAMS_TO_TEST:%=Output/%.out-cbe): \ Output/%.out-cbe: Output/%.cbe $(SPEC_SANDBOX) cbe-$(RUN_TYPE) $@ $(REF_IN_DIR) \ - ../../$(RUNSAFELY) $(STDIN_FILENAME) $(STDOUT_FILENAME) \ + $(RUNSAFELY) $(STDIN_FILENAME) $(STDOUT_FILENAME) \ ../../$< $(RUN_OPTIONS) -(cd Output/cbe-$(RUN_TYPE); cat $(LOCAL_OUTPUTS)) > $@ -cp Output/cbe-$(RUN_TYPE)/$(STDOUT_FILENAME).time $@.time @@ -105,7 +105,7 @@ $(PROGRAMS_TO_TEST:%=Output/%.trace-out-llc): \ Output/%.trace-out-llc: Output/%.trace.llc $(SPEC_SANDBOX) llc-$(RUN_TYPE) $@ $(REF_IN_DIR) \ - ../../$(RUNSAFELY) $(STDIN_FILENAME) $(STDOUT_FILENAME) \ + $(RUNSAFELY) $(STDIN_FILENAME) $(STDOUT_FILENAME) \ ../../$< $(RUN_OPTIONS) -(cd Output/llc-$(RUN_TYPE); cat $(LOCAL_OUTPUTS)) > $@ -cp Output/llc-$(RUN_TYPE)/$(STDOUT_FILENAME).time $@.time @@ -113,7 +113,7 @@ $(PROGRAMS_TO_TEST:%=Output/%.trace-out-cbe): \ Output/%.trace-out-cbe: Output/%.trace.cbe $(SPEC_SANDBOX) cbe-$(RUN_TYPE) $@ $(REF_IN_DIR) \ - ../../$(RUNSAFELY) $(STDIN_FILENAME) $(STDOUT_FILENAME) \ + $(RUNSAFELY) $(STDIN_FILENAME) $(STDOUT_FILENAME) \ ../../$< $(RUN_OPTIONS) -(cd Output/cbe-$(RUN_TYPE); cat $(LOCAL_OUTPUTS)) > $@ -cp Output/cbe-$(RUN_TYPE)/$(STDOUT_FILENAME).time $@.time @@ -121,7 +121,7 @@ $(PROGRAMS_TO_TEST:%=Output/%.out-tracing): \ Output/%.out-tracing: Output/%.trace $(SPEC_SANDBOX) trace-$(RUN_TYPE) $@ $(REF_IN_DIR) \ - ../../$(RUNSAFELY) $(STDIN_FILENAME) $(STDOUT_FILENAME) \ + $(RUNSAFELY) $(STDIN_FILENAME) $(STDOUT_FILENAME) \ ../../$< $(RUN_OPTIONS) -(cd Output/trace-$(RUN_TYPE); cat $(LOCAL_OUTPUTS)) > $@ -cp Output/trace-$(RUN_TYPE)/$(STDOUT_FILENAME).time $@.time From criswell at cs.uiuc.edu Thu Sep 11 13:05:31 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Thu Sep 11 13:05:31 2003 Subject: [llvm-commits] CVS: llvm/autoconf/configure.ac Message-ID: <200309111804.NAA31156@choi.cs.uiuc.edu> Changes in directory llvm/autoconf: configure.ac updated: 1.10 -> 1.11 --- Log message: Fixed SPEC so that it would run correctly with the new autoconf-style object directory. Added Makefile.spec to the list of files to copy to the object directory. --- Diffs of the changes: Index: llvm/autoconf/configure.ac diff -u llvm/autoconf/configure.ac:1.10 llvm/autoconf/configure.ac:1.11 --- llvm/autoconf/configure.ac:1.10 Wed Sep 10 13:38:44 2003 +++ llvm/autoconf/configure.ac Thu Sep 11 13:04:00 2003 @@ -92,6 +92,7 @@ AC_CONFIG_MAKEFILE(test/Programs/TEST.micro.Makefile) AC_CONFIG_MAKEFILE(test/Programs/External/Makefile) AC_CONFIG_MAKEFILE(test/Programs/External/SPEC/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/External/SPEC/Makefile.spec) AC_CONFIG_MAKEFILE(test/Programs/External/SPEC/CFP2000/Makefile) AC_CONFIG_MAKEFILE(test/Programs/External/SPEC/CFP2000/179.art/Makefile) AC_CONFIG_MAKEFILE(test/Programs/External/SPEC/CFP2000/183.equake/Makefile) From criswell at cs.uiuc.edu Thu Sep 11 13:05:41 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Thu Sep 11 13:05:41 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Makefile.multisrc Message-ID: <200309111804.NAA31158@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/MultiSource: Makefile.multisrc updated: 1.36 -> 1.37 --- Log message: Fixed SPEC so that it would run correctly with the new autoconf-style object directory. Cleaned up the Makefile so that it uses VPATH to find source files. --- Diffs of the changes: Index: llvm/test/Programs/MultiSource/Makefile.multisrc diff -u llvm/test/Programs/MultiSource/Makefile.multisrc:1.36 llvm/test/Programs/MultiSource/Makefile.multisrc:1.37 --- llvm/test/Programs/MultiSource/Makefile.multisrc:1.36 Sat Sep 6 10:13:08 2003 +++ llvm/test/Programs/MultiSource/Makefile.multisrc Thu Sep 11 13:04:30 2003 @@ -31,15 +31,6 @@ .PRECIOUS: $(LObjects) $(NObjects) Output/%.linked.rll -Output/%.o: $(SourceDir)/%.c Output/.dir - $(CC) $(CPPFLAGS) $(CFLAGS) -O2 -c $< -o $@ - -Output/%.o: $(SourceDir)/%.cpp Output/.dir - $(CC) $(CPPFLAGS) $(CXXFLAGS) -O2 -c $< -o $@ - -Output/%.o: $(SourceDir)/%.cc Output/.dir - $(CC) $(CPPFLAGS) $(CXXFLAGS) -O2 -c $< -o $@ - Output/%.o: %.c Output/.dir $(CC) $(CPPFLAGS) $(CFLAGS) -O2 -c $< -o $@ @@ -71,7 +62,7 @@ $(PROGRAMS_TO_TEST:%=Output/%.LOC.txt): \ Output/%.LOC.txt: $(Source) - cat $(Source) $(wildcard $(SourceDir)/*.h) | wc -l > $@ + cat $^ $(wildcard $(SourceDir)/*.h) | wc -l > $@ endif From criswell at cs.uiuc.edu Thu Sep 11 13:06:02 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Thu Sep 11 13:06:02 2003 Subject: [llvm-commits] CVS: llvm/test/Makefile.tests Message-ID: <200309111805.NAA31172@choi.cs.uiuc.edu> Changes in directory llvm/test: Makefile.tests updated: 1.78 -> 1.79 --- Log message: Fixed SPEC so that it would run correctly with the new autoconf-style object directory. Cleaned up the Makefile so that it uses VPATH to find source files. --- Diffs of the changes: Index: llvm/test/Makefile.tests diff -u llvm/test/Makefile.tests:1.78 llvm/test/Makefile.tests:1.79 --- llvm/test/Makefile.tests:1.78 Sat Sep 6 10:12:21 2003 +++ llvm/test/Makefile.tests Thu Sep 11 13:04:19 2003 @@ -85,23 +85,14 @@ $(RM) -rf Output/ # Compile from X.c to Output/X.ll -Output/%.ll: $(SourceDir)/%.c $(LCC1) Output/.dir $(INCLUDES) - $(LCC) $(CPPFLAGS) $(LCCFLAGS) -S $< -o $@ - Output/%.ll: %.c $(LCC1) Output/.dir $(INCLUDES) $(LCC) $(CPPFLAGS) $(LCCFLAGS) -S $< -o $@ # Compile from X.cpp to Output/X.ll -Output/%.ll: $(SourceDir)/%.cpp $(LCC1XX) Output/.dir $(INCLUDES) - $(LCXX) $(CPPFLAGS) $(LCXXFLAGS) -S $< -o $@ - Output/%.ll: %.cpp $(LCC1XX) Output/.dir $(INCLUDES) $(LCXX) $(CPPFLAGS) $(LCXXFLAGS) -S $< -o $@ # Compile from X.cc to Output/X.ll -Output/%.ll: $(SourceDir)/%.cc $(LCC1XX) Output/.dir $(INCLUDES) - $(LCXX) $(CPPFLAGS) $(LCXXFLAGS) -S $< -o $@ - Output/%.ll: %.cc $(LCC1XX) Output/.dir $(INCLUDES) $(LCXX) $(CPPFLAGS) $(LCXXFLAGS) -S $< -o $@ @@ -114,25 +105,15 @@ # LLVM Assemble from X.ll to Output/X.bc. Because we are coming directly from # LLVM source, use the non-transforming assembler. # -Output/%.bc: $(SourceDir)/%.ll $(LAS) Output/.dir +Output/%.bc: %.ll $(LAS) Output/.dir $(LAS) -f $< -o $@ # # Testing versions of provided utilities... # -Output/%.tll: $(SourceDir)/%.c $(LCC1) Output/.dir $(INCLUDES) - @echo "======== Compiling $<" - $(LCC) $(CPPFLAGS) $(LCCFLAGS) -S $< -o $@ || \ - ( rm -f $@; $(FAILURE) $@ ) - Output/%.tll: %.c $(LCC1) Output/.dir $(INCLUDES) @echo "======== Compiling $<" $(LCC) $(CPPFLAGS) $(LCCFLAGS) -S $< -o $@ || \ - ( rm -f $@; $(FAILURE) $@ ) - -Output/%.tll: $(SourceDir)/%.cpp $(LCC1XX) Output/.dir $(INCLUDES) - @echo "======== Compiling $<" - $(LCXX) $(CPPFLAGS) $(LCXXFLAGS) -S $< -o $@ || \ ( rm -f $@; $(FAILURE) $@ ) Output/%.tll: %.cpp $(LCC1XX) Output/.dir $(INCLUDES) From brukman at cs.uiuc.edu Thu Sep 11 13:13:03 2003 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Thu Sep 11 13:13:03 2003 Subject: [llvm-commits] CVS: llvm/lib/Analysis/BasicAliasAnalysis.cpp InductionVariable.cpp LoadValueNumbering.cpp PostDominators.cpp ValueNumbering.cpp Message-ID: <200309111812.NAA24287@zion.cs.uiuc.edu> Changes in directory llvm/lib/Analysis: BasicAliasAnalysis.cpp updated: 1.12 -> 1.13 InductionVariable.cpp updated: 1.29 -> 1.30 LoadValueNumbering.cpp updated: 1.7 -> 1.8 PostDominators.cpp updated: 1.41 -> 1.42 ValueNumbering.cpp updated: 1.4 -> 1.5 --- Log message: Fixed spelling and grammar. --- Diffs of the changes: Index: llvm/lib/Analysis/BasicAliasAnalysis.cpp diff -u llvm/lib/Analysis/BasicAliasAnalysis.cpp:1.12 llvm/lib/Analysis/BasicAliasAnalysis.cpp:1.13 --- llvm/lib/Analysis/BasicAliasAnalysis.cpp:1.12 Thu Jul 3 01:42:38 2003 +++ llvm/lib/Analysis/BasicAliasAnalysis.cpp Thu Sep 11 13:12:02 2003 @@ -110,7 +110,7 @@ const Value *O1 = getUnderlyingObject(V1); const Value *O2 = getUnderlyingObject(V2); - // Pointing at a discernable object? + // Pointing at a discernible object? if (O1 && O2) { // If they are two different objects, we know that we have no alias... if (O1 != O2) return NoAlias; Index: llvm/lib/Analysis/InductionVariable.cpp diff -u llvm/lib/Analysis/InductionVariable.cpp:1.29 llvm/lib/Analysis/InductionVariable.cpp:1.30 --- llvm/lib/Analysis/InductionVariable.cpp:1.29 Wed Sep 10 09:55:05 2003 +++ llvm/lib/Analysis/InductionVariable.cpp Thu Sep 11 13:12:02 2003 @@ -178,7 +178,7 @@ return 0; } - // Find final node: predecesor of the loop header that's also an exit + // Find final node: predecessor of the loop header that's also an exit BasicBlock *terminator = 0; for (pred_iterator PI = pred_begin(L->getHeader()), PE = pred_end(L->getHeader()); PI != PE; ++PI) Index: llvm/lib/Analysis/LoadValueNumbering.cpp diff -u llvm/lib/Analysis/LoadValueNumbering.cpp:1.7 llvm/lib/Analysis/LoadValueNumbering.cpp:1.8 --- llvm/lib/Analysis/LoadValueNumbering.cpp:1.7 Thu Sep 11 10:30:57 2003 +++ llvm/lib/Analysis/LoadValueNumbering.cpp Thu Sep 11 13:12:02 2003 @@ -109,7 +109,7 @@ Function *F = LI->getParent()->getParent(); // Now that we know the set of equivalent source pointers for the load - // instruction, look to see if there are any load or store candiates that + // instruction, look to see if there are any load or store candidates that // are identical. // std::vector CandidateLoads; @@ -148,7 +148,7 @@ AliasAnalysis &AA = getAnalysis(); DominatorSet &DomSetInfo = getAnalysis(); - // Loop over all of the candindate loads. If they are not invalidated by + // Loop over all of the candidate loads. If they are not invalidated by // stores or calls between execution of them and LI, then add them to // RetVals. for (unsigned i = 0, e = CandidateLoads.size(); i != e; ++i) Index: llvm/lib/Analysis/PostDominators.cpp diff -u llvm/lib/Analysis/PostDominators.cpp:1.41 llvm/lib/Analysis/PostDominators.cpp:1.42 --- llvm/lib/Analysis/PostDominators.cpp:1.41 Thu Sep 11 11:26:09 2003 +++ llvm/lib/Analysis/PostDominators.cpp Thu Sep 11 13:12:02 2003 @@ -181,7 +181,7 @@ if (BB) for (pred_iterator SI = pred_begin(BB), SE = pred_end(BB); SI != SE; ++SI) - // Does Node immediately dominate this predeccessor? + // Does Node immediately dominate this predecessor? if (DT[*SI]->getIDom() != Node) S.insert(*SI); Index: llvm/lib/Analysis/ValueNumbering.cpp diff -u llvm/lib/Analysis/ValueNumbering.cpp:1.4 llvm/lib/Analysis/ValueNumbering.cpp:1.5 --- llvm/lib/Analysis/ValueNumbering.cpp:1.4 Wed Oct 30 22:20:07 2002 +++ llvm/lib/Analysis/ValueNumbering.cpp Thu Sep 11 13:12:02 2003 @@ -100,7 +100,7 @@ // Check to see if this new cast is not I, but has the same operand... if (Other != &I && Other->getOpcode() == I.getOpcode() && Other->getOperand(0) == Op && // Is the operand the same? - // Is it embeded in the same function? (This could be false if LHS + // Is it embedded in the same function? (This could be false if LHS // is a constant or global!) Other->getParent()->getParent() == F && @@ -118,7 +118,7 @@ // static inline bool isIdenticalBinaryInst(const Instruction &I1, const Instruction *I2) { - // Is it embeded in the same function? (This could be false if LHS + // Is it embedded in the same function? (This could be false if LHS // is a constant or global!) if (I1.getOpcode() != I2->getOpcode() || I1.getParent()->getParent() != I2->getParent()->getParent()) From brukman at cs.uiuc.edu Thu Sep 11 13:13:15 2003 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Thu Sep 11 13:13:15 2003 Subject: [llvm-commits] CVS: llvm/lib/Analysis/DataStructure/DataStructure.cpp DataStructureAA.cpp Local.cpp Message-ID: <200309111812.NAA24314@zion.cs.uiuc.edu> Changes in directory llvm/lib/Analysis/DataStructure: DataStructure.cpp updated: 1.119 -> 1.120 DataStructureAA.cpp updated: 1.9 -> 1.10 Local.cpp updated: 1.60 -> 1.61 --- Log message: Fixed spelling and grammar. --- Diffs of the changes: Index: llvm/lib/Analysis/DataStructure/DataStructure.cpp diff -u llvm/lib/Analysis/DataStructure/DataStructure.cpp:1.119 llvm/lib/Analysis/DataStructure/DataStructure.cpp:1.120 --- llvm/lib/Analysis/DataStructure/DataStructure.cpp:1.119 Tue Aug 5 13:38:37 2003 +++ llvm/lib/Analysis/DataStructure/DataStructure.cpp Thu Sep 11 13:12:35 2003 @@ -960,7 +960,7 @@ } if (!(CloneFlags & DontCloneAuxCallNodes)) { - // Copy the auxillary function calls list... + // Copy the auxiliary function calls list... unsigned FC = AuxFunctionCalls.size(); // FirstCall AuxFunctionCalls.reserve(FC+G.AuxFunctionCalls.size()); for (unsigned i = 0, ei = G.AuxFunctionCalls.size(); i != ei; ++i) @@ -1062,7 +1062,7 @@ // Actually mark the node N->setIncompleteMarker(); - // Recusively process children... + // Recursively process children... for (unsigned i = 0, e = N->getSize(); i < e; i += DS::PointerSize) if (DSNode *DSN = N->getLink(i).getNode()) markIncompleteNode(DSN); @@ -1386,7 +1386,7 @@ // merging... removeTriviallyDeadNodes(); - // FIXME: Merge nontrivially identical call nodes... + // FIXME: Merge non-trivially identical call nodes... // Alive - a set that holds all nodes found to be reachable/alive. hash_set Alive; Index: llvm/lib/Analysis/DataStructure/DataStructureAA.cpp diff -u llvm/lib/Analysis/DataStructure/DataStructureAA.cpp:1.9 llvm/lib/Analysis/DataStructure/DataStructureAA.cpp:1.10 --- llvm/lib/Analysis/DataStructure/DataStructureAA.cpp:1.9 Wed Jul 2 18:56:51 2003 +++ llvm/lib/Analysis/DataStructure/DataStructureAA.cpp Thu Sep 11 13:12:35 2003 @@ -102,7 +102,7 @@ DSNode *N1 = I->second.getNode(), *N2 = J->second.getNode(); unsigned O1 = I->second.getOffset(), O2 = J->second.getOffset(); - // We can only make a judgement of one of the nodes is complete... + // We can only make a judgment of one of the nodes is complete... if (N1->isComplete() || N2->isComplete()) { if (N1 != N2) return NoAlias; // Completely different nodes. Index: llvm/lib/Analysis/DataStructure/Local.cpp diff -u llvm/lib/Analysis/DataStructure/Local.cpp:1.60 llvm/lib/Analysis/DataStructure/Local.cpp:1.61 --- llvm/lib/Analysis/DataStructure/Local.cpp:1.60 Fri Aug 1 17:14:28 2003 +++ llvm/lib/Analysis/DataStructure/Local.cpp Thu Sep 11 13:12:35 2003 @@ -347,7 +347,7 @@ unsigned RawOffset = Offset+Value.getOffset(); // Loop over all of the elements of the array, merging them into the - // zero'th element. + // zeroth element. for (unsigned i = 1, e = ATy->getNumElements(); i != e; ++i) // Merge all of the byte components of this array element for (unsigned j = 0; j != ElSize; ++j) From brukman at cs.uiuc.edu Thu Sep 11 13:15:03 2003 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Thu Sep 11 13:15:03 2003 Subject: [llvm-commits] CVS: llvm/lib/Analysis/LiveVar/FunctionLiveVarInfo.cpp Message-ID: <200309111814.NAA24352@zion.cs.uiuc.edu> Changes in directory llvm/lib/Analysis/LiveVar: FunctionLiveVarInfo.cpp updated: 1.46 -> 1.47 --- Log message: Fixed spelling and grammar. --- Diffs of the changes: Index: llvm/lib/Analysis/LiveVar/FunctionLiveVarInfo.cpp diff -u llvm/lib/Analysis/LiveVar/FunctionLiveVarInfo.cpp:1.46 llvm/lib/Analysis/LiveVar/FunctionLiveVarInfo.cpp:1.47 --- llvm/lib/Analysis/LiveVar/FunctionLiveVarInfo.cpp:1.46 Thu Aug 14 15:45:56 2003 +++ llvm/lib/Analysis/LiveVar/FunctionLiveVarInfo.cpp Thu Sep 11 13:13:57 2003 @@ -175,7 +175,7 @@ // Following functions will give the LiveVar info for any machine instr in // a function. It should be called after a call to analyze(). // -// Thsese functions calucluates live var info for all the machine instrs in a +// These functions calculate live var info for all the machine instrs in a // BB when LVInfo for one inst is requested. Hence, this function is useful // when live var info is required for many (or all) instructions in a basic // block. Also, the arguments to this function does not require specific @@ -217,7 +217,7 @@ // This function applies a machine instr to a live var set (accepts OutSet) and // makes necessary changes to it (produces InSet). Note that two for loops are // used to first kill all defs and then to add all uses. This is because there -// can be instructions like Val = Val + 1 since we allow multipe defs to a +// can be instructions like Val = Val + 1 since we allow multiple defs to a // machine instruction operand. // static void applyTranferFuncForMInst(ValueSet &LVS, const MachineInstr *MInst) { From brukman at cs.uiuc.edu Thu Sep 11 13:15:18 2003 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Thu Sep 11 13:15:18 2003 Subject: [llvm-commits] CVS: llvm/lib/Analysis/IPA/DependenceGraph.cpp IPModRef.cpp Message-ID: <200309111814.NAA24373@zion.cs.uiuc.edu> Changes in directory llvm/lib/Analysis/IPA: DependenceGraph.cpp updated: 1.2 -> 1.3 IPModRef.cpp updated: 1.15 -> 1.16 --- Log message: Fixed spelling and grammar. --- Diffs of the changes: Index: llvm/lib/Analysis/IPA/DependenceGraph.cpp diff -u llvm/lib/Analysis/IPA/DependenceGraph.cpp:1.2 llvm/lib/Analysis/IPA/DependenceGraph.cpp:1.3 --- llvm/lib/Analysis/IPA/DependenceGraph.cpp:1.2 Wed Dec 11 21:47:27 2002 +++ llvm/lib/Analysis/IPA/DependenceGraph.cpp Thu Sep 11 13:14:24 2003 @@ -1,6 +1,6 @@ //===- DependenceGraph.cpp - Dependence graph for a function ----*- C++ -*-===// // -// This file implments an explicit representation for the dependence graph +// This file implements an explicit representation for the dependence graph // of a function, with one node per instruction and one edge per dependence. // Dependences include both data and control dependences. // Index: llvm/lib/Analysis/IPA/IPModRef.cpp diff -u llvm/lib/Analysis/IPA/IPModRef.cpp:1.15 llvm/lib/Analysis/IPA/IPModRef.cpp:1.16 --- llvm/lib/Analysis/IPA/IPModRef.cpp:1.15 Sun Jun 29 22:14:54 2003 +++ llvm/lib/Analysis/IPA/IPModRef.cpp Thu Sep 11 13:14:24 2003 @@ -183,7 +183,7 @@ // Compute Mod/Ref bit vectors for a single call site. // These are copies of the Read/Write flags from the nodes of -// the graph produced by clearing all flags in teh caller's TD graph +// the graph produced by clearing all flags in the caller's TD graph // and then inlining the callee's BU graph into the caller's TD graph. // void From lattner at cs.uiuc.edu Thu Sep 11 14:04:03 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Thu Sep 11 14:04:03 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/SingleSource/UnitTests/Makefile Message-ID: <200309111903.OAA08175@apoc.cs.uiuc.edu> Changes in directory llvm/test/Programs/SingleSource/UnitTests: Makefile updated: 1.1 -> 1.2 --- Log message: fix filename --- Diffs of the changes: Index: llvm/test/Programs/SingleSource/UnitTests/Makefile diff -u llvm/test/Programs/SingleSource/UnitTests/Makefile:1.1 llvm/test/Programs/SingleSource/UnitTests/Makefile:1.2 --- llvm/test/Programs/SingleSource/UnitTests/Makefile:1.1 Wed Apr 17 12:45:21 2002 +++ llvm/test/Programs/SingleSource/UnitTests/Makefile Thu Sep 11 14:03:43 2003 @@ -1,4 +1,4 @@ -# Programs/SingleSource/Misc/Makefile +# Programs/SingleSource/UnitTests/Makefile LEVEL = ../../../.. include ../Makefile.singlesrc From lattner at cs.uiuc.edu Thu Sep 11 14:05:04 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Thu Sep 11 14:05:04 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/SingleSource/UnitTests/SetjmpLongjmp/ Message-ID: <200309111904.OAA08294@apoc.cs.uiuc.edu> Changes in directory llvm/test/Programs/SingleSource/UnitTests/SetjmpLongjmp: --- Log message: Directory /home/vadve/vadve/Research/DynOpt/CVSRepository/llvm/test/Programs/SingleSource/UnitTests/SetjmpLongjmp added to the repository --- Diffs of the changes: From lattner at cs.uiuc.edu Thu Sep 11 14:07:03 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Thu Sep 11 14:07:03 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/SingleSource/UnitTests/SetjmpLongjmp/FarJump.c Looping.c Makefile MultipleSetjmp.c SimpleC++Test.cpp SimpleCTest.c WhileLoop.c Message-ID: <200309111906.OAA09037@apoc.cs.uiuc.edu> Changes in directory llvm/test/Programs/SingleSource/UnitTests/SetjmpLongjmp: FarJump.c added (r1.1) Looping.c added (r1.1) Makefile added (r1.1) MultipleSetjmp.c added (r1.1) SimpleC++Test.cpp added (r1.1) SimpleCTest.c added (r1.1) WhileLoop.c added (r1.1) --- Log message: Testcases for setjmp/longjmp support --- Diffs of the changes: Index: llvm/test/Programs/SingleSource/UnitTests/SetjmpLongjmp/FarJump.c diff -c /dev/null llvm/test/Programs/SingleSource/UnitTests/SetjmpLongjmp/FarJump.c:1.1 *** /dev/null Thu Sep 11 14:06:53 2003 --- llvm/test/Programs/SingleSource/UnitTests/SetjmpLongjmp/FarJump.c Thu Sep 11 14:06:43 2003 *************** *** 0 **** --- 1,61 ---- + /* + * This tests that longjmp can jump from a function far down in the + * calling chain and past other, non-accepting setjmps. + */ + #include + #include + + void quux(jmp_buf buf) + { + printf("Inside quux\n"); + printf("Longjmping from quux: 927\n"); + longjmp(buf, 927); + } + + void qux(jmp_buf buf) + { + jmp_buf local_buf; + + printf("Inside qux\n"); + + if (!setjmp(local_buf)) + quux(buf); + else + printf("Error: Shouldn't be here in qux\n"); + } + + void baz(jmp_buf buf) + { + jmp_buf local_buf; + + printf("Inside baz\n"); + + if (!setjmp(local_buf)) + qux(buf); + else + printf("Error: Shouldn't be here in baz\n"); + } + + void bar(jmp_buf buf) + { + printf("Inside bar\n"); + baz(buf); + } + + void foo() + { + jmp_buf buf; + + printf("Inside foo\n"); + + if (!setjmp(buf)) + bar(buf); + else + printf("Returning from longjmp into foo\n"); + } + + int main() + { + foo(); + return 0; + } Index: llvm/test/Programs/SingleSource/UnitTests/SetjmpLongjmp/Looping.c diff -c /dev/null llvm/test/Programs/SingleSource/UnitTests/SetjmpLongjmp/Looping.c:1.1 *** /dev/null Thu Sep 11 14:06:53 2003 --- llvm/test/Programs/SingleSource/UnitTests/SetjmpLongjmp/Looping.c Thu Sep 11 14:06:43 2003 *************** *** 0 **** --- 1,15 ---- + #include + #include + + int main() + { + jmp_buf buf; + unsigned i = 0; + + if (setjmp(buf) < 10) { + printf("i == %u\n", i); + longjmp(buf, ++i); + } + + return 0; + } Index: llvm/test/Programs/SingleSource/UnitTests/SetjmpLongjmp/Makefile diff -c /dev/null llvm/test/Programs/SingleSource/UnitTests/SetjmpLongjmp/Makefile:1.1 *** /dev/null Thu Sep 11 14:06:53 2003 --- llvm/test/Programs/SingleSource/UnitTests/SetjmpLongjmp/Makefile Thu Sep 11 14:06:43 2003 *************** *** 0 **** --- 1,5 ---- + # Programs/SingleSource/UnitTests/SetjmpLongjmp/Makefile + + LEVEL = ../../../../.. + include $(LEVEL)/test/Programs/SingleSource/Makefile.singlesrc + Index: llvm/test/Programs/SingleSource/UnitTests/SetjmpLongjmp/MultipleSetjmp.c diff -c /dev/null llvm/test/Programs/SingleSource/UnitTests/SetjmpLongjmp/MultipleSetjmp.c:1.1 *** /dev/null Thu Sep 11 14:06:53 2003 --- llvm/test/Programs/SingleSource/UnitTests/SetjmpLongjmp/MultipleSetjmp.c Thu Sep 11 14:06:43 2003 *************** *** 0 **** --- 1,26 ---- + #include + #include + + int bar(jmp_buf buf, int i) + { + printf("Inside bar %d\n", i); + longjmp(buf, i); + } + + int main() + { + jmp_buf buf; + int ret; + + if ((ret = setjmp(buf)) != 0) { + printf("returning from bar == %d\n", ret); + + if ((ret = setjmp(buf)) != 0) { + printf("returning from bar == %d\n", ret); + } else { + bar(buf, 927); + } + } else { + bar(buf, 37); + } + } Index: llvm/test/Programs/SingleSource/UnitTests/SetjmpLongjmp/SimpleC++Test.cpp diff -c /dev/null llvm/test/Programs/SingleSource/UnitTests/SetjmpLongjmp/SimpleC++Test.cpp:1.1 *** /dev/null Thu Sep 11 14:06:53 2003 --- llvm/test/Programs/SingleSource/UnitTests/SetjmpLongjmp/SimpleC++Test.cpp Thu Sep 11 14:06:43 2003 *************** *** 0 **** --- 1,36 ---- + #include + #include + + class C { + const char *name; + public: + C(const char *n) : name(n) {} + ~C() { printf("Destroying C object in %s\n", name); } + }; + + void bar(jmp_buf buf) + { + printf("Inside bar\n"); + longjmp(buf, 37); + } + + void foo(jmp_buf buf) + { + C Obj("foo"); + bar(buf); + } + + int main() + { + C Obj("main"); + jmp_buf buf; + int ret; + + printf("Inside main\n"); + + if ((ret = setjmp(buf)) != 0) { + printf("ret == %d\n", ret); + } else { + foo(buf); + } + } Index: llvm/test/Programs/SingleSource/UnitTests/SetjmpLongjmp/SimpleCTest.c diff -c /dev/null llvm/test/Programs/SingleSource/UnitTests/SetjmpLongjmp/SimpleCTest.c:1.1 *** /dev/null Thu Sep 11 14:06:53 2003 --- llvm/test/Programs/SingleSource/UnitTests/SetjmpLongjmp/SimpleCTest.c Thu Sep 11 14:06:43 2003 *************** *** 0 **** --- 1,23 ---- + #include + + void baz(jmp_buf buf) + { + printf("Inside baz\n"); + longjmp(buf, 37); + } + + int main() + { + jmp_buf buf; + int ret; + + printf("Inside main\n"); + + if ((ret = setjmp(buf)) != 0) { + printf("ret == %d\n", ret); + } else { + baz(buf); + } + + return 0; + } Index: llvm/test/Programs/SingleSource/UnitTests/SetjmpLongjmp/WhileLoop.c diff -c /dev/null llvm/test/Programs/SingleSource/UnitTests/SetjmpLongjmp/WhileLoop.c:1.1 *** /dev/null Thu Sep 11 14:06:53 2003 --- llvm/test/Programs/SingleSource/UnitTests/SetjmpLongjmp/WhileLoop.c Thu Sep 11 14:06:43 2003 *************** *** 0 **** --- 1,24 ---- + #include + #include + + void foo(jmp_buf buf, int i) + { + printf("Inside foo: %d\n", i); + longjmp(buf, i); + } + + int main() + { + int i = 37; + + while (i--) { + jmp_buf buf; + int ret; + + if ((ret = setjmp(buf)) != 0) { + printf("Return from longjmp: %d\n", ret); + } else { + foo(buf, i); + } + } + } From lattner at cs.uiuc.edu Thu Sep 11 14:08:04 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Thu Sep 11 14:08:04 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/SingleSource/UnitTests/Makefile Message-ID: <200309111907.OAA09048@apoc.cs.uiuc.edu> Changes in directory llvm/test/Programs/SingleSource/UnitTests: Makefile updated: 1.2 -> 1.3 --- Log message: Run the sjlj tests --- Diffs of the changes: Index: llvm/test/Programs/SingleSource/UnitTests/Makefile diff -u llvm/test/Programs/SingleSource/UnitTests/Makefile:1.2 llvm/test/Programs/SingleSource/UnitTests/Makefile:1.3 --- llvm/test/Programs/SingleSource/UnitTests/Makefile:1.2 Thu Sep 11 14:03:43 2003 +++ llvm/test/Programs/SingleSource/UnitTests/Makefile Thu Sep 11 14:06:59 2003 @@ -1,5 +1,6 @@ # Programs/SingleSource/UnitTests/Makefile +DIRS = SetjmpLongjmp LEVEL = ../../../.. include ../Makefile.singlesrc From lattner at cs.uiuc.edu Thu Sep 11 14:30:02 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Thu Sep 11 14:30:02 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/SingleSource/UnitTests/SetjmpLongjmp/Makefile Message-ID: <200309111929.OAA09232@apoc.cs.uiuc.edu> Changes in directory llvm/test/Programs/SingleSource/UnitTests/SetjmpLongjmp: Makefile updated: 1.1 -> 1.2 --- Log message: As a temporary hack, explicitly link in libexception.a --- Diffs of the changes: Index: llvm/test/Programs/SingleSource/UnitTests/SetjmpLongjmp/Makefile diff -u llvm/test/Programs/SingleSource/UnitTests/SetjmpLongjmp/Makefile:1.1 llvm/test/Programs/SingleSource/UnitTests/SetjmpLongjmp/Makefile:1.2 --- llvm/test/Programs/SingleSource/UnitTests/SetjmpLongjmp/Makefile:1.1 Thu Sep 11 14:06:43 2003 +++ llvm/test/Programs/SingleSource/UnitTests/SetjmpLongjmp/Makefile Thu Sep 11 14:29:03 2003 @@ -1,5 +1,7 @@ # Programs/SingleSource/UnitTests/SetjmpLongjmp/Makefile LEVEL = ../../../../.. +LIBS += -lexception include $(LEVEL)/test/Programs/SingleSource/Makefile.singlesrc + From criswell at cs.uiuc.edu Thu Sep 11 14:58:02 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Thu Sep 11 14:58:02 2003 Subject: [llvm-commits] CVS: llvm/www/docs/CommandGuide/ Message-ID: <200309111957.OAA09480@tank.cs.uiuc.edu> Changes in directory llvm/www/docs/CommandGuide: --- Log message: Directory /home/vadve/vadve/Research/DynOpt/CVSRepository/llvm/www/docs/CommandGuide added to the repository --- Diffs of the changes: From criswell at cs.uiuc.edu Thu Sep 11 14:59:02 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Thu Sep 11 14:59:02 2003 Subject: [llvm-commits] CVS: llvm/www/docs/CommandGuide/analyze.html gccas.html gccld.html index.html lli.html llvmas.html llvmdis.html opt.html Message-ID: <200309111958.OAA09605@tank.cs.uiuc.edu> Changes in directory llvm/www/docs/CommandGuide: analyze.html added (r1.1) gccas.html added (r1.1) gccld.html added (r1.1) index.html added (r1.1) lli.html added (r1.1) llvmas.html added (r1.1) llvmdis.html added (r1.1) opt.html added (r1.1) --- Log message: Adding a skeleton for the LLVM Command Guide. Hopefully the group as a whole will update this into a real guide. --- Diffs of the changes: Index: llvm/www/docs/CommandGuide/analyze.html diff -c /dev/null llvm/www/docs/CommandGuide/analyze.html:1.1 *** /dev/null Thu Sep 11 14:58:15 2003 --- llvm/www/docs/CommandGuide/analyze.html Thu Sep 11 14:58:02 2003 *************** *** 0 **** --- 1,87 ---- + + + analyze + + + + +
+

Low Level Virtual Machine

+
+
+ +

+ NAME +

+ + analyze + +

+ SYNOPSIS +

+ + analyze [options] < filename> +

+ DESCRIPTION +

+ + The analyze command performs various analysis of LLVM bytecode. It will + usually print the results on standard output, but in a few cases it will print + output to standard error or generate a file with the analysis output (which is + usually done when generating output for another program). +

+ OPTIONS +

+ +
    +
  • -help +
    + Print a summary of command line options. +

    + +

  • -stats +
    + Print statistics. +

    + +

  • -time-passes +
    + Record the amount of time needed for each pass and print it to standard + error. +

    + +

  • -q +
    + Quiet mode. With this option, analysis pass names are not printed. +

    + +

  • -load <plugin.so> +
    + Load the specified dynamic object with name plugin.so. This file + should contain additional analysis passes that register themselves with + the analyze program after being loaded. +

    + After being loaded, additional command line options are made available + for running additional analysis passes. Use analyse -load + <plugin.so> -help to list the new list of available analysis + passes. +

    +

+ +

+ EXIT STATUS +

+ + If analyze succeeds, it will exit with 0. Otherwise, if an error occurs, it + will exit with a non-zero value. + +

+ SEE ALSO +

+ opt + +
+ University of Illinois at Urbana-Champaign + + + Index: llvm/www/docs/CommandGuide/gccas.html diff -c /dev/null llvm/www/docs/CommandGuide/gccas.html:1.1 *** /dev/null Thu Sep 11 14:58:15 2003 --- llvm/www/docs/CommandGuide/gccas.html Thu Sep 11 14:58:02 2003 *************** *** 0 **** --- 1,81 ---- + + + gccas + + + + +
+

Low Level Virtual Machine

+
+
+ +

+ NAME +

+ + gccas + +

+ SYNOPSIS +

+ + gccas [options] < filename> +

+ DESCRIPTION +

+ + The gccas utility takes an LLVM assembly file generated by GCC and converts it + into an LLVM bytecode file. It is primarily used by the GCC front end, and as + such, attempts to mimic the interface provided by the default system assembler + so that it can act as a "drop-in" replacement. + +

+ OPTIONS +

+ +
    +
  • -help +
    + Print a summary of command line options. +

    + +

  • -o <filename> +
    + Specify the output filename which will hold the assembled bytecode. +

    + +

  • -stats +
    + Print statistics. +

    + +

  • -time-passes +
    + Record the amount of time needed for each pass and print it to standard + error. +

    + +

  • -verify +
    + Verify each pass result. +

    +

+ +

+ EXIT STATUS +

+ + If gccas succeeds, it will exit with 0. Otherwise, if an error occurs, it + will exit with a non-zero value. + +

+ SEE ALSO +

+ llvm-dis + +
+ University of Illinois at Urbana-Champaign + + + Index: llvm/www/docs/CommandGuide/gccld.html diff -c /dev/null llvm/www/docs/CommandGuide/gccld.html:1.1 *** /dev/null Thu Sep 11 14:58:16 2003 --- llvm/www/docs/CommandGuide/gccld.html Thu Sep 11 14:58:02 2003 *************** *** 0 **** --- 1,124 ---- + + + gccld + + + + +
+

Low Level Virtual Machine

+
+
+ +

+ NAME +

+ + gccld + +

+ SYNOPSIS +

+ + gccld [options] < filename> +

+ DESCRIPTION +

+ + The gccld utility takes a set of LLVM bytecode files GCC and links them + together into a single LLVM bytecode file. It will link in any LLVM bytecode + libraries that are necessary to make a single LLVM "bytecode executable." +

+ The gccld utility is primarily used by the GCC front end, and as such, attempts + to mimic the interface provided by the default system linker so that it can act + as a "drop-in" replacement. + +

+ OPTIONS +

+ +
    +
  • -help +
    + Print a summary of command line options. +

    + +

  • -o <filename> +
    + Specify the output filename which will hold the assembled bytecode. +

    + +

  • -stats +
    + Print statistics. +

    + +

  • -time-passes +
    + Record the amount of time needed for each pass and print it to standard + error. +

    + +

  • -verify +
    + Verify each pass result. +

    + +

  • -L=<directory> +
    + Add directory to the list of directories to search when looking for + libraries. +

    + +

  • -disable-internalize +
    + Do not mark all symbols as internal. +

    + +

  • -internalize-public-api-file <filename> +
    + Preserve the list of symbol names in the file filename. +

    + +

  • -internalize-public-api-list <list> +
    + Preserve the symbol names in list. +

    + +

  • -l=<library prefix> +
    + Specify libraries to link to +

    + +

  • -link-as-library +
    + Link the .bc files together as a library, not an executable. +

    + +

  • -s +
    + Strip symbol information from the generated executable. +

    + +

  • -v +
    + Print information about actions taken. +
+ +

+ EXIT STATUS +

+ + If gccld succeeds, it will exit with 0. Otherwise, if an error occurs, it + will exit with a non-zero value. + +

+ SEE ALSO +

+ llvm-dis + +
+ University of Illinois at Urbana-Champaign + + + Index: llvm/www/docs/CommandGuide/index.html diff -c /dev/null llvm/www/docs/CommandGuide/index.html:1.1 *** /dev/null Thu Sep 11 14:58:16 2003 --- llvm/www/docs/CommandGuide/index.html Thu Sep 11 14:58:03 2003 *************** *** 0 **** --- 1,85 ---- + + + + LLVM Command Guide + + + + +

LLVM Command Guide

+ + +

Overview

+ + + This document is the reference manual for the LLVM utilities. It will + show you how to use the LLVM commands and what all of their options + are. + + +

LLVM Commands

+ + +
+
bugpoint +
+ Trace an LLVM bytecode program and reduce its failure to a + simple testcase. +

+ +

as +
llvm-as +
+ Assemble a human-readable LLVM program into LLVM bytecode. +

+ +

dis +
llvm-dis +
+ Disassemble an LLVM bytecode file into human-readable form. +

+ +

extract +
+ Extract a function from an LLVM bytecode file. +

+ +

analyze +
+ Analyze an LLVM bytecode file. +

+ +

opt +
+ Optimize an LLVM bytecode file. +

+ +

link +
+ Link several LLVM bytecode files together into one LLVM + bytecode file. +

+ +

gccas +
+ LLVM assembler used by GCC and other native compiler tools. +

+ +

gccld +
+ LLVM linker used by GCC and other native compiler tools. +

+ +

llc +
+ Compile an LLVM bytecode program into native machine code. + +
lli +
+ Run an LLVM bytecode program using either an interpreter or a + JIT compiler. +

+

+ + + Index: llvm/www/docs/CommandGuide/lli.html diff -c /dev/null llvm/www/docs/CommandGuide/lli.html:1.1 *** /dev/null Thu Sep 11 14:58:16 2003 --- llvm/www/docs/CommandGuide/lli.html Thu Sep 11 14:58:03 2003 *************** *** 0 **** --- 1,80 ---- + + + lli + + + + +
+

Low Level Virtual Machine

+
+
+ +

+ NAME +

+ + lli + +

+ SYNOPSIS +

+ + lli [options] < filename> +

+ DESCRIPTION +

+ + The lli command is the LLVM interpreter. It takes a program in LLVM bytecode + format and executes it, either using an interpreter or a Just In Time (JIT) + compiler. + +

+ OPTIONS +

+ +
    +
  • -array-checks +
    + Enable array bound checks. +

    + +

  • -help +
    + Print a summary of command line options. +

    + +

  • -disable-fp-elim +
    + Disable frame pointer elimination optimization. +

    + +

  • -stats +
    + Print statistics. +

    + +

  • -time-passes +
    + Record the amount of time needed for each pass and print it to standard + error. +

    +

+ +

+ EXIT STATUS +

+ + If lli succeeds, it will exit with 0. Otherwise, if an error occurs, it + will exit with a non-zero value. + +

+ SEE ALSO +

+ llvm-dis + +
+ University of Illinois at Urbana-Champaign + + + Index: llvm/www/docs/CommandGuide/llvmas.html diff -c /dev/null llvm/www/docs/CommandGuide/llvmas.html:1.1 *** /dev/null Thu Sep 11 14:58:16 2003 --- llvm/www/docs/CommandGuide/llvmas.html Thu Sep 11 14:58:03 2003 *************** *** 0 **** --- 1,83 ---- + + + llvm-as + + + + +
+

Low Level Virtual Machine

+
+
+ +

+ NAME +

+ + llvm-as + +

+ SYNOPSIS +

+ + llvm-as [options] < filename> +

+ DESCRIPTION +

+ + The llvm-as command is the LLVM assembler. It takes a human readable LLVM + assembly language file and translates it into LLVM bytecode. + + By default, llvm-as places its output into filename.bc. + +

+ OPTIONS +

+ +
    +
  • -f +
    + Force overwrite. Normally, llvm-as will refuse to overwrite an output + file that already exists. With this option, llvm-as will overwrite the + output file and replace it with new bytecode. +

    + +

  • -help +
    + Print a summary of command line options. +

    + +

  • -o <filename> +
    + Specify the output filename. +

    + +

  • -stats +
    + Print statistics. +

    + +

  • -time-passes +
    + Record the amount of time needed for each pass and print it to standard + error. +

    +

+ +

+ EXIT STATUS +

+ + If llvm-as succeeds, it will exit with 0. Otherwise, if an error occurs, it + will exit with a non-zero value. + +

+ SEE ALSO +

+ llvm-dis + +
+ University of Illinois at Urbana-Champaign + + + Index: llvm/www/docs/CommandGuide/llvmdis.html diff -c /dev/null llvm/www/docs/CommandGuide/llvmdis.html:1.1 *** /dev/null Thu Sep 11 14:58:16 2003 --- llvm/www/docs/CommandGuide/llvmdis.html Thu Sep 11 14:58:03 2003 *************** *** 0 **** --- 1,89 ---- + + + llvm-dis + + + + +
+

Low Level Virtual Machine

+
+
+ +

+ NAME +

+ + llvm-dis + +

+ SYNOPSIS +

+ + llvm-dis [options] < filename> +

+ DESCRIPTION +

+ + The llvm-dis command is the LLVM disassembler. It takes an LLVM bytecode file + and converts it into one of several human readable formats. + + By default, llvm-dis places its output in filename.ll, removing the .bc suffix + if it exists. +

+ OPTIONS +

+ +
    +
  • -llvm +
    + Instruct llvm-dis to generate LLVM assembly code in human readable + format. This is the default behavior. +

    + +

  • -c +
    + Instruct llvm-dis to generate C source code. +

    + +

  • -f +
    + Force overwrite. Normally, llvm-dis will refuse to overwrite an output + file that already exists. With this option, llvm-dis will overwrite the + output file. +

    + +

  • -help +
    + Print a summary of command line options. +

    + +

  • -o <filename> +
    + Specify the output filename. +

    + +

  • -time-pdisses +
    + Record the amount of time needed for each pdiss and print it to standard + error. +

    +

+ +

+ EXIT STATUS +

+ + If llvm-dis succeeds, it will exit with 0. Otherwise, if an error occurs, it + will exit with a non-zero value. + +

+ SEE ALSO +

+ llvm-dis + +
+ University of Illinois at Urbana-Champaign + + + Index: llvm/www/docs/CommandGuide/opt.html diff -c /dev/null llvm/www/docs/CommandGuide/opt.html:1.1 *** /dev/null Thu Sep 11 14:58:16 2003 --- llvm/www/docs/CommandGuide/opt.html Thu Sep 11 14:58:03 2003 *************** *** 0 **** --- 1,116 ---- + + + opt + + + + +
+

Low Level Virtual Machine

+
+
+ +

+ NAME +

+ + opt + +

+ SYNOPSIS +

+ + opt [options] < filename> +

+ DESCRIPTION +

+ + The opt command is the LLVM optimizer. It takes LLVM bytecode as input, runs + the specified optimizations on it, and then outputs the optimized code in LLVM + bytecode. + + The optimizations available via opt depend upon what libraries it was linked + with, as well as any additional libraries that have been loaded with the -load + option. Use the -help option to determine what optimizations you can use. + +

+ OPTIONS +

+ +
    +
  • -f +
    + Force overwrite. Normally, opt will refuse to overwrite an output + file that already exists. With this option, opt will overwrite the + output file and replace it with new bytecode. +

    + +

  • -help +
    + Print a summary of command line options. +

    + +

  • -o <filename> +
    + Specify the output filename. +

    + +

  • -stats +
    + Print statistics. +

    + +

  • -time-passes +
    + Record the amount of time needed for each pass and print it to standard + error. +

    + +

  • -internalize-public-api-file <filename> +
    + Preserve the symbol names listed in the file filename. +

    + +

  • -internalize-public-api-list=<list> +
    + Perserve the symbol names specified. +

    + +

  • -q +
    + Quiet mode. Do not print messages on whether the program was modified. +

    + +

  • -load <plugin.so> +
    + Load the dynamic object plugin.so. This object should register new + optimization passes. Once loaded, the object will add new command line + options to enable various optimizations. To see the new complete list + of optimizations, use the -help and -load options together: +

    + opt -load <plugin.so> -help +

    + +

  • -p +
    + Print module after each transformation. +

    +

+ +

+ EXIT STATUS +

+ + If opt succeeds, it will exit with 0. Otherwise, if an error occurs, it + will exit with a non-zero value. + +

+ SEE ALSO +

+ analyze + +
+ University of Illinois at Urbana-Champaign + + + From criswell at cs.uiuc.edu Thu Sep 11 15:13:04 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Thu Sep 11 15:13:04 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Burg/Makefile Message-ID: <200309112012.PAA27231@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/MultiSource/Burg: Makefile updated: 1.7 -> 1.8 --- Log message: Allow VPATH to figure out where the prereqs and targets are located. --- Diffs of the changes: Index: llvm/test/Programs/MultiSource/Burg/Makefile diff -u llvm/test/Programs/MultiSource/Burg/Makefile:1.7 llvm/test/Programs/MultiSource/Burg/Makefile:1.8 --- llvm/test/Programs/MultiSource/Burg/Makefile:1.7 Sat Sep 6 10:13:12 2003 +++ llvm/test/Programs/MultiSource/Burg/Makefile Thu Sep 11 15:11:59 2003 @@ -22,13 +22,13 @@ # seems to work. Ideally, these yacc rules should be in a master rule # file for the test suite, separate from the LLVM build rules. # -y.tab.h:: $(SourceDir)/gram.y +y.tab.h:: gram.y yacc -d $< -y.tab.c: $(SourceDir)/gram.y +y.tab.c: gram.y yacc -d $< -$(SourceDir)/lex.c: y.tab.h +lex.c: y.tab.h src: echo Sources = $(Source) From criswell at cs.uiuc.edu Thu Sep 11 15:25:02 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Thu Sep 11 15:25:02 2003 Subject: [llvm-commits] CVS: llvm/www/docs/CommandGuide/analyze.html gccas.html gccld.html index.html lli.html llvmas.html llvmdis.html opt.html Message-ID: <200309112024.PAA14284@tank.cs.uiuc.edu> Changes in directory llvm/www/docs/CommandGuide: analyze.html updated: 1.1 -> 1.2 gccas.html updated: 1.1 -> 1.2 gccld.html updated: 1.1 -> 1.2 index.html updated: 1.1 -> 1.2 lli.html updated: 1.1 -> 1.2 llvmas.html updated: 1.1 -> 1.2 llvmdis.html updated: 1.1 -> 1.2 opt.html updated: 1.1 -> 1.2 --- Log message: Modified the footer to be a link to the LLVM web page. Organized the commands into three distinct groups on the main page. Fixed the hyperlinks in the main page. Removed as and dis; they will not exist with those names by Release 1. --- Diffs of the changes: Index: llvm/www/docs/CommandGuide/analyze.html diff -u llvm/www/docs/CommandGuide/analyze.html:1.1 llvm/www/docs/CommandGuide/analyze.html:1.2 --- llvm/www/docs/CommandGuide/analyze.html:1.1 Thu Sep 11 14:58:02 2003 +++ llvm/www/docs/CommandGuide/analyze.html Thu Sep 11 15:23:50 2003 @@ -81,7 +81,7 @@ opt
-University of Illinois at Urbana-Champaign +LLVM Team Index: llvm/www/docs/CommandGuide/gccas.html diff -u llvm/www/docs/CommandGuide/gccas.html:1.1 llvm/www/docs/CommandGuide/gccas.html:1.2 --- llvm/www/docs/CommandGuide/gccas.html:1.1 Thu Sep 11 14:58:02 2003 +++ llvm/www/docs/CommandGuide/gccas.html Thu Sep 11 15:23:51 2003 @@ -75,7 +75,7 @@ llvm-dis
-University of Illinois at Urbana-Champaign +LLVM Team Index: llvm/www/docs/CommandGuide/gccld.html diff -u llvm/www/docs/CommandGuide/gccld.html:1.1 llvm/www/docs/CommandGuide/gccld.html:1.2 --- llvm/www/docs/CommandGuide/gccld.html:1.1 Thu Sep 11 14:58:02 2003 +++ llvm/www/docs/CommandGuide/gccld.html Thu Sep 11 15:23:51 2003 @@ -118,7 +118,7 @@ llvm-dis
-University of Illinois at Urbana-Champaign +LLVM Team Index: llvm/www/docs/CommandGuide/index.html diff -u llvm/www/docs/CommandGuide/index.html:1.1 llvm/www/docs/CommandGuide/index.html:1.2 --- llvm/www/docs/CommandGuide/index.html:1.1 Thu Sep 11 14:58:03 2003 +++ llvm/www/docs/CommandGuide/index.html Thu Sep 11 15:23:51 2003 @@ -17,68 +17,76 @@ are. -

LLVM Commands

+

LLVM Base Commands

-
bugpoint -
- Trace an LLVM bytecode program and reduce its failure to a - simple testcase. -

- -

as -
llvm-as +
llvm-as
Assemble a human-readable LLVM program into LLVM bytecode.

-

dis -
llvm-dis +
llvm-dis
Disassemble an LLVM bytecode file into human-readable form.

-

extract -
- Extract a function from an LLVM bytecode file. -

- -

analyze +
analyze
Analyze an LLVM bytecode file.

-

opt +
opt
Optimize an LLVM bytecode file.

-

link +
link
Link several LLVM bytecode files together into one LLVM bytecode file.

-

gccas +
llc
- LLVM assembler used by GCC and other native compiler tools. + Compile an LLVM bytecode program into native machine code. + +
lli +
+ Run an LLVM bytecode program using either an interpreter or a + JIT compiler.

+

+ + +

LLVM Debugging Tools

+ -
gccld +
+
bugpoint
- LLVM linker used by GCC and other native compiler tools. + Trace an LLVM bytecode program and reduce its failure to a + simple testcase.

-

llc +
extract
- Compile an LLVM bytecode program into native machine code. + Extract a function from an LLVM bytecode file. +
-
lli + +

LLVM GCC Support Commands

+ + +
+
gccas
- Run an LLVM bytecode program using either an interpreter or a - JIT compiler. + LLVM assembler used by GCC and other native compiler tools.

+ +

gccld +
+ LLVM linker used by GCC and other native compiler tools.
Index: llvm/www/docs/CommandGuide/lli.html diff -u llvm/www/docs/CommandGuide/lli.html:1.1 llvm/www/docs/CommandGuide/lli.html:1.2 --- llvm/www/docs/CommandGuide/lli.html:1.1 Thu Sep 11 14:58:03 2003 +++ llvm/www/docs/CommandGuide/lli.html Thu Sep 11 15:23:51 2003 @@ -74,7 +74,7 @@ llvm-dis
-University of Illinois at Urbana-Champaign +LLVM Team Index: llvm/www/docs/CommandGuide/llvmas.html diff -u llvm/www/docs/CommandGuide/llvmas.html:1.1 llvm/www/docs/CommandGuide/llvmas.html:1.2 --- llvm/www/docs/CommandGuide/llvmas.html:1.1 Thu Sep 11 14:58:03 2003 +++ llvm/www/docs/CommandGuide/llvmas.html Thu Sep 11 15:23:51 2003 @@ -77,7 +77,7 @@ llvm-dis
-University of Illinois at Urbana-Champaign +LLVM Team Index: llvm/www/docs/CommandGuide/llvmdis.html diff -u llvm/www/docs/CommandGuide/llvmdis.html:1.1 llvm/www/docs/CommandGuide/llvmdis.html:1.2 --- llvm/www/docs/CommandGuide/llvmdis.html:1.1 Thu Sep 11 14:58:03 2003 +++ llvm/www/docs/CommandGuide/llvmdis.html Thu Sep 11 15:23:52 2003 @@ -83,7 +83,7 @@ llvm-dis
-University of Illinois at Urbana-Champaign +LLVM Team Index: llvm/www/docs/CommandGuide/opt.html diff -u llvm/www/docs/CommandGuide/opt.html:1.1 llvm/www/docs/CommandGuide/opt.html:1.2 --- llvm/www/docs/CommandGuide/opt.html:1.1 Thu Sep 11 14:58:03 2003 +++ llvm/www/docs/CommandGuide/opt.html Thu Sep 11 15:23:52 2003 @@ -110,7 +110,7 @@ analyze
-University of Illinois at Urbana-Champaign +LLVM Team From lattner at cs.uiuc.edu Thu Sep 11 15:45:02 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Thu Sep 11 15:45:02 2003 Subject: [llvm-commits] CVS: llvm/www/pubs/2002-08-09-LLVMCompilationStrategy.html Message-ID: <200309112044.PAA18049@tank.cs.uiuc.edu> Changes in directory llvm/www/pubs: 2002-08-09-LLVMCompilationStrategy.html updated: 1.3 -> 1.4 --- Log message: Add a note --- Diffs of the changes: Index: llvm/www/pubs/2002-08-09-LLVMCompilationStrategy.html diff -u llvm/www/pubs/2002-08-09-LLVMCompilationStrategy.html:1.3 llvm/www/pubs/2002-08-09-LLVMCompilationStrategy.html:1.4 --- llvm/www/pubs/2002-08-09-LLVMCompilationStrategy.html:1.3 Fri Jun 20 18:46:07 2003 +++ llvm/www/pubs/2002-08-09-LLVMCompilationStrategy.html Thu Sep 11 15:44:40 2003 @@ -56,6 +56,12 @@

Bibtex Entry:

+ +NOTE: This document has been superseded by LLVM: An Infrastructure for Multi-Stage +Optimization. If you want to cite a paper about LLVM, please cite it +instead.

+

   @TechReport{LattnerAdve:LLVM:ISCS,
     Author      = {Chris Lattner and Vikram Adve},




From criswell at cs.uiuc.edu  Thu Sep 11 15:55:11 2003
From: criswell at cs.uiuc.edu (John Criswell)
Date: Thu Sep 11 15:55:11 2003
Subject: [llvm-commits] CVS: llvm/configure
Message-ID: <200309112053.PAA07087@choi.cs.uiuc.edu>


Changes in directory llvm:

configure updated: 1.18 -> 1.19

---
Log message:

Added the SetjmpLongjmp Makefile.



---
Diffs of the changes:

Index: llvm/configure
diff -u llvm/configure:1.18 llvm/configure:1.19
--- llvm/configure:1.18	Thu Sep 11 13:03:50 2003
+++ llvm/configure	Thu Sep 11 15:53:46 2003
@@ -1931,6 +1931,9 @@
           ac_config_commands="$ac_config_commands test/Programs/SingleSource/UnitTests/Makefile"
 
 
+          ac_config_commands="$ac_config_commands test/Programs/SingleSource/UnitTests/SetjmpLongjmp/Makefile"
+
+
           ac_config_commands="$ac_config_commands tools/Makefile"
 
 
@@ -4374,7 +4377,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 4377 "configure"' > conftest.$ac_ext
+  echo '#line 4380 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -5215,7 +5218,7 @@
 
 
 # Provide some information about the compiler.
-echo "$as_me:5218:" \
+echo "$as_me:5221:" \
      "checking for Fortran 77 compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
 { (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5
@@ -6224,11 +6227,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6227: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6230: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:6231: \$? = $ac_status" >&5
+   echo "$as_me:6234: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -6456,11 +6459,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6459: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6462: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:6463: \$? = $ac_status" >&5
+   echo "$as_me:6466: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -6523,11 +6526,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6526: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6529: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:6530: \$? = $ac_status" >&5
+   echo "$as_me:6533: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -8535,7 +8538,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext < conftest.$ac_ext <&5)
+   (eval echo "\"\$as_me:10775: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:10776: \$? = $ac_status" >&5
+   echo "$as_me:10779: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -10836,11 +10839,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10839: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10842: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:10843: \$? = $ac_status" >&5
+   echo "$as_me:10846: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -12079,7 +12082,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext < conftest.$ac_ext <&5)
+   (eval echo "\"\$as_me:13005: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:13006: \$? = $ac_status" >&5
+   echo "$as_me:13009: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -13066,11 +13069,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13069: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13072: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13073: \$? = $ac_status" >&5
+   echo "$as_me:13076: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -15010,11 +15013,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15013: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15016: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15017: \$? = $ac_status" >&5
+   echo "$as_me:15020: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -15242,11 +15245,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15245: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15248: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15249: \$? = $ac_status" >&5
+   echo "$as_me:15252: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -15309,11 +15312,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15312: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15315: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:15316: \$? = $ac_status" >&5
+   echo "$as_me:15319: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -17321,7 +17324,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext < conftest.$ac_ext <


Changes in directory llvm/autoconf:

configure.ac updated: 1.11 -> 1.12

---
Log message:

Added the SetjmpLongjmp Makefile.



---
Diffs of the changes:

Index: llvm/autoconf/configure.ac
diff -u llvm/autoconf/configure.ac:1.11 llvm/autoconf/configure.ac:1.12
--- llvm/autoconf/configure.ac:1.11	Thu Sep 11 13:04:00 2003
+++ llvm/autoconf/configure.ac	Thu Sep 11 15:53:48 2003
@@ -162,6 +162,7 @@
 AC_CONFIG_MAKEFILE(test/Programs/SingleSource/Benchmarks/Misc/Makefile)
 AC_CONFIG_MAKEFILE(test/Programs/SingleSource/CustomChecked/Makefile)
 AC_CONFIG_MAKEFILE(test/Programs/SingleSource/UnitTests/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/SingleSource/UnitTests/SetjmpLongjmp/Makefile)
 AC_CONFIG_MAKEFILE(tools/Makefile)
 AC_CONFIG_MAKEFILE(tools/analyze/Makefile)
 AC_CONFIG_MAKEFILE(tools/as/Makefile)




From lattner at cs.uiuc.edu  Thu Sep 11 17:25:04 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Thu Sep 11 17:25:04 2003
Subject: [llvm-commits] CVS: llvm/test/Regression/Transforms/InstCombine/mul.ll
Message-ID: <200309112223.RAA10867@apoc.cs.uiuc.edu>


Changes in directory llvm/test/Regression/Transforms/InstCombine:

mul.ll updated: 1.8 -> 1.9

---
Log message:

New testcase


---
Diffs of the changes:

Index: llvm/test/Regression/Transforms/InstCombine/mul.ll
diff -u llvm/test/Regression/Transforms/InstCombine/mul.ll:1.8 llvm/test/Regression/Transforms/InstCombine/mul.ll:1.9
--- llvm/test/Regression/Transforms/InstCombine/mul.ll:1.8	Sat Jun 28 18:31:56 2003
+++ llvm/test/Regression/Transforms/InstCombine/mul.ll	Thu Sep 11 17:23:48 2003
@@ -45,3 +45,8 @@
 	%j = mul ulong %i, 18446744073709551615 ; tmp = sub 0, %i
 	ret ulong %j
 }
+
+uint %test9(uint %i) {
+	%j = mul uint %i, 4294967295    ; %j = sub 0, %i
+	ret uint %j
+}




From lattner at cs.uiuc.edu  Thu Sep 11 17:26:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Thu Sep 11 17:26:01 2003
Subject: [llvm-commits] CVS: llvm/lib/Transforms/Scalar/InstructionCombining.cpp
Message-ID: <200309112225.RAA11296@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/Transforms/Scalar:

InstructionCombining.cpp updated: 1.118 -> 1.119

---
Log message:

Simplify code
Implement InstCombine/mul.ll:test9


---
Diffs of the changes:

Index: llvm/lib/Transforms/Scalar/InstructionCombining.cpp
diff -u llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.118 llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.119
--- llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.118	Wed Sep 10 00:29:03 2003
+++ llvm/lib/Transforms/Scalar/InstructionCombining.cpp	Thu Sep 11 17:24:54 2003
@@ -527,17 +527,14 @@
             return BinaryOperator::create(Instruction::Mul, SI->getOperand(0),
                                           *CI << *ShOp);
 
-      const Type *Ty = CI->getType();
-      int64_t Val = (int64_t)cast(CI)->getRawValue();
-      switch (Val) {
-      case -1:                               // X * -1 -> -X
+      if (CI->isNullValue())
+        return ReplaceInstUsesWith(I, Op1);  // X * 0  == 0
+      if (CI->equalsInt(1))                  // X * 1  == X
+        return ReplaceInstUsesWith(I, Op0);
+      if (CI->isAllOnesValue())              // X * -1 == 0 - X
         return BinaryOperator::createNeg(Op0, I.getName());
-      case 0:
-        return ReplaceInstUsesWith(I, Op1);  // Eliminate 'mul double %X, 0'
-      case 1:
-        return ReplaceInstUsesWith(I, Op0);  // Eliminate 'mul int %X, 1'
-      }
 
+      int64_t Val = (int64_t)cast(CI)->getRawValue();
       if (uint64_t C = Log2(Val))            // Replace X*(2^C) with X << C
         return new ShiftInst(Instruction::Shl, Op0,
                              ConstantUInt::get(Type::UByteTy, C));




From brukman at cs.uiuc.edu  Thu Sep 11 17:32:02 2003
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Thu Sep 11 17:32:02 2003
Subject: [llvm-commits] CVS: llvm/lib/Bytecode/Reader/ReadArchive.cpp ReadConst.cpp ReadInst.cpp Reader.cpp
Message-ID: <200309112231.RAA13663@zion.cs.uiuc.edu>


Changes in directory llvm/lib/Bytecode/Reader:

ReadArchive.cpp updated: 1.4 -> 1.5
ReadConst.cpp updated: 1.51 -> 1.52
ReadInst.cpp updated: 1.50 -> 1.51
Reader.cpp updated: 1.60 -> 1.61

---
Log message:

Fixed spelling and grammar.


---
Diffs of the changes:

Index: llvm/lib/Bytecode/Reader/ReadArchive.cpp
diff -u llvm/lib/Bytecode/Reader/ReadArchive.cpp:1.4 llvm/lib/Bytecode/Reader/ReadArchive.cpp:1.5
--- llvm/lib/Bytecode/Reader/ReadArchive.cpp:1.4	Mon Jun 30 16:58:40 2003
+++ llvm/lib/Bytecode/Reader/ReadArchive.cpp	Thu Sep 11 17:31:21 2003
@@ -130,7 +130,7 @@
 }
 
 
-// ReadArchiveFile - Read bytecode files from the specfied .a file, returning
+// ReadArchiveFile - Read bytecode files from the specified .a file, returning
 // true on error, or false on success.  This does not support reading files from
 // standard input.
 //


Index: llvm/lib/Bytecode/Reader/ReadConst.cpp
diff -u llvm/lib/Bytecode/Reader/ReadConst.cpp:1.51 llvm/lib/Bytecode/Reader/ReadConst.cpp:1.52
--- llvm/lib/Bytecode/Reader/ReadConst.cpp:1.51	Wed Sep  3 15:25:27 2003
+++ llvm/lib/Bytecode/Reader/ReadConst.cpp	Thu Sep 11 17:31:21 2003
@@ -4,7 +4,7 @@
 // constant pools.
 // 
 // Note that this library should be as fast as possible, reentrant, and 
-// threadsafe!!
+// thread-safe!!
 //
 //===----------------------------------------------------------------------===//
 
@@ -113,12 +113,12 @@
 
 
 
-// parseTypeConstants - We have to use this wierd code to handle recursive
+// parseTypeConstants - We have to use this weird code to handle recursive
 // types.  We know that recursive types will only reference the current slab of
 // values in the type plane, but they can forward reference types before they
 // have been read.  For example, Type #0 might be '{ Ty#1 }' and Type #1 might
 // be 'Ty#0*'.  When reading Type #0, type number one doesn't exist.  To fix
-// this ugly problem, we pesimistically insert an opaque type for each type we
+// this ugly problem, we pessimistically insert an opaque type for each type we
 // are about to read.  This means that forward references will resolve to
 // something and when we reread the type later, we can replace the opaque type
 // with a new resolved concrete type.
@@ -327,7 +327,7 @@
         if (!(GV = dyn_cast(Val))) return true;
         BCR_TRACE(5, "Value Found in ValueTable!\n");
       } else if (RevisionNum > 0) {
-        // Revision #0 could have forward references to globals that were wierd.
+        // Revision #0 could have forward references to globals that were weird.
         // We got rid of this in subsequent revs.
         return true;
       } else {         // Nope... find or create a forward ref. for it


Index: llvm/lib/Bytecode/Reader/ReadInst.cpp
diff -u llvm/lib/Bytecode/Reader/ReadInst.cpp:1.50 llvm/lib/Bytecode/Reader/ReadInst.cpp:1.51
--- llvm/lib/Bytecode/Reader/ReadInst.cpp:1.50	Mon Sep  8 14:43:46 2003
+++ llvm/lib/Bytecode/Reader/ReadInst.cpp	Thu Sep 11 17:31:21 2003
@@ -204,7 +204,7 @@
       new SwitchInst(getValue(Raw.Ty, Raw.Arg1), 
                      cast(getValue(Type::LabelTy, Raw.Arg2)));
     Res = I;
-    if (Raw.NumOperands < 3) return false;  // No destinations?  Wierd.
+    if (Raw.NumOperands < 3) return false;  // No destinations?  Weird.
 
     if (Raw.NumOperands == 3 || Raw.VarArgs->size() & 1) {
       std::cerr << "Switch statement with odd number of arguments!\n";


Index: llvm/lib/Bytecode/Reader/Reader.cpp
diff -u llvm/lib/Bytecode/Reader/Reader.cpp:1.60 llvm/lib/Bytecode/Reader/Reader.cpp:1.61
--- llvm/lib/Bytecode/Reader/Reader.cpp:1.60	Mon Sep  8 13:04:16 2003
+++ llvm/lib/Bytecode/Reader/Reader.cpp	Thu Sep 11 17:31:21 2003
@@ -436,7 +436,7 @@
     BCR_TRACE(2, "Global Variable of type: " << *Ty << "\n");
     ResolveReferencesToValue(GV, (unsigned)DestSlot);
 
-    if (VarType & 2) { // Does it have an initalizer?
+    if (VarType & 2) { // Does it have an initializer?
       unsigned InitSlot;
       if (read_vbr(Buf, End, InitSlot)) return true;
       GlobalInits.push_back(std::make_pair(GV, InitSlot));




From brukman at cs.uiuc.edu  Thu Sep 11 17:32:12 2003
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Thu Sep 11 17:32:12 2003
Subject: [llvm-commits] CVS: llvm/lib/Bytecode/Writer/WriteInst.cpp Writer.cpp
Message-ID: <200309112231.RAA13692@zion.cs.uiuc.edu>


Changes in directory llvm/lib/Bytecode/Writer:

WriteInst.cpp updated: 1.29 -> 1.30
Writer.cpp updated: 1.36 -> 1.37

---
Log message:

Fixed spelling and grammar.


---
Diffs of the changes:

Index: llvm/lib/Bytecode/Writer/WriteInst.cpp
diff -u llvm/lib/Bytecode/Writer/WriteInst.cpp:1.29 llvm/lib/Bytecode/Writer/WriteInst.cpp:1.30
--- llvm/lib/Bytecode/Writer/WriteInst.cpp:1.29	Mon Sep  8 12:58:37 2003
+++ llvm/lib/Bytecode/Writer/WriteInst.cpp	Thu Sep 11 17:31:47 2003
@@ -52,7 +52,7 @@
 }
 
 
-// outputInstrVarArgsCall - Output the obsurdly annoying varargs function calls.
+// outputInstrVarArgsCall - Output the absurdly annoying varargs function calls.
 // This are more annoying than most because the signature of the call does not
 // tell us anything about the types of the arguments in the varargs portion.
 // Because of this, we encode (as type 0) all of the argument types explicitly
@@ -271,6 +271,6 @@
   }
 
   // If we weren't handled before here, we either have a large number of
-  // operands or a large operand index that we are refering to.
+  // operands or a large operand index that we are referring to.
   outputInstructionFormat0(&I, Opcode, Table, Type, Out);
 }


Index: llvm/lib/Bytecode/Writer/Writer.cpp
diff -u llvm/lib/Bytecode/Writer/Writer.cpp:1.36 llvm/lib/Bytecode/Writer/Writer.cpp:1.37
--- llvm/lib/Bytecode/Writer/Writer.cpp:1.36	Sun Aug 24 08:47:36 2003
+++ llvm/lib/Bytecode/Writer/Writer.cpp	Thu Sep 11 17:31:47 2003
@@ -3,7 +3,7 @@
 // This library implements the functionality defined in llvm/Bytecode/Writer.h
 //
 // Note that this file uses an unusual technique of outputting all the bytecode
-// to a deque of unsigned char's, then copies the deque to an ostream.  The
+// to a deque of unsigned chare, then copies the deque to an ostream.  The
 // reason for this is that we must do "seeking" in the stream to do back-
 // patching, and some very important ostreams that we want to support (like
 // pipes) do not support seeking.  :( :( :(
@@ -143,7 +143,7 @@
       const std::vector &Plane = Table.getPlane(pno);
       if (!Plane.empty()) {              // Skip empty type planes...
         unsigned ValNo = 0;
-        if (isFunction)                  // Don't reemit module constants
+        if (isFunction)                  // Don't re-emit module constants
           ValNo += Table.getModuleLevel(pno);
         
         if (pno >= Type::FirstDerivedTyID) {




From brukman at cs.uiuc.edu  Thu Sep 11 17:34:03 2003
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Thu Sep 11 17:34:03 2003
Subject: [llvm-commits] CVS: llvm/lib/CWriter/Writer.cpp
Message-ID: <200309112233.RAA13738@zion.cs.uiuc.edu>


Changes in directory llvm/lib/CWriter:

Writer.cpp updated: 1.124 -> 1.125

---
Log message:

Fixed spelling and grammar.


---
Diffs of the changes:

Index: llvm/lib/CWriter/Writer.cpp
diff -u llvm/lib/CWriter/Writer.cpp:1.124 llvm/lib/CWriter/Writer.cpp:1.125
--- llvm/lib/CWriter/Writer.cpp:1.124	Wed Sep 10 15:12:09 2003
+++ llvm/lib/CWriter/Writer.cpp	Thu Sep 11 17:33:18 2003
@@ -886,7 +886,7 @@
     BasicBlock *Prev = BB->getPrev();
 
     // Don't print the label for the basic block if there are no uses, or if the
-    // only terminator use is the precessor basic block's terminator.  We have
+    // only terminator use is the predecessor basic block's terminator.  We have
     // to scan the use list because PHI nodes use basic blocks too but do not
     // require a label to be generated.
     //
@@ -1022,8 +1022,8 @@
   }
 }
 
-// Brach instruction printing - Avoid printing out a brach to a basic block that
-// immediately succeeds the current one.
+// Branch instruction printing - Avoid printing out a branch to a basic block
+// that immediately succeeds the current one.
 //
 void CWriter::visitBranchInst(BranchInst &I) {
   if (I.isConditional()) {
@@ -1155,7 +1155,7 @@
 
       case LLVMIntrinsic::setjmp:
       case LLVMIntrinsic::sigsetjmp:
-        // This instrinsic should never exist in the program, but until we get
+        // This intrinsic should never exist in the program, but until we get
         // setjmp/longjmp transformations going on, we should codegen it to
         // something reasonable.  This will allow code that never calls longjmp
         // to work.




From brukman at cs.uiuc.edu  Thu Sep 11 17:35:02 2003
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Thu Sep 11 17:35:02 2003
Subject: [llvm-commits] CVS: llvm/lib/CodeGen/RegAlloc/PhyRegAlloc.cpp RegClass.cpp
Message-ID: <200309112234.RAA13760@zion.cs.uiuc.edu>


Changes in directory llvm/lib/CodeGen/RegAlloc:

PhyRegAlloc.cpp updated: 1.107 -> 1.108
RegClass.cpp updated: 1.24 -> 1.25

---
Log message:

Fixed spelling and grammar.


---
Diffs of the changes:

Index: llvm/lib/CodeGen/RegAlloc/PhyRegAlloc.cpp
diff -u llvm/lib/CodeGen/RegAlloc/PhyRegAlloc.cpp:1.107 llvm/lib/CodeGen/RegAlloc/PhyRegAlloc.cpp:1.108
--- llvm/lib/CodeGen/RegAlloc/PhyRegAlloc.cpp:1.107	Mon Sep  1 15:09:04 2003
+++ llvm/lib/CodeGen/RegAlloc/PhyRegAlloc.cpp	Thu Sep 11 17:34:13 2003
@@ -104,7 +104,7 @@
 } 
 
 //----------------------------------------------------------------------------
-// This method initally creates interference graphs (one in each reg class)
+// This method initially creates interference graphs (one in each reg class)
 // and IGNodeList (one in each IG). The actual nodes will be pushed later. 
 //----------------------------------------------------------------------------
 void PhyRegAlloc::createIGNodeListsAndIGs() {
@@ -145,7 +145,7 @@
 
 //----------------------------------------------------------------------------
 // This method will add all interferences at for a given instruction.
-// Interence occurs only if the LR of Def (Inst or Arg) is of the same reg 
+// Interference occurs only if the LR of Def (Inst or Arg) is of the same reg 
 // class as that of live var. The live var passed to this function is the 
 // LVset AFTER the instruction
 //----------------------------------------------------------------------------
@@ -290,9 +290,9 @@
       bool isCallInst = TM.getInstrInfo().isCall(MInst->getOpCode());
 
       if (isCallInst ) {
-	// set the isCallInterference flag of each live range wich extends
-	// accross this call instruction. This information is used by graph
-	// coloring algo to avoid allocating volatile colors to live ranges
+	// set the isCallInterference flag of each live range which extends
+	// across this call instruction. This information is used by graph
+	// coloring algorithm to avoid allocating volatile colors to live ranges
 	// that span across calls (since they have to be saved/restored)
 	//
 	setCallInterferences(MInst, &LVSetAI);
@@ -331,7 +331,7 @@
   } // for all BBs in function
 
 
-  // add interferences for function arguments. Since there are no explict 
+  // add interferences for function arguments. Since there are no explicit 
   // defs in the function for args, we have to add them manually
   //  
   addInterferencesForArgs();          
@@ -343,7 +343,7 @@
 
 
 //--------------------------------------------------------------------------
-// Pseudo instructions will be exapnded to multiple instructions by the
+// Pseudo-instructions will be expanded to multiple instructions by the
 // assembler. Consequently, all the opernds must get distinct registers.
 // Therefore, we mark all operands of a pseudo instruction as they interfere
 // with one another.
@@ -404,7 +404,7 @@
 
 //----------------------------------------------------------------------------
 // This method is called after register allocation is complete to set the
-// allocated reisters in the machine code. This code will add register numbers
+// allocated registers in the machine code. This code will add register numbers
 // to MachineOperands that contain a Value. Also it calls target specific
 // methods to produce caller saving instructions. At the end, it adds all
 // additional instructions produced by the register allocator to the 
@@ -722,7 +722,7 @@
 // if it contains many spilled operands. Each time it is called, it finds
 // a register which is not live at that instruction and also which is not
 // used by other spilled operands of the same instruction. Then it uses
-// this register temporarily to accomodate the spilled value.
+// this register temporarily to accommodate the spilled value.
 //----------------------------------------------------------------------------
 
 void PhyRegAlloc::insertCode4SpilledLR(const LiveRange *LR, 
@@ -835,7 +835,7 @@
 
 
 //----------------------------------------------------------------------------
-// This method inserts caller saving/restoring instructons before/after
+// This method inserts caller saving/restoring instructions before/after
 // a call machine instruction. The caller saving/restoring instructions are
 // inserted like:
 //    ** caller saving instructions
@@ -1077,7 +1077,7 @@
 
 //----------------------------------------------------------------------------
 // This method is called to get a new unused register that can be used
-// to accomodate a temporary value.  This method may be called several times
+// to accommodate a temporary value.  This method may be called several times
 // for a single machine instruction.  Each time it is called, it finds a
 // register which is not live at that instruction and also which is not used
 // by other spilled operands of the same instruction.  Return register number
@@ -1370,7 +1370,7 @@
 
 //----------------------------------------------------------------------------
 // The following method will set the stack offsets of the live ranges that
-// are decided to be spillled. This must be called just after coloring the
+// are decided to be spilled. This must be called just after coloring the
 // LRs using the graph coloring algo. For each live range that is spilled,
 // this method allocate a new spill position on the stack.
 //----------------------------------------------------------------------------
@@ -1450,8 +1450,8 @@
   for (unsigned rc=0; rc < NumOfRegClasses ; rc++)  
     RegClassList[rc]->colorAllRegs();    
 
-  // Atter graph coloring, if some LRs did not receive a color (i.e, spilled)
-  // a poistion for such spilled LRs
+  // After graph coloring, if some LRs did not receive a color (i.e, spilled)
+  // a position for such spilled LRs
   //
   allocateStackSpace4SpilledLRs();
 


Index: llvm/lib/CodeGen/RegAlloc/RegClass.cpp
diff -u llvm/lib/CodeGen/RegAlloc/RegClass.cpp:1.24 llvm/lib/CodeGen/RegAlloc/RegClass.cpp:1.25
--- llvm/lib/CodeGen/RegAlloc/RegClass.cpp:1.24	Mon Sep  1 15:05:47 2003
+++ llvm/lib/CodeGen/RegAlloc/RegClass.cpp	Thu Sep 11 17:34:13 2003
@@ -93,7 +93,7 @@
     //
     IGNodeSpill->pushOnStack(); 
    
-    // now push NON-constrined ones, if any
+    // now push NON-constrained ones, if any
     //
     NeedMoreSpills = !pushUnconstrainedIGNodes(); 
 
@@ -154,7 +154,7 @@
 
 
 //----------------------------------------------------------------------------
-// Get the IGNode withe the minimum spill cost
+// Get the IGNode with the minimum spill cost
 //----------------------------------------------------------------------------
 IGNode * RegClass::getIGNodeWithMinSpillCost()
 {
@@ -216,8 +216,8 @@
       IGNode *NeighIGNode = Node->getAdjIGNode(n);
       LiveRange *NeighLR = NeighIGNode->getParentLR();
       
-      // Don't use a color if it is in use by the neighbour,
-      // or is suggested for use by the neighbour,
+      // Don't use a color if it is in use by the neighbor,
+      // or is suggested for use by the neighbor,
       // markColorsUsed() should be given the color and the reg type for
       // LR, not for NeighLR, because it should mark registers used based on
       // the type we are looking for, not on the regType for the neighbour.




From criswell at cs.uiuc.edu  Fri Sep 12 09:41:10 2003
From: criswell at cs.uiuc.edu (John Criswell)
Date: Fri Sep 12 09:41:10 2003
Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Benchmarks/
Message-ID: <200309121436.JAA19300@choi.cs.uiuc.edu>


Changes in directory llvm/test/Programs/MultiSource/Benchmarks:


---
Log message:

Directory /home/vadve/vadve/Research/DynOpt/CVSRepository/llvm/test/Programs/MultiSource/Benchmarks added to the repository


---
Diffs of the changes:



From criswell at cs.uiuc.edu  Fri Sep 12 10:02:01 2003
From: criswell at cs.uiuc.edu (John Criswell)
Date: Fri Sep 12 10:02:01 2003
Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Applications/
Message-ID: <200309121501.KAA29251@choi.cs.uiuc.edu>


Changes in directory llvm/test/Programs/MultiSource/Applications:


---
Log message:

Directory /home/vadve/vadve/Research/DynOpt/CVSRepository/llvm/test/Programs/MultiSource/Applications added to the repository


---
Diffs of the changes:



From lattner at cs.uiuc.edu  Fri Sep 12 10:37:02 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Sep 12 10:37:02 2003
Subject: [llvm-commits] CVS: llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp
Message-ID: <200309121536.KAA22857@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/Transforms/Scalar:

ScalarReplAggregates.cpp updated: 1.11 -> 1.12

---
Log message:

Minor optimization efficiency improvement:
  - Run mem2reg promotion first
  - Only rerun passes if the previous thing changed something


---
Diffs of the changes:

Index: llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp
diff -u llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp:1.11 llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp:1.12
--- llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp:1.11	Thu Sep 11 11:58:31 2003
+++ llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp	Fri Sep 12 10:36:03 2003
@@ -58,12 +58,14 @@
 
 
 bool SROA::runOnFunction(Function &F) {
-  bool Changed = false, LocalChange;
-  do {
-    LocalChange = performScalarRepl(F);
-    LocalChange |= performPromotion(F);
-    Changed |= LocalChange;
-  } while (LocalChange);
+  bool Changed = performPromotion(F);
+  while (1) {
+    bool LocalChange = performScalarRepl(F);
+    if (!LocalChange) break;   // No need to repromote if no scalarrepl
+    Changed = true;
+    LocalChange = performPromotion(F);
+    if (!LocalChange) break;   // No need to re-scalarrepl if no promotion
+  }
 
   return Changed;
 }
@@ -75,7 +77,7 @@
 
   BasicBlock &BB = F.getEntryNode();  // Get the entry node for the function
 
-  bool Changed  = false;
+  bool Changed = false;
   
   while (1) {
     Allocas.clear();




From lattner at cs.uiuc.edu  Fri Sep 12 10:45:04 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Sep 12 10:45:04 2003
Subject: [llvm-commits] CVS: llvm/test/Regression/Transforms/ScalarRepl/2003-09-12-IncorrectPromote.ll
Message-ID: <200309121544.KAA23269@apoc.cs.uiuc.edu>


Changes in directory llvm/test/Regression/Transforms/ScalarRepl:

2003-09-12-IncorrectPromote.ll added (r1.1)

---
Log message:

New testcase, bug distilled from bc


---
Diffs of the changes:

Index: llvm/test/Regression/Transforms/ScalarRepl/2003-09-12-IncorrectPromote.ll
diff -c /dev/null llvm/test/Regression/Transforms/ScalarRepl/2003-09-12-IncorrectPromote.ll:1.1
*** /dev/null	Fri Sep 12 10:44:11 2003
--- llvm/test/Regression/Transforms/ScalarRepl/2003-09-12-IncorrectPromote.ll	Fri Sep 12 10:44:01 2003
***************
*** 0 ****
--- 1,11 ----
+ ; Scalar replacement was incorrectly promoting this alloca!!
+ ;
+ ; RUN: llvm-as < %s | opt -scalarrepl | llvm-dis | sed 's/;.*//g' | grep '\['
+ 
+ sbyte *%test() {
+ 	%A = alloca [30 x sbyte]
+ 	%B = getelementptr [30 x sbyte]* %A, long 0, long 0
+ 	%C = getelementptr sbyte* %B, long 1
+ 	store sbyte 0, sbyte* %B
+ 	ret sbyte* %C
+ }




From criswell at cs.uiuc.edu  Fri Sep 12 10:47:02 2003
From: criswell at cs.uiuc.edu (John Criswell)
Date: Fri Sep 12 10:47:02 2003
Subject: [llvm-commits] CVS: llvm/www/docs/CommandGuide/llc.html
Message-ID: <200309121546.KAA04759@choi.cs.uiuc.edu>


Changes in directory llvm/www/docs/CommandGuide:

llc.html added (r1.1)

---
Log message:

Initial go at documentation for llc.
Pretty crufty.



---
Diffs of the changes:

Index: llvm/www/docs/CommandGuide/llc.html
diff -c /dev/null llvm/www/docs/CommandGuide/llc.html:1.1
*** /dev/null	Fri Sep 12 10:46:34 2003
--- llvm/www/docs/CommandGuide/llc.html	Fri Sep 12 10:46:24 2003
***************
*** 0 ****
--- 1,147 ----
+ 
+ 
+ llc
+ 
+ 
+ 
+ 
+ 
+

Low Level Virtual Machine

+
+
+ +

+ NAME +

+ + llc + +

+ SYNOPSIS +

+ + llc [options] < filename> +

+ DESCRIPTION +

+ + The llc command compiles LLVM bytecode into assembly language for a specified + architecture. The assembly language output can then be passed through a native + assembler and linker to generate native code. + +

+ OPTIONS +

+ +
    +
  • -disable-fp-elim +
    + Disable frame pointer elimination optimization +

    + +

  • -disable-local-ra +
    + Use Simple RA instead of Local RegAlloc +

    + +

  • -disable-pattern-isel +
    + Use the 'simple' X86 instruction selector +

    + +

  • -disable-peephole +
    + Disable peephole optimization pass +

    + +

  • -disable-preopt +
    + Disable optimizations prior to instruction selection +

    + +

  • -disable-sched +
    + Disable local scheduling pass +

    + +

  • -disable-strip +
    + Do not strip the LLVM bytecode included in executable +

    + +

  • -enable-maps +
    + Emit LLVM-to-MachineCode mapping info to assembly +

    + +

  • -f +
    + Overwrite output files +

    + +

  • -load=<plugin.so> +
    + Load the specified plugin +

    + +

  • -m<arch> +
    + Specify the architecture for which to generate assembly. Valid +

    + architectures are: + +

    + x86 +
    + IA-32 (Pentium and above) +

    + + sparc +

    SPARC V9 +
    +

    + +

  • -o <filename> +
    + Output filename +

    + +

  • -print-machineinstrs +
    + Print generated machine code +

    + +

  • -help +
    + Print a summary of command line options. +

    + +

  • -stats +
    + Print statistics. +

    + +

  • -time-passes +
    + Record the amount of time needed for each pass and print it to standard + error. +

    +

+ +

+ EXIT STATUS +

+ + If llc succeeds, it will exit with 0. Otherwise, if an error occurs, it + will exit with a non-zero value. + +

+ SEE ALSO +

+ llvm-dis, lli + +
+ LLVM Team + + + From lattner at cs.uiuc.edu Fri Sep 12 11:03:02 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Fri Sep 12 11:03:02 2003 Subject: [llvm-commits] CVS: llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp Message-ID: <200309121602.LAA24131@apoc.cs.uiuc.edu> Changes in directory llvm/lib/Transforms/Scalar: ScalarReplAggregates.cpp updated: 1.12 -> 1.13 --- Log message: Do not return success after checking only the FIRST USE of a gep instruction. Instead, check all uses. This fixes bug: ScalarRepl/2003-09-12-IncorrectPromote.ll This also fixes the miscompilation of Ptrdist/bc --- Diffs of the changes: Index: llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp diff -u llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp:1.12 llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp:1.13 --- llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp:1.12 Fri Sep 12 10:36:03 2003 +++ llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp Fri Sep 12 11:02:12 2003 @@ -234,8 +234,11 @@ I != E; ++I) { Instruction *User = cast(*I); switch (User->getOpcode()) { - case Instruction::Load: return true; - case Instruction::Store: return User->getOperand(0) != Ptr; + case Instruction::Load: break; + case Instruction::Store: + // Store is ok if storing INTO the pointer, not storing the pointer + if (User->getOperand(0) == Ptr) return false; + break; case Instruction::GetElementPtr: { GetElementPtrInst *GEP = cast(User); if (GEP->getNumOperands() > 1) { @@ -243,7 +246,8 @@ !cast(GEP->getOperand(1))->isNullValue()) return false; // Using pointer arithmetic to navigate the array... } - return isSafeElementUse(GEP); + if (!isSafeElementUse(GEP)) return false; + break; } default: DEBUG(std::cerr << " Transformation preventing inst: " << *User); From criswell at cs.uiuc.edu Fri Sep 12 11:03:15 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri Sep 12 11:03:15 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Benchmarks/Ptrdist/ft/Makefile Message-ID: <200309121602.LAA06387@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/MultiSource/Benchmarks/Ptrdist/ft: Makefile updated: 1.5 -> 1.6 --- Log message: Initial checkin of re-organized MultiSource tree. --- Diffs of the changes: Index: llvm/test/Programs/MultiSource/Benchmarks/Ptrdist/ft/Makefile diff -u llvm/test/Programs/MultiSource/Benchmarks/Ptrdist/ft/Makefile:1.5 llvm/test/Programs/MultiSource/Benchmarks/Ptrdist/ft/Makefile:1.6 --- llvm/test/Programs/MultiSource/Benchmarks/Ptrdist/ft/Makefile:1.5 Fri Aug 15 14:02:50 2003 +++ llvm/test/Programs/MultiSource/Benchmarks/Ptrdist/ft/Makefile Fri Sep 12 11:02:38 2003 @@ -1,4 +1,4 @@ -LEVEL = ../../../../.. +LEVEL = ../../../../../.. PROG = ft RUN_OPTIONS += 1500 100000 include $(LEVEL)/test/Programs/MultiSource/Makefile.multisrc From criswell at cs.uiuc.edu Fri Sep 12 11:03:26 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri Sep 12 11:03:26 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Benchmarks/Ptrdist/ks/Makefile Message-ID: <200309121602.LAA06395@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/MultiSource/Benchmarks/Ptrdist/ks: Makefile updated: 1.6 -> 1.7 --- Log message: Initial checkin of re-organized MultiSource tree. --- Diffs of the changes: Index: llvm/test/Programs/MultiSource/Benchmarks/Ptrdist/ks/Makefile diff -u llvm/test/Programs/MultiSource/Benchmarks/Ptrdist/ks/Makefile:1.6 llvm/test/Programs/MultiSource/Benchmarks/Ptrdist/ks/Makefile:1.7 --- llvm/test/Programs/MultiSource/Benchmarks/Ptrdist/ks/Makefile:1.6 Fri Aug 15 14:02:50 2003 +++ llvm/test/Programs/MultiSource/Benchmarks/Ptrdist/ks/Makefile Fri Sep 12 11:02:39 2003 @@ -1,4 +1,4 @@ -LEVEL = ../../../../.. +LEVEL = ../../../../../.. PROG = ks #OBJS = KS-1.o KS-2.o RUN_OPTIONS += KL-4.in From criswell at cs.uiuc.edu Fri Sep 12 11:03:36 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri Sep 12 11:03:36 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Benchmarks/Ptrdist/yacr2/Makefile Message-ID: <200309121602.LAA06402@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/MultiSource/Benchmarks/Ptrdist/yacr2: Makefile updated: 1.2 -> 1.3 --- Log message: Initial checkin of re-organized MultiSource tree. --- Diffs of the changes: Index: llvm/test/Programs/MultiSource/Benchmarks/Ptrdist/yacr2/Makefile diff -u llvm/test/Programs/MultiSource/Benchmarks/Ptrdist/yacr2/Makefile:1.2 llvm/test/Programs/MultiSource/Benchmarks/Ptrdist/yacr2/Makefile:1.3 --- llvm/test/Programs/MultiSource/Benchmarks/Ptrdist/yacr2/Makefile:1.2 Fri Aug 15 14:02:51 2003 +++ llvm/test/Programs/MultiSource/Benchmarks/Ptrdist/yacr2/Makefile Fri Sep 12 11:02:41 2003 @@ -1,4 +1,4 @@ -LEVEL = ../../../../.. +LEVEL = ../../../../../.. PROG = yacr2 CPPFLAGS = -DTODD RUN_OPTIONS += input2.in From criswell at cs.uiuc.edu Fri Sep 12 11:03:47 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri Sep 12 11:03:47 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Benchmarks/McCat/05-eks/Makefile Message-ID: <200309121602.LAA06407@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/MultiSource/Benchmarks/McCat/05-eks: Makefile updated: 1.3 -> 1.4 --- Log message: Initial checkin of re-organized MultiSource tree. --- Diffs of the changes: Index: llvm/test/Programs/MultiSource/Benchmarks/McCat/05-eks/Makefile diff -u llvm/test/Programs/MultiSource/Benchmarks/McCat/05-eks/Makefile:1.3 llvm/test/Programs/MultiSource/Benchmarks/McCat/05-eks/Makefile:1.4 --- llvm/test/Programs/MultiSource/Benchmarks/McCat/05-eks/Makefile:1.3 Fri Aug 15 13:59:16 2003 +++ llvm/test/Programs/MultiSource/Benchmarks/McCat/05-eks/Makefile Fri Sep 12 11:02:11 2003 @@ -1,4 +1,4 @@ -LEVEL = ../../../../.. +LEVEL = ../../../../../.. PROG = eks LDFLAGS = -lm #RUN_OPTIONS += From criswell at cs.uiuc.edu Fri Sep 12 11:03:57 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri Sep 12 11:03:57 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Benchmarks/llubenchmark/Makefile Message-ID: <200309121602.LAA06414@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/MultiSource/Benchmarks/llubenchmark: Makefile updated: 1.1 -> 1.2 --- Log message: Initial checkin of re-organized MultiSource tree. --- Diffs of the changes: Index: llvm/test/Programs/MultiSource/Benchmarks/llubenchmark/Makefile diff -u llvm/test/Programs/MultiSource/Benchmarks/llubenchmark/Makefile:1.1 llvm/test/Programs/MultiSource/Benchmarks/llubenchmark/Makefile:1.2 --- llvm/test/Programs/MultiSource/Benchmarks/llubenchmark/Makefile:1.1 Thu May 8 22:49:51 2003 +++ llvm/test/Programs/MultiSource/Benchmarks/llubenchmark/Makefile Fri Sep 12 11:02:42 2003 @@ -1,7 +1,7 @@ -LEVEL = ../../../.. +LEVEL = ../../../../.. PROG = llu CPPFLAGS = LDFLAGS = -include ../Makefile.multisrc +include ../../Makefile.multisrc From criswell at cs.uiuc.edu Fri Sep 12 11:04:07 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri Sep 12 11:04:07 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Benchmarks/sim/Makefile Message-ID: <200309121602.LAA06421@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/MultiSource/Benchmarks/sim: Makefile updated: 1.3 -> 1.4 --- Log message: Initial checkin of re-organized MultiSource tree. --- Diffs of the changes: Index: llvm/test/Programs/MultiSource/Benchmarks/sim/Makefile diff -u llvm/test/Programs/MultiSource/Benchmarks/sim/Makefile:1.3 llvm/test/Programs/MultiSource/Benchmarks/sim/Makefile:1.4 --- llvm/test/Programs/MultiSource/Benchmarks/sim/Makefile:1.3 Wed Aug 6 15:42:34 2003 +++ llvm/test/Programs/MultiSource/Benchmarks/sim/Makefile Fri Sep 12 11:02:43 2003 @@ -1,7 +1,7 @@ -LEVEL = ../../../.. +LEVEL = ../../../../.. PROG = sim CPPFLAGS = -DUNIX LDFLAGS = -include ../Makefile.multisrc +include ../../Makefile.multisrc From criswell at cs.uiuc.edu Fri Sep 12 11:04:17 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri Sep 12 11:04:17 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Benchmarks/McCat/08-main/Makefile Message-ID: <200309121602.LAA06426@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/MultiSource/Benchmarks/McCat/08-main: Makefile updated: 1.4 -> 1.5 --- Log message: Initial checkin of re-organized MultiSource tree. --- Diffs of the changes: Index: llvm/test/Programs/MultiSource/Benchmarks/McCat/08-main/Makefile diff -u llvm/test/Programs/MultiSource/Benchmarks/McCat/08-main/Makefile:1.4 llvm/test/Programs/MultiSource/Benchmarks/McCat/08-main/Makefile:1.5 --- llvm/test/Programs/MultiSource/Benchmarks/McCat/08-main/Makefile:1.4 Fri Aug 15 13:59:19 2003 +++ llvm/test/Programs/MultiSource/Benchmarks/McCat/08-main/Makefile Fri Sep 12 11:02:13 2003 @@ -1,4 +1,4 @@ -LEVEL = ../../../../.. +LEVEL = ../../../../../.. PROG = main LDFLAGS = -lm From criswell at cs.uiuc.edu Fri Sep 12 11:04:27 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri Sep 12 11:04:27 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Applications/Makefile Message-ID: <200309121602.LAA06440@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/MultiSource/Applications: Makefile added (r1.1) --- Log message: Initial checkin of re-organized MultiSource tree. --- Diffs of the changes: Index: llvm/test/Programs/MultiSource/Applications/Makefile diff -c /dev/null llvm/test/Programs/MultiSource/Applications/Makefile:1.1 *** /dev/null Fri Sep 12 11:02:54 2003 --- llvm/test/Programs/MultiSource/Applications/Makefile Fri Sep 12 11:02:44 2003 *************** *** 0 **** --- 1,6 ---- + # MultiSource/Applications Makefile: Build all subdirectories automatically + + LEVEL = ../../../.. + PARALLEL_DIRS := $(filter-out %-disabled/, $(sort $(filter-out CVS/, $(wildcard */)))) + + include $(LEVEL)/test/Programs/Makefile.programs From criswell at cs.uiuc.edu Fri Sep 12 11:04:37 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri Sep 12 11:04:37 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Benchmarks/McCat/09-vor/Makefile Message-ID: <200309121602.LAA06452@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/MultiSource/Benchmarks/McCat/09-vor: Makefile updated: 1.4 -> 1.5 --- Log message: Initial checkin of re-organized MultiSource tree. --- Diffs of the changes: Index: llvm/test/Programs/MultiSource/Benchmarks/McCat/09-vor/Makefile diff -u llvm/test/Programs/MultiSource/Benchmarks/McCat/09-vor/Makefile:1.4 llvm/test/Programs/MultiSource/Benchmarks/McCat/09-vor/Makefile:1.5 --- llvm/test/Programs/MultiSource/Benchmarks/McCat/09-vor/Makefile:1.4 Sat Sep 6 10:13:27 2003 +++ llvm/test/Programs/MultiSource/Benchmarks/McCat/09-vor/Makefile Fri Sep 12 11:02:14 2003 @@ -1,4 +1,4 @@ -LEVEL = ../../../../.. +LEVEL = ../../../../../.. include $(LEVEL)/Makefile.config From criswell at cs.uiuc.edu Fri Sep 12 11:04:47 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri Sep 12 11:04:47 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Applications/Burg/Makefile Message-ID: <200309121602.LAA06476@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/MultiSource/Applications/Burg: Makefile updated: 1.8 -> 1.9 --- Log message: Initial checkin of re-organized MultiSource tree. --- Diffs of the changes: Index: llvm/test/Programs/MultiSource/Applications/Burg/Makefile diff -u llvm/test/Programs/MultiSource/Applications/Burg/Makefile:1.8 llvm/test/Programs/MultiSource/Applications/Burg/Makefile:1.9 --- llvm/test/Programs/MultiSource/Applications/Burg/Makefile:1.8 Thu Sep 11 15:11:59 2003 +++ llvm/test/Programs/MultiSource/Applications/Burg/Makefile Fri Sep 12 11:02:45 2003 @@ -1,4 +1,4 @@ -LEVEL = ../../../.. +LEVEL = ../../../../.. include $(LEVEL)/Makefile.config @@ -14,7 +14,7 @@ Source := $(ExtraSource) $(wildcard $(BUILD_SRC_DIR)/*.c) -include ../Makefile.multisrc +include ../../Makefile.multisrc # # JTC - From criswell at cs.uiuc.edu Fri Sep 12 11:04:57 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri Sep 12 11:04:57 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Benchmarks/McCat/12-IOtest/Makefile Message-ID: <200309121602.LAA06481@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/MultiSource/Benchmarks/McCat/12-IOtest: Makefile updated: 1.2 -> 1.3 --- Log message: Initial checkin of re-organized MultiSource tree. --- Diffs of the changes: Index: llvm/test/Programs/MultiSource/Benchmarks/McCat/12-IOtest/Makefile diff -u llvm/test/Programs/MultiSource/Benchmarks/McCat/12-IOtest/Makefile:1.2 llvm/test/Programs/MultiSource/Benchmarks/McCat/12-IOtest/Makefile:1.3 --- llvm/test/Programs/MultiSource/Benchmarks/McCat/12-IOtest/Makefile:1.2 Fri Aug 15 13:59:19 2003 +++ llvm/test/Programs/MultiSource/Benchmarks/McCat/12-IOtest/Makefile Fri Sep 12 11:02:15 2003 @@ -1,4 +1,4 @@ -LEVEL = ../../../../.. +LEVEL = ../../../../../.. PROG = iotest #LDFLAGS = -lm #RUN_OPTIONS += trie.in1 From criswell at cs.uiuc.edu Fri Sep 12 11:05:08 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri Sep 12 11:05:08 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Applications/aha/Makefile Message-ID: <200309121602.LAA06488@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/MultiSource/Applications/aha: Makefile updated: 1.4 -> 1.5 --- Log message: Initial checkin of re-organized MultiSource tree. --- Diffs of the changes: Index: llvm/test/Programs/MultiSource/Applications/aha/Makefile diff -u llvm/test/Programs/MultiSource/Applications/aha/Makefile:1.4 llvm/test/Programs/MultiSource/Applications/aha/Makefile:1.5 --- llvm/test/Programs/MultiSource/Applications/aha/Makefile:1.4 Wed Aug 6 15:42:32 2003 +++ llvm/test/Programs/MultiSource/Applications/aha/Makefile Fri Sep 12 11:02:46 2003 @@ -1,5 +1,5 @@ -LEVEL = ../../../.. +LEVEL = ../../../../.. PROG = aha CPPFLAGS = LDFLAGS = -include ../Makefile.multisrc +include ../../Makefile.multisrc From criswell at cs.uiuc.edu Fri Sep 12 11:05:18 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri Sep 12 11:05:18 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Benchmarks/McCat/15-trie/Makefile Message-ID: <200309121602.LAA06493@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/MultiSource/Benchmarks/McCat/15-trie: Makefile updated: 1.2 -> 1.3 --- Log message: Initial checkin of re-organized MultiSource tree. --- Diffs of the changes: Index: llvm/test/Programs/MultiSource/Benchmarks/McCat/15-trie/Makefile diff -u llvm/test/Programs/MultiSource/Benchmarks/McCat/15-trie/Makefile:1.2 llvm/test/Programs/MultiSource/Benchmarks/McCat/15-trie/Makefile:1.3 --- llvm/test/Programs/MultiSource/Benchmarks/McCat/15-trie/Makefile:1.2 Fri Aug 15 13:59:19 2003 +++ llvm/test/Programs/MultiSource/Benchmarks/McCat/15-trie/Makefile Fri Sep 12 11:02:17 2003 @@ -1,4 +1,4 @@ -LEVEL = ../../../../.. +LEVEL = ../../../../../.. PROG = trie LDFLAGS = -lm RUN_OPTIONS += trie.in1 From criswell at cs.uiuc.edu Fri Sep 12 11:05:28 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri Sep 12 11:05:28 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Applications/sgefa/Makefile Message-ID: <200309121602.LAA06500@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/MultiSource/Applications/sgefa: Makefile updated: 1.2 -> 1.3 --- Log message: Initial checkin of re-organized MultiSource tree. --- Diffs of the changes: Index: llvm/test/Programs/MultiSource/Applications/sgefa/Makefile diff -u llvm/test/Programs/MultiSource/Applications/sgefa/Makefile:1.2 llvm/test/Programs/MultiSource/Applications/sgefa/Makefile:1.3 --- llvm/test/Programs/MultiSource/Applications/sgefa/Makefile:1.2 Thu May 8 23:11:50 2003 +++ llvm/test/Programs/MultiSource/Applications/sgefa/Makefile Fri Sep 12 11:02:47 2003 @@ -1,8 +1,8 @@ -LEVEL = ../../../.. +LEVEL = ../../../../.. PROG = sgefa LDFLAGS = -lm # This program is adversely effected by the underlying precision of the machine PROGRAM_IS_NONDETERMINISTIC = 1 -include ../Makefile.multisrc +include ../../Makefile.multisrc From criswell at cs.uiuc.edu Fri Sep 12 11:05:39 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri Sep 12 11:05:39 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Benchmarks/McCat/17-bintr/Makefile Message-ID: <200309121602.LAA06505@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/MultiSource/Benchmarks/McCat/17-bintr: Makefile updated: 1.4 -> 1.5 --- Log message: Initial checkin of re-organized MultiSource tree. --- Diffs of the changes: Index: llvm/test/Programs/MultiSource/Benchmarks/McCat/17-bintr/Makefile diff -u llvm/test/Programs/MultiSource/Benchmarks/McCat/17-bintr/Makefile:1.4 llvm/test/Programs/MultiSource/Benchmarks/McCat/17-bintr/Makefile:1.5 --- llvm/test/Programs/MultiSource/Benchmarks/McCat/17-bintr/Makefile:1.4 Sat Sep 6 10:13:30 2003 +++ llvm/test/Programs/MultiSource/Benchmarks/McCat/17-bintr/Makefile Fri Sep 12 11:02:18 2003 @@ -1,4 +1,4 @@ -LEVEL = ../../../../.. +LEVEL = ../../../../../.. include $(LEVEL)/Makefile.config From criswell at cs.uiuc.edu Fri Sep 12 11:06:01 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri Sep 12 11:06:01 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Burg/.cvsignore COPYRIGHT Makefile README b.h be.c burs.c closure.c delta.c doc.tex fe.c fe.h gram.y item.c lex.c list.c main.c map.c nonterminal.c operator.c pattern.c plank.c queue.c rule.c sample.gr string.c symtab.c table.c trim.c zalloc.c Message-ID: <200309121605.LAA06656@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/MultiSource/Burg: .cvsignore (r1.1) removed COPYRIGHT (r1.1) removed Makefile (r1.8) removed README (r1.1) removed b.h (r1.2) removed be.c (r1.1) removed burs.c (r1.2) removed closure.c (r1.1) removed delta.c (r1.1) removed doc.tex (r1.1) removed fe.c (r1.1) removed fe.h (r1.2) removed gram.y (r1.1) removed item.c (r1.1) removed lex.c (r1.1) removed list.c (r1.1) removed main.c (r1.1) removed map.c (r1.1) removed nonterminal.c (r1.1) removed operator.c (r1.1) removed pattern.c (r1.1) removed plank.c (r1.1) removed queue.c (r1.1) removed rule.c (r1.1) removed sample.gr (r1.1) removed string.c (r1.1) removed symtab.c (r1.1) removed table.c (r1.1) removed trim.c (r1.1) removed zalloc.c (r1.2) removed --- Log message: Moved to the Applications directory. --- Diffs of the changes: From criswell at cs.uiuc.edu Fri Sep 12 11:06:12 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri Sep 12 11:06:12 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Benchmarks/Olden/Makefile Message-ID: <200309121603.LAA06515@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/MultiSource/Benchmarks/Olden: Makefile updated: 1.2 -> 1.3 --- Log message: Initial checkin of re-organized MultiSource tree. --- Diffs of the changes: Index: llvm/test/Programs/MultiSource/Benchmarks/Olden/Makefile diff -u llvm/test/Programs/MultiSource/Benchmarks/Olden/Makefile:1.2 llvm/test/Programs/MultiSource/Benchmarks/Olden/Makefile:1.3 --- llvm/test/Programs/MultiSource/Benchmarks/Olden/Makefile:1.2 Mon Aug 18 00:04:36 2003 +++ llvm/test/Programs/MultiSource/Benchmarks/Olden/Makefile Fri Sep 12 11:02:21 2003 @@ -1,6 +1,6 @@ # MultiSource/Olden Makefile: Build all subdirectories automatically -LEVEL = ../../../.. +LEVEL = ../../../../.. PARALLEL_DIRS := $(filter-out %-disabled/, $(sort $(filter-out CVS/, $(wildcard */)))) include $(LEVEL)/test/Programs/Makefile.programs From criswell at cs.uiuc.edu Fri Sep 12 11:06:23 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri Sep 12 11:06:23 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Benchmarks/McCat/18-imp/Makefile Message-ID: <200309121603.LAA06510@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/MultiSource/Benchmarks/McCat/18-imp: Makefile updated: 1.2 -> 1.3 --- Log message: Initial checkin of re-organized MultiSource tree. --- Diffs of the changes: Index: llvm/test/Programs/MultiSource/Benchmarks/McCat/18-imp/Makefile diff -u llvm/test/Programs/MultiSource/Benchmarks/McCat/18-imp/Makefile:1.2 llvm/test/Programs/MultiSource/Benchmarks/McCat/18-imp/Makefile:1.3 --- llvm/test/Programs/MultiSource/Benchmarks/McCat/18-imp/Makefile:1.2 Fri Aug 15 13:59:19 2003 +++ llvm/test/Programs/MultiSource/Benchmarks/McCat/18-imp/Makefile Fri Sep 12 11:02:19 2003 @@ -1,4 +1,4 @@ -LEVEL = ../../../../.. +LEVEL = ../../../../../.. PROG = imp RUN_OPTIONS += sg01.imp LDFLAGS := -lm From criswell at cs.uiuc.edu Fri Sep 12 11:06:34 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri Sep 12 11:06:34 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Benchmarks/Makefile Message-ID: <200309121603.LAA06520@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/MultiSource/Benchmarks: Makefile added (r1.1) --- Log message: Initial checkin of re-organized MultiSource tree. --- Diffs of the changes: Index: llvm/test/Programs/MultiSource/Benchmarks/Makefile diff -c /dev/null llvm/test/Programs/MultiSource/Benchmarks/Makefile:1.1 *** /dev/null Fri Sep 12 11:03:02 2003 --- llvm/test/Programs/MultiSource/Benchmarks/Makefile Fri Sep 12 11:01:51 2003 *************** *** 0 **** --- 1,6 ---- + # MultiSource/Benchmarks Makefile: Build all subdirectories automatically + + LEVEL = ../../../.. + PARALLEL_DIRS := $(filter-out %-disabled/, $(sort $(filter-out CVS/, $(wildcard */)))) + + include $(LEVEL)/test/Programs/Makefile.programs From criswell at cs.uiuc.edu Fri Sep 12 11:06:45 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri Sep 12 11:06:45 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Benchmarks/Olden/bh/Makefile Message-ID: <200309121603.LAA06525@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/MultiSource/Benchmarks/Olden/bh: Makefile updated: 1.9 -> 1.10 --- Log message: Initial checkin of re-organized MultiSource tree. --- Diffs of the changes: Index: llvm/test/Programs/MultiSource/Benchmarks/Olden/bh/Makefile diff -u llvm/test/Programs/MultiSource/Benchmarks/Olden/bh/Makefile:1.9 llvm/test/Programs/MultiSource/Benchmarks/Olden/bh/Makefile:1.10 --- llvm/test/Programs/MultiSource/Benchmarks/Olden/bh/Makefile:1.9 Fri Aug 15 14:05:31 2003 +++ llvm/test/Programs/MultiSource/Benchmarks/Olden/bh/Makefile Fri Sep 12 11:02:22 2003 @@ -1,4 +1,4 @@ -LEVEL = ../../../../.. +LEVEL = ../../../../../.. PROG = bh CPPFLAGS = -DTORONTO From criswell at cs.uiuc.edu Fri Sep 12 11:06:56 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri Sep 12 11:06:56 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Benchmarks/Fhourstones/Makefile Message-ID: <200309121603.LAA06531@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/MultiSource/Benchmarks/Fhourstones: Makefile updated: 1.7 -> 1.8 --- Log message: Initial checkin of re-organized MultiSource tree. --- Diffs of the changes: Index: llvm/test/Programs/MultiSource/Benchmarks/Fhourstones/Makefile diff -u llvm/test/Programs/MultiSource/Benchmarks/Fhourstones/Makefile:1.7 llvm/test/Programs/MultiSource/Benchmarks/Fhourstones/Makefile:1.8 --- llvm/test/Programs/MultiSource/Benchmarks/Fhourstones/Makefile:1.7 Sat Sep 6 10:13:18 2003 +++ llvm/test/Programs/MultiSource/Benchmarks/Fhourstones/Makefile Fri Sep 12 11:01:53 2003 @@ -1,4 +1,4 @@ -LEVEL = ../../../.. +LEVEL = ../../../../.. PROG = fhourstones CPPFLAGS = -DUNIX -DTRANSIZE=1050011 -DPROBES=8 -DREPORTPLY=8 @@ -8,4 +8,4 @@ # Specify which file provides the contents of stdin for the test run STDIN_FILENAME = $(BUILD_SRC_DIR)/input -include ../Makefile.multisrc +include ../../Makefile.multisrc From criswell at cs.uiuc.edu Fri Sep 12 11:07:07 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri Sep 12 11:07:07 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Benchmarks/Olden/bisort/Makefile Message-ID: <200309121603.LAA06536@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/MultiSource/Benchmarks/Olden/bisort: Makefile updated: 1.5 -> 1.6 --- Log message: Initial checkin of re-organized MultiSource tree. --- Diffs of the changes: Index: llvm/test/Programs/MultiSource/Benchmarks/Olden/bisort/Makefile diff -u llvm/test/Programs/MultiSource/Benchmarks/Olden/bisort/Makefile:1.5 llvm/test/Programs/MultiSource/Benchmarks/Olden/bisort/Makefile:1.6 --- llvm/test/Programs/MultiSource/Benchmarks/Olden/bisort/Makefile:1.5 Fri Aug 15 14:05:33 2003 +++ llvm/test/Programs/MultiSource/Benchmarks/Olden/bisort/Makefile Fri Sep 12 11:02:23 2003 @@ -1,4 +1,4 @@ -LEVEL = ../../../../.. +LEVEL = ../../../../../.. PROG = bisort CPPFLAGS = -DTORONTO From criswell at cs.uiuc.edu Fri Sep 12 11:07:18 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri Sep 12 11:07:18 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Benchmarks/Olden/em3d/Makefile Message-ID: <200309121603.LAA06541@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/MultiSource/Benchmarks/Olden/em3d: Makefile updated: 1.5 -> 1.6 --- Log message: Initial checkin of re-organized MultiSource tree. --- Diffs of the changes: Index: llvm/test/Programs/MultiSource/Benchmarks/Olden/em3d/Makefile diff -u llvm/test/Programs/MultiSource/Benchmarks/Olden/em3d/Makefile:1.5 llvm/test/Programs/MultiSource/Benchmarks/Olden/em3d/Makefile:1.6 --- llvm/test/Programs/MultiSource/Benchmarks/Olden/em3d/Makefile:1.5 Fri Aug 15 14:05:33 2003 +++ llvm/test/Programs/MultiSource/Benchmarks/Olden/em3d/Makefile Fri Sep 12 11:02:25 2003 @@ -1,4 +1,4 @@ -LEVEL = ../../../../.. +LEVEL = ../../../../../.. PROG = em3d CPPFLAGS = -DTORONTO From criswell at cs.uiuc.edu Fri Sep 12 11:07:29 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri Sep 12 11:07:29 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Benchmarks/Olden/health/Makefile Message-ID: <200309121603.LAA06546@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/MultiSource/Benchmarks/Olden/health: Makefile updated: 1.12 -> 1.13 --- Log message: Initial checkin of re-organized MultiSource tree. --- Diffs of the changes: Index: llvm/test/Programs/MultiSource/Benchmarks/Olden/health/Makefile diff -u llvm/test/Programs/MultiSource/Benchmarks/Olden/health/Makefile:1.12 llvm/test/Programs/MultiSource/Benchmarks/Olden/health/Makefile:1.13 --- llvm/test/Programs/MultiSource/Benchmarks/Olden/health/Makefile:1.12 Fri Aug 15 14:05:33 2003 +++ llvm/test/Programs/MultiSource/Benchmarks/Olden/health/Makefile Fri Sep 12 11:02:26 2003 @@ -1,4 +1,4 @@ -LEVEL = ../../../../.. +LEVEL = ../../../../../.. PROG = health CPPFLAGS = -DTORONTO From criswell at cs.uiuc.edu Fri Sep 12 11:07:41 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri Sep 12 11:07:41 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Benchmarks/Olden/mst/Makefile Message-ID: <200309121603.LAA06551@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/MultiSource/Benchmarks/Olden/mst: Makefile updated: 1.11 -> 1.12 --- Log message: Initial checkin of re-organized MultiSource tree. --- Diffs of the changes: Index: llvm/test/Programs/MultiSource/Benchmarks/Olden/mst/Makefile diff -u llvm/test/Programs/MultiSource/Benchmarks/Olden/mst/Makefile:1.11 llvm/test/Programs/MultiSource/Benchmarks/Olden/mst/Makefile:1.12 --- llvm/test/Programs/MultiSource/Benchmarks/Olden/mst/Makefile:1.11 Fri Aug 15 14:05:33 2003 +++ llvm/test/Programs/MultiSource/Benchmarks/Olden/mst/Makefile Fri Sep 12 11:02:27 2003 @@ -1,4 +1,4 @@ -LEVEL = ../../../../.. +LEVEL = ../../../../../.. PROG = mst CPPFLAGS = -DTORONTO From criswell at cs.uiuc.edu Fri Sep 12 11:07:51 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri Sep 12 11:07:51 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Benchmarks/Olden/perimeter/Makefile Message-ID: <200309121603.LAA06556@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/MultiSource/Benchmarks/Olden/perimeter: Makefile updated: 1.9 -> 1.10 --- Log message: Initial checkin of re-organized MultiSource tree. --- Diffs of the changes: Index: llvm/test/Programs/MultiSource/Benchmarks/Olden/perimeter/Makefile diff -u llvm/test/Programs/MultiSource/Benchmarks/Olden/perimeter/Makefile:1.9 llvm/test/Programs/MultiSource/Benchmarks/Olden/perimeter/Makefile:1.10 --- llvm/test/Programs/MultiSource/Benchmarks/Olden/perimeter/Makefile:1.9 Fri Aug 15 14:05:33 2003 +++ llvm/test/Programs/MultiSource/Benchmarks/Olden/perimeter/Makefile Fri Sep 12 11:02:28 2003 @@ -1,4 +1,4 @@ -LEVEL = ../../../../.. +LEVEL = ../../../../../.. PROG = perimeter CPPFLAGS = -DTORONTO From criswell at cs.uiuc.edu Fri Sep 12 11:08:02 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri Sep 12 11:08:02 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Benchmarks/McCat/Makefile Message-ID: <200309121603.LAA06561@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/MultiSource/Benchmarks/McCat: Makefile updated: 1.2 -> 1.3 --- Log message: Initial checkin of re-organized MultiSource tree. --- Diffs of the changes: Index: llvm/test/Programs/MultiSource/Benchmarks/McCat/Makefile diff -u llvm/test/Programs/MultiSource/Benchmarks/McCat/Makefile:1.2 llvm/test/Programs/MultiSource/Benchmarks/McCat/Makefile:1.3 --- llvm/test/Programs/MultiSource/Benchmarks/McCat/Makefile:1.2 Mon Aug 18 00:06:28 2003 +++ llvm/test/Programs/MultiSource/Benchmarks/McCat/Makefile Fri Sep 12 11:01:59 2003 @@ -1,6 +1,6 @@ # MultiSource/McCat Makefile: Build all subdirectories automatically -LEVEL = ../../../.. +LEVEL = ../../../../.. PARALLEL_DIRS := $(filter-out %-disabled/, $(sort $(filter-out CVS/, $(wildcard */)))) include $(LEVEL)/test/Programs/Makefile.programs From criswell at cs.uiuc.edu Fri Sep 12 11:08:13 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri Sep 12 11:08:13 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Benchmarks/Olden/power/Makefile Message-ID: <200309121603.LAA06566@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/MultiSource/Benchmarks/Olden/power: Makefile updated: 1.2 -> 1.3 --- Log message: Initial checkin of re-organized MultiSource tree. --- Diffs of the changes: Index: llvm/test/Programs/MultiSource/Benchmarks/Olden/power/Makefile diff -u llvm/test/Programs/MultiSource/Benchmarks/Olden/power/Makefile:1.2 llvm/test/Programs/MultiSource/Benchmarks/Olden/power/Makefile:1.3 --- llvm/test/Programs/MultiSource/Benchmarks/Olden/power/Makefile:1.2 Fri Aug 15 14:05:33 2003 +++ llvm/test/Programs/MultiSource/Benchmarks/Olden/power/Makefile Fri Sep 12 11:02:29 2003 @@ -1,4 +1,4 @@ -LEVEL = ../../../../.. +LEVEL = ../../../../../.. PROG = power CPPFLAGS = -DTORONTO From criswell at cs.uiuc.edu Fri Sep 12 11:08:24 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri Sep 12 11:08:24 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Benchmarks/McCat/01-qbsort/Makefile Message-ID: <200309121603.LAA06571@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/MultiSource/Benchmarks/McCat/01-qbsort: Makefile updated: 1.4 -> 1.5 --- Log message: Initial checkin of re-organized MultiSource tree. --- Diffs of the changes: Index: llvm/test/Programs/MultiSource/Benchmarks/McCat/01-qbsort/Makefile diff -u llvm/test/Programs/MultiSource/Benchmarks/McCat/01-qbsort/Makefile:1.4 llvm/test/Programs/MultiSource/Benchmarks/McCat/01-qbsort/Makefile:1.5 --- llvm/test/Programs/MultiSource/Benchmarks/McCat/01-qbsort/Makefile:1.4 Sat Sep 6 10:13:21 2003 +++ llvm/test/Programs/MultiSource/Benchmarks/McCat/01-qbsort/Makefile Fri Sep 12 11:02:00 2003 @@ -1,4 +1,4 @@ -LEVEL = ../../../../.. +LEVEL = ../../../../../.. PROG = qbsort LDFLAGS = -lm #RUN_OPTIONS += From criswell at cs.uiuc.edu Fri Sep 12 11:08:35 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri Sep 12 11:08:35 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Benchmarks/Olden/treeadd/Makefile Message-ID: <200309121603.LAA06577@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/MultiSource/Benchmarks/Olden/treeadd: Makefile updated: 1.8 -> 1.9 --- Log message: Initial checkin of re-organized MultiSource tree. --- Diffs of the changes: Index: llvm/test/Programs/MultiSource/Benchmarks/Olden/treeadd/Makefile diff -u llvm/test/Programs/MultiSource/Benchmarks/Olden/treeadd/Makefile:1.8 llvm/test/Programs/MultiSource/Benchmarks/Olden/treeadd/Makefile:1.9 --- llvm/test/Programs/MultiSource/Benchmarks/Olden/treeadd/Makefile:1.8 Fri Aug 15 14:05:33 2003 +++ llvm/test/Programs/MultiSource/Benchmarks/Olden/treeadd/Makefile Fri Sep 12 11:02:31 2003 @@ -1,4 +1,4 @@ -LEVEL = ../../../../.. +LEVEL = ../../../../../.. PROG = treeadd CPPFLAGS = -DTORONTO From criswell at cs.uiuc.edu Fri Sep 12 11:08:45 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri Sep 12 11:08:45 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Benchmarks/Olden/tsp/Makefile Message-ID: <200309121603.LAA06587@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/MultiSource/Benchmarks/Olden/tsp: Makefile updated: 1.4 -> 1.5 --- Log message: Initial checkin of re-organized MultiSource tree. --- Diffs of the changes: Index: llvm/test/Programs/MultiSource/Benchmarks/Olden/tsp/Makefile diff -u llvm/test/Programs/MultiSource/Benchmarks/Olden/tsp/Makefile:1.4 llvm/test/Programs/MultiSource/Benchmarks/Olden/tsp/Makefile:1.5 --- llvm/test/Programs/MultiSource/Benchmarks/Olden/tsp/Makefile:1.4 Fri Aug 15 14:05:33 2003 +++ llvm/test/Programs/MultiSource/Benchmarks/Olden/tsp/Makefile Fri Sep 12 11:02:32 2003 @@ -1,4 +1,4 @@ -LEVEL = ../../../../.. +LEVEL = ../../../../../.. PROG = tsp CPPFLAGS = -DTORONTO From criswell at cs.uiuc.edu Fri Sep 12 11:08:57 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri Sep 12 11:08:57 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Benchmarks/McCat/03-testtrie/Makefile Message-ID: <200309121603.LAA06582@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/MultiSource/Benchmarks/McCat/03-testtrie: Makefile updated: 1.3 -> 1.4 --- Log message: Initial checkin of re-organized MultiSource tree. --- Diffs of the changes: Index: llvm/test/Programs/MultiSource/Benchmarks/McCat/03-testtrie/Makefile diff -u llvm/test/Programs/MultiSource/Benchmarks/McCat/03-testtrie/Makefile:1.3 llvm/test/Programs/MultiSource/Benchmarks/McCat/03-testtrie/Makefile:1.4 --- llvm/test/Programs/MultiSource/Benchmarks/McCat/03-testtrie/Makefile:1.3 Fri Aug 15 13:59:14 2003 +++ llvm/test/Programs/MultiSource/Benchmarks/McCat/03-testtrie/Makefile Fri Sep 12 11:02:01 2003 @@ -1,4 +1,4 @@ -LEVEL = ../../../../.. +LEVEL = ../../../../../.. PROG = testtrie LDFLAGS = -lm RUN_OPTIONS += testtrie.in2 From criswell at cs.uiuc.edu Fri Sep 12 11:09:08 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri Sep 12 11:09:08 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Benchmarks/McCat/04-bisect/Makefile Message-ID: <200309121603.LAA06592@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/MultiSource/Benchmarks/McCat/04-bisect: Makefile updated: 1.5 -> 1.6 --- Log message: Initial checkin of re-organized MultiSource tree. --- Diffs of the changes: Index: llvm/test/Programs/MultiSource/Benchmarks/McCat/04-bisect/Makefile diff -u llvm/test/Programs/MultiSource/Benchmarks/McCat/04-bisect/Makefile:1.5 llvm/test/Programs/MultiSource/Benchmarks/McCat/04-bisect/Makefile:1.6 --- llvm/test/Programs/MultiSource/Benchmarks/McCat/04-bisect/Makefile:1.5 Sat Sep 6 10:13:23 2003 +++ llvm/test/Programs/MultiSource/Benchmarks/McCat/04-bisect/Makefile Fri Sep 12 11:02:03 2003 @@ -1,4 +1,4 @@ -LEVEL = ../../../../.. +LEVEL = ../../../../../.. PROG = bisect LDFLAGS = -lm #RUN_OPTIONS += From criswell at cs.uiuc.edu Fri Sep 12 11:09:19 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri Sep 12 11:09:19 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Benchmarks/Olden/voronoi/Makefile Message-ID: <200309121603.LAA06597@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/MultiSource/Benchmarks/Olden/voronoi: Makefile updated: 1.8 -> 1.9 --- Log message: Initial checkin of re-organized MultiSource tree. --- Diffs of the changes: Index: llvm/test/Programs/MultiSource/Benchmarks/Olden/voronoi/Makefile diff -u llvm/test/Programs/MultiSource/Benchmarks/Olden/voronoi/Makefile:1.8 llvm/test/Programs/MultiSource/Benchmarks/Olden/voronoi/Makefile:1.9 --- llvm/test/Programs/MultiSource/Benchmarks/Olden/voronoi/Makefile:1.8 Fri Aug 15 14:05:33 2003 +++ llvm/test/Programs/MultiSource/Benchmarks/Olden/voronoi/Makefile Fri Sep 12 11:02:33 2003 @@ -1,4 +1,4 @@ -LEVEL = ../../../../.. +LEVEL = ../../../../../.. PROG = voronoi INCLUDES = defines.h From criswell at cs.uiuc.edu Fri Sep 12 11:09:30 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri Sep 12 11:09:30 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Benchmarks/Ptrdist/Makefile Message-ID: <200309121603.LAA06607@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/MultiSource/Benchmarks/Ptrdist: Makefile updated: 1.2 -> 1.3 --- Log message: Initial checkin of re-organized MultiSource tree. --- Diffs of the changes: Index: llvm/test/Programs/MultiSource/Benchmarks/Ptrdist/Makefile diff -u llvm/test/Programs/MultiSource/Benchmarks/Ptrdist/Makefile:1.2 llvm/test/Programs/MultiSource/Benchmarks/Ptrdist/Makefile:1.3 --- llvm/test/Programs/MultiSource/Benchmarks/Ptrdist/Makefile:1.2 Mon Aug 18 00:06:31 2003 +++ llvm/test/Programs/MultiSource/Benchmarks/Ptrdist/Makefile Fri Sep 12 11:02:35 2003 @@ -1,6 +1,6 @@ # MultiSource/Ptrdist Makefile: Build all subdirectories automatically -LEVEL = ../../../.. +LEVEL = ../../../../.. PARALLEL_DIRS := $(filter-out %-disabled/, $(sort $(filter-out CVS/, $(wildcard */)))) include $(LEVEL)/test/Programs/Makefile.programs From criswell at cs.uiuc.edu Fri Sep 12 11:09:41 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri Sep 12 11:09:41 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Benchmarks/OptimizerEval/Makefile Message-ID: <200309121603.LAA06602@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/MultiSource/Benchmarks/OptimizerEval: Makefile updated: 1.2 -> 1.3 --- Log message: Initial checkin of re-organized MultiSource tree. --- Diffs of the changes: Index: llvm/test/Programs/MultiSource/Benchmarks/OptimizerEval/Makefile diff -u llvm/test/Programs/MultiSource/Benchmarks/OptimizerEval/Makefile:1.2 llvm/test/Programs/MultiSource/Benchmarks/OptimizerEval/Makefile:1.3 --- llvm/test/Programs/MultiSource/Benchmarks/OptimizerEval/Makefile:1.2 Thu May 8 23:11:47 2003 +++ llvm/test/Programs/MultiSource/Benchmarks/OptimizerEval/Makefile Fri Sep 12 11:02:34 2003 @@ -1,4 +1,4 @@ -LEVEL = ../../../.. +LEVEL = ../../../../.. PROG = optimizer-eval CPPFLAGS = LDFLAGS = -lm @@ -6,4 +6,4 @@ # This program is a timing related test PROGRAM_IS_NONDETERMINISTIC = 1 -include ../Makefile.multisrc +include ../../Makefile.multisrc From criswell at cs.uiuc.edu Fri Sep 12 11:09:53 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri Sep 12 11:09:53 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Benchmarks/Ptrdist/anagram/Makefile Message-ID: <200309121603.LAA06612@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/MultiSource/Benchmarks/Ptrdist/anagram: Makefile updated: 1.5 -> 1.6 --- Log message: Initial checkin of re-organized MultiSource tree. --- Diffs of the changes: Index: llvm/test/Programs/MultiSource/Benchmarks/Ptrdist/anagram/Makefile diff -u llvm/test/Programs/MultiSource/Benchmarks/Ptrdist/anagram/Makefile:1.5 llvm/test/Programs/MultiSource/Benchmarks/Ptrdist/anagram/Makefile:1.6 --- llvm/test/Programs/MultiSource/Benchmarks/Ptrdist/anagram/Makefile:1.5 Sat Sep 6 10:13:34 2003 +++ llvm/test/Programs/MultiSource/Benchmarks/Ptrdist/anagram/Makefile Fri Sep 12 11:02:36 2003 @@ -1,4 +1,4 @@ -LEVEL=../../../../.. +LEVEL=../../../../../.. include $(LEVEL)/Makefile.config From criswell at cs.uiuc.edu Fri Sep 12 11:10:04 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri Sep 12 11:10:04 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Benchmarks/Ptrdist/bc/Makefile Message-ID: <200309121603.LAA06617@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/MultiSource/Benchmarks/Ptrdist/bc: Makefile updated: 1.4 -> 1.5 --- Log message: Initial checkin of re-organized MultiSource tree. --- Diffs of the changes: Index: llvm/test/Programs/MultiSource/Benchmarks/Ptrdist/bc/Makefile diff -u llvm/test/Programs/MultiSource/Benchmarks/Ptrdist/bc/Makefile:1.4 llvm/test/Programs/MultiSource/Benchmarks/Ptrdist/bc/Makefile:1.5 --- llvm/test/Programs/MultiSource/Benchmarks/Ptrdist/bc/Makefile:1.4 Sat Sep 6 10:13:37 2003 +++ llvm/test/Programs/MultiSource/Benchmarks/Ptrdist/bc/Makefile Fri Sep 12 11:02:37 2003 @@ -1,4 +1,4 @@ -LEVEL = ../../../../.. +LEVEL = ../../../../../.. include $(LEVEL)/Makefile.config From criswell at cs.uiuc.edu Fri Sep 12 11:14:02 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri Sep 12 11:14:02 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Fhourstones/Makefile Makefile.original README_LLVM.txt c4.c c4.h input play.c time.c trans.c types.h Message-ID: <200309121613.LAA06852@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/MultiSource/Fhourstones: Makefile (r1.7) removed Makefile.original (r1.1) removed README_LLVM.txt (r1.1) removed c4.c (r1.1) removed c4.h (r1.1) removed input (r1.1) removed play.c (r1.1) removed time.c (r1.2) removed trans.c (r1.2) removed types.h (r1.1) removed --- Log message: Moved to MultiSource/Benchmarks. --- Diffs of the changes: From criswell at cs.uiuc.edu Fri Sep 12 11:14:15 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri Sep 12 11:14:15 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Olden/Makefile README.txt Message-ID: <200309121613.LAA06864@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/MultiSource/Olden: Makefile (r1.2) removed README.txt (r1.1) removed --- Log message: Moved to MultiSource/Benchmarks. --- Diffs of the changes: From criswell at cs.uiuc.edu Fri Sep 12 11:16:03 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri Sep 12 11:16:03 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/McCat/Makefile Message-ID: <200309121615.LAA06920@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/MultiSource/McCat: Makefile (r1.2) removed --- Log message: Moved to llvm/test/Programs/MultiSource/Benchmarks. --- Diffs of the changes: From criswell at cs.uiuc.edu Fri Sep 12 11:16:16 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri Sep 12 11:16:16 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/McCat/01-qbsort/Makefile benchmark.c benchmark.in1 benchmark.in2 benchmark.in3 readlist.c readlist.h sort.c sort.h Message-ID: <200309121615.LAA06926@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/MultiSource/McCat/01-qbsort: Makefile (r1.4) removed benchmark.c (r1.1) removed benchmark.in1 (r1.1) removed benchmark.in2 (r1.1) removed benchmark.in3 (r1.1) removed readlist.c (r1.1) removed readlist.h (r1.1) removed sort.c (r1.1) removed sort.h (r1.1) removed --- Log message: Moved to llvm/test/Programs/MultiSource/Benchmarks. --- Diffs of the changes: From criswell at cs.uiuc.edu Fri Sep 12 11:16:28 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri Sep 12 11:16:28 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/McCat/03-testtrie/Makefile charsequence.c charsequence.h main.c testtrie.in2 trie.c trie.h Message-ID: <200309121615.LAA06937@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/MultiSource/McCat/03-testtrie: Makefile (r1.3) removed charsequence.c (r1.1) removed charsequence.h (r1.1) removed main.c (r1.1) removed testtrie.in2 (r1.1) removed trie.c (r1.1) removed trie.h (r1.1) removed --- Log message: Moved to llvm/test/Programs/MultiSource/Benchmarks. --- Diffs of the changes: From criswell at cs.uiuc.edu Fri Sep 12 11:16:39 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri Sep 12 11:16:39 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/McCat/04-bisect/Makefile README allocvector.c allocvector.h bisect_test.c bisect_test.in dbisect.c dbisect.h Message-ID: <200309121615.LAA06942@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/MultiSource/McCat/04-bisect: Makefile (r1.5) removed README (r1.1) removed allocvector.c (r1.1) removed allocvector.h (r1.1) removed bisect_test.c (r1.1) removed bisect_test.in (r1.1) removed dbisect.c (r1.1) removed dbisect.h (r1.1) removed --- Log message: Moved to llvm/test/Programs/MultiSource/Benchmarks. --- Diffs of the changes: From criswell at cs.uiuc.edu Fri Sep 12 11:16:51 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri Sep 12 11:16:51 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/McCat/05-eks/Divsol.c Divsol.h Jacobi.c Jacobi.h MM.c MM.h Makefile QRfact.c QRfact.h README Triang.c Triang.h main.c main.h print.c print.h val2 val3 val4 val5 Message-ID: <200309121615.LAA06950@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/MultiSource/McCat/05-eks: Divsol.c (r1.1) removed Divsol.h (r1.1) removed Jacobi.c (r1.1) removed Jacobi.h (r1.1) removed MM.c (r1.1) removed MM.h (r1.1) removed Makefile (r1.3) removed QRfact.c (r1.1) removed QRfact.h (r1.1) removed README (r1.1) removed Triang.c (r1.1) removed Triang.h (r1.1) removed main.c (r1.1) removed main.h (r1.1) removed print.c (r1.1) removed print.h (r1.1) removed val2 (r1.1) removed val3 (r1.1) removed val4 (r1.1) removed val5 (r1.1) removed --- Log message: Moved to llvm/test/Programs/MultiSource/Benchmarks. --- Diffs of the changes: From criswell at cs.uiuc.edu Fri Sep 12 11:17:02 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri Sep 12 11:17:02 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/McCat/08-main/Includes.h Makefile convert.c header.h main.c object.c trig.c types.h Message-ID: <200309121615.LAA06958@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/MultiSource/McCat/08-main: Includes.h (r1.1) removed Makefile (r1.4) removed convert.c (r1.1) removed header.h (r1.1) removed main.c (r1.1) removed object.c (r1.3) removed trig.c (r1.1) removed types.h (r1.1) removed --- Log message: Moved to llvm/test/Programs/MultiSource/Benchmarks. --- Diffs of the changes: From criswell at cs.uiuc.edu Fri Sep 12 11:17:15 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri Sep 12 11:17:15 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/McCat/09-vor/Makefile ch.c headers.h intersec.c pointlis.c splay.c splay2.c struktur.h vor.c vor.in-tiny vor.in1 vor.in2 vor.in3 Message-ID: <200309121615.LAA06978@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/MultiSource/McCat/09-vor: Makefile (r1.4) removed ch.c (r1.1) removed headers.h (r1.1) removed intersec.c (r1.1) removed pointlis.c (r1.1) removed splay.c (r1.1) removed splay2.c (r1.1) removed struktur.h (r1.1) removed vor.c (r1.1) removed vor.in-tiny (r1.1) removed vor.in1 (r1.1) removed vor.in2 (r1.1) removed vor.in3 (r1.1) removed --- Log message: Moved to llvm/test/Programs/MultiSource/Benchmarks. --- Diffs of the changes: From criswell at cs.uiuc.edu Fri Sep 12 11:17:27 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri Sep 12 11:17:27 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/McCat/12-IOtest/IOtest.c IOtest.h IOtest.readme IOtestA.c IOtestB.c IOtestC.c Makefile Message-ID: <200309121615.LAA06983@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/MultiSource/McCat/12-IOtest: IOtest.c (r1.1) removed IOtest.h (r1.1) removed IOtest.readme (r1.1) removed IOtestA.c (r1.1) removed IOtestB.c (r1.1) removed IOtestC.c (r1.1) removed Makefile (r1.2) removed --- Log message: Moved to llvm/test/Programs/MultiSource/Benchmarks. --- Diffs of the changes: From criswell at cs.uiuc.edu Fri Sep 12 11:17:40 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri Sep 12 11:17:40 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/McCat/15-trie/Makefile trie.c trie.in1 trie.in2 Message-ID: <200309121615.LAA06989@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/MultiSource/McCat/15-trie: Makefile (r1.2) removed trie.c (r1.1) removed trie.in1 (r1.1) removed trie.in2 (r1.1) removed --- Log message: Moved to llvm/test/Programs/MultiSource/Benchmarks. --- Diffs of the changes: From criswell at cs.uiuc.edu Fri Sep 12 11:18:01 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri Sep 12 11:18:01 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/aha/Makefile aha.c aha.h aha.pdf read.me userfun.c Message-ID: <200309121617.LAA07171@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/MultiSource/aha: Makefile (r1.4) removed aha.c (r1.2) removed aha.h (r1.2) removed aha.pdf (r1.1) removed read.me (r1.1) removed userfun.c (r1.1) removed --- Log message: Moved to llvm/test/Programs/MultiSource/Applications. --- Diffs of the changes: From criswell at cs.uiuc.edu Fri Sep 12 11:18:14 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri Sep 12 11:18:14 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/McCat/18-imp/L_canny.c Makefile V.h V_commands.h debug.h main.c pgm.c pgm.h sg01.imp sg01.pgm textloc.c textloc.h Message-ID: <200309121616.LAA07005@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/MultiSource/McCat/18-imp: L_canny.c (r1.1) removed Makefile (r1.2) removed V.h (r1.1) removed V_commands.h (r1.1) removed debug.h (r1.1) removed main.c (r1.1) removed pgm.c (r1.1) removed pgm.h (r1.1) removed sg01.imp (r1.1) removed sg01.pgm (r1.1) removed textloc.c (r1.1) removed textloc.h (r1.1) removed --- Log message: Moved to llvm/test/Programs/MultiSource/Benchmarks. --- Diffs of the changes: From criswell at cs.uiuc.edu Fri Sep 12 11:18:25 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri Sep 12 11:18:25 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/McCat/17-bintr/Makefile bintree.c bintree.h bnchmrk.c bnchmrk.in1 general.h Message-ID: <200309121616.LAA06997@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/MultiSource/McCat/17-bintr: Makefile (r1.4) removed bintree.c (r1.1) removed bintree.h (r1.1) removed bnchmrk.c (r1.1) removed bnchmrk.in1 (r1.1) removed general.h (r1.1) removed --- Log message: Moved to llvm/test/Programs/MultiSource/Benchmarks. --- Diffs of the changes: From criswell at cs.uiuc.edu Fri Sep 12 11:18:37 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri Sep 12 11:18:37 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Olden/bh/Makefile args.c code.h defs.h newbh.c stdinc.h util.c vectmath.h walksub.c Message-ID: <200309121616.LAA07013@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/MultiSource/Olden/bh: Makefile (r1.9) removed args.c (r1.3) removed code.h (r1.1) removed defs.h (r1.4) removed newbh.c (r1.7) removed stdinc.h (r1.2) removed util.c (r1.2) removed vectmath.h (r1.1) removed walksub.c (r1.1) removed --- Log message: Moved to llvm/test/Programs/MultiSource/Benchmarks. --- Diffs of the changes: From criswell at cs.uiuc.edu Fri Sep 12 11:18:48 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri Sep 12 11:18:48 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Olden/bisort/Makefile args.c bitonic.c node.h proc.h Message-ID: <200309121616.LAA07021@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/MultiSource/Olden/bisort: Makefile (r1.5) removed args.c (r1.4) removed bitonic.c (r1.4) removed node.h (r1.1) removed proc.h (r1.1) removed --- Log message: Moved to llvm/test/Programs/MultiSource/Benchmarks. --- Diffs of the changes: From criswell at cs.uiuc.edu Fri Sep 12 11:18:59 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri Sep 12 11:18:59 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Olden/em3d/Makefile args.c em3d.c em3d.h main.c make_graph.c make_graph.h util.c util.h Message-ID: <200309121616.LAA07026@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/MultiSource/Olden/em3d: Makefile (r1.5) removed args.c (r1.1) removed em3d.c (r1.2) removed em3d.h (r1.2) removed main.c (r1.3) removed make_graph.c (r1.4) removed make_graph.h (r1.1) removed util.c (r1.2) removed util.h (r1.1) removed --- Log message: Moved to llvm/test/Programs/MultiSource/Benchmarks. --- Diffs of the changes: From criswell at cs.uiuc.edu Fri Sep 12 11:19:09 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri Sep 12 11:19:09 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Olden/health/Makefile args.c health.c health.h list.c poisson.c Message-ID: <200309121616.LAA07032@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/MultiSource/Olden/health: Makefile (r1.12) removed args.c (r1.6) removed health.c (r1.12) removed health.h (r1.11) removed list.c (r1.4) removed poisson.c (r1.4) removed --- Log message: Moved to llvm/test/Programs/MultiSource/Benchmarks. --- Diffs of the changes: From criswell at cs.uiuc.edu Fri Sep 12 11:19:20 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri Sep 12 11:19:20 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Olden/mst/Makefile args.c hash.c hash.h main.c makegraph.c mst.h Message-ID: <200309121616.LAA07040@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/MultiSource/Olden/mst: Makefile (r1.11) removed args.c (r1.5) removed hash.c (r1.5) removed hash.h (r1.2) removed main.c (r1.5) removed makegraph.c (r1.5) removed mst.h (r1.4) removed --- Log message: Moved to llvm/test/Programs/MultiSource/Benchmarks. --- Diffs of the changes: From criswell at cs.uiuc.edu Fri Sep 12 11:19:31 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri Sep 12 11:19:31 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Olden/perimeter/Makefile args.c main.c maketree.c perimeter.h Message-ID: <200309121616.LAA07048@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/MultiSource/Olden/perimeter: Makefile (r1.9) removed args.c (r1.3) removed main.c (r1.3) removed maketree.c (r1.1) removed perimeter.h (r1.1) removed --- Log message: Moved to llvm/test/Programs/MultiSource/Benchmarks. --- Diffs of the changes: From criswell at cs.uiuc.edu Fri Sep 12 11:19:42 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri Sep 12 11:19:42 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Olden/power/Makefile build.c compute.c main.c power.h Message-ID: <200309121616.LAA07053@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/MultiSource/Olden/power: Makefile (r1.2) removed build.c (r1.3) removed compute.c (r1.2) removed main.c (r1.5) removed power.h (r1.4) removed --- Log message: Moved to llvm/test/Programs/MultiSource/Benchmarks. --- Diffs of the changes: From criswell at cs.uiuc.edu Fri Sep 12 11:19:53 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri Sep 12 11:19:53 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Olden/treeadd/Makefile args.c node.c par-alloc.c tree.h Message-ID: <200309121616.LAA07064@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/MultiSource/Olden/treeadd: Makefile (r1.8) removed args.c (r1.4) removed node.c (r1.3) removed par-alloc.c (r1.3) removed tree.h (r1.2) removed --- Log message: Moved to llvm/test/Programs/MultiSource/Benchmarks. --- Diffs of the changes: From criswell at cs.uiuc.edu Fri Sep 12 11:20:04 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri Sep 12 11:20:04 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Olden/tsp/Makefile args.c build.c main.c tsp.c tsp.h Message-ID: <200309121616.LAA07075@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/MultiSource/Olden/tsp: Makefile (r1.4) removed args.c (r1.3) removed build.c (r1.1) removed main.c (r1.2) removed tsp.c (r1.2) removed tsp.h (r1.2) removed --- Log message: Moved to llvm/test/Programs/MultiSource/Benchmarks. --- Diffs of the changes: From criswell at cs.uiuc.edu Fri Sep 12 11:20:16 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri Sep 12 11:20:16 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Olden/voronoi/Makefile args.c defines.h newvor.c output.c vector.c Message-ID: <200309121616.LAA07086@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/MultiSource/Olden/voronoi: Makefile (r1.8) removed args.c (r1.1) removed defines.h (r1.3) removed newvor.c (r1.2) removed output.c (r1.1) removed vector.c (r1.1) removed --- Log message: Moved to llvm/test/Programs/MultiSource/Benchmarks. --- Diffs of the changes: From criswell at cs.uiuc.edu Fri Sep 12 11:20:27 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri Sep 12 11:20:27 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/OptimizerEval/Makefile README.txt cprop.c dead.c evalopt.ps global.h main.c motion.c strength.c valnum.c Message-ID: <200309121616.LAA07093@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/MultiSource/OptimizerEval: Makefile (r1.2) removed README.txt (r1.1) removed cprop.c (r1.1) removed dead.c (r1.1) removed evalopt.ps (r1.1) removed global.h (r1.1) removed main.c (r1.2) removed motion.c (r1.1) removed strength.c (r1.1) removed valnum.c (r1.1) removed --- Log message: Moved to llvm/test/Programs/MultiSource/Benchmarks. --- Diffs of the changes: From criswell at cs.uiuc.edu Fri Sep 12 11:20:37 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri Sep 12 11:20:37 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Ptrdist/Makefile README.txt Message-ID: <200309121616.LAA07098@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/MultiSource/Ptrdist: Makefile (r1.2) removed README.txt (r1.1) removed --- Log message: Moved to llvm/test/Programs/MultiSource/Benchmarks. --- Diffs of the changes: From criswell at cs.uiuc.edu Fri Sep 12 11:20:49 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri Sep 12 11:20:49 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Ptrdist/anagram/Makefile anagram.c input.OUT input.in words Message-ID: <200309121616.LAA07104@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/MultiSource/Ptrdist/anagram: Makefile (r1.5) removed anagram.c (r1.1) removed input.OUT (r1.1) removed input.in (r1.1) removed words (r1.1) removed --- Log message: Moved to llvm/test/Programs/MultiSource/Benchmarks. --- Diffs of the changes: From criswell at cs.uiuc.edu Fri Sep 12 11:21:00 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri Sep 12 11:21:00 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Ptrdist/ft/Fheap.c Fheap.h Fsanity.c Fsanity.h Fstruct.h Makefile ft-1c1c.OUT ft-1k2k.OUT ft.c graph.c graph.h item.c item.h random.c-back Message-ID: <200309121616.LAA07115@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/MultiSource/Ptrdist/ft: Fheap.c (r1.1) removed Fheap.h (r1.1) removed Fsanity.c (r1.2) removed Fsanity.h (r1.1) removed Fstruct.h (r1.1) removed Makefile (r1.5) removed ft-1c1c.OUT (r1.1) removed ft-1k2k.OUT (r1.1) removed ft.c (r1.2) removed graph.c (r1.1) removed graph.h (r1.1) removed item.c (r1.1) removed item.h (r1.1) removed random.c-back (r1.1) removed --- Log message: Moved to llvm/test/Programs/MultiSource/Benchmarks. --- Diffs of the changes: From criswell at cs.uiuc.edu Fri Sep 12 11:21:12 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri Sep 12 11:21:12 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Ptrdist/bc/COPYING Makefile array.b bc.c bc.y.dist bcdefs.h config.h const.h etest.b execute.c fact.b fix_math.h global.c global.h libmath.b load.c main.c math.h number.c number.h primes.OUT primes.b proto.h sbc.y-backup scan.c scan.l.dist sqrt.b storage.c util.c version.h y.tab.h Message-ID: <200309121616.LAA07109@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/MultiSource/Ptrdist/bc: COPYING (r1.1) removed Makefile (r1.4) removed array.b (r1.1) removed bc.c (r1.1) removed bc.y.dist (r1.1) removed bcdefs.h (r1.1) removed config.h (r1.1) removed const.h (r1.2) removed etest.b (r1.1) removed execute.c (r1.1) removed fact.b (r1.1) removed fix_math.h (r1.1) removed global.c (r1.1) removed global.h (r1.1) removed libmath.b (r1.1) removed load.c (r1.1) removed main.c (r1.1) removed math.h (r1.1) removed number.c (r1.1) removed number.h (r1.1) removed primes.OUT (r1.1) removed primes.b (r1.4) removed proto.h (r1.1) removed sbc.y-backup (r1.1) removed scan.c (r1.1) removed scan.l.dist (r1.1) removed sqrt.b (r1.1) removed storage.c (r1.1) removed util.c (r1.1) removed version.h (r1.1) removed y.tab.h (r1.1) removed --- Log message: Moved to llvm/test/Programs/MultiSource/Benchmarks. --- Diffs of the changes: From criswell at cs.uiuc.edu Fri Sep 12 11:21:24 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri Sep 12 11:21:24 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Ptrdist/ks/COPYING KL-1.OUT KL-1.in KL-2.OUT KL-2.in KL-3.in KL-4.in KL-5.in KL-6.in KS-1.c KS-2.c KS.h Makefile Message-ID: <200309121616.LAA07120@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/MultiSource/Ptrdist/ks: COPYING (r1.1) removed KL-1.OUT (r1.1) removed KL-1.in (r1.1) removed KL-2.OUT (r1.1) removed KL-2.in (r1.1) removed KL-3.in (r1.1) removed KL-4.in (r1.1) removed KL-5.in (r1.1) removed KL-6.in (r1.1) removed KS-1.c (r1.1) removed KS-2.c (r1.1) removed KS.h (r1.1) removed Makefile (r1.6) removed --- Log message: Moved to llvm/test/Programs/MultiSource/Benchmarks. --- Diffs of the changes: From criswell at cs.uiuc.edu Fri Sep 12 11:21:35 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri Sep 12 11:21:35 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Ptrdist/yacr2/COPYING Makefile assign.c assign.h channel.c channel.h hcg.c hcg.h input1.OUT input1.in input2.OUT input2.in input3.in main.c maze.c maze.h option.c option.h types.h vcg.c vcg.h Message-ID: <200309121616.LAA07125@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/MultiSource/Ptrdist/yacr2: COPYING (r1.1) removed Makefile (r1.2) removed assign.c (r1.1) removed assign.h (r1.1) removed channel.c (r1.1) removed channel.h (r1.1) removed hcg.c (r1.1) removed hcg.h (r1.1) removed input1.OUT (r1.1) removed input1.in (r1.1) removed input2.OUT (r1.1) removed input2.in (r1.1) removed input3.in (r1.1) removed main.c (r1.2) removed maze.c (r1.1) removed maze.h (r1.1) removed option.c (r1.1) removed option.h (r1.1) removed types.h (r1.1) removed vcg.c (r1.1) removed vcg.h (r1.1) removed --- Log message: Moved to llvm/test/Programs/MultiSource/Benchmarks. --- Diffs of the changes: From criswell at cs.uiuc.edu Fri Sep 12 11:22:01 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri Sep 12 11:22:01 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/sgefa/Makefile READ.ME blas.c driver.c ge.h sgefa.c sgefat.reference.output sgesl.c Message-ID: <200309121618.LAA07187@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/MultiSource/sgefa: Makefile (r1.2) removed READ.ME (r1.1) removed blas.c (r1.1) removed driver.c (r1.2) removed ge.h (r1.1) removed sgefa.c (r1.1) removed sgefat.reference.output (r1.1) removed sgesl.c (r1.1) removed --- Log message: Moved to llvm/test/Programs/MultiSource/Applications. --- Diffs of the changes: From criswell at cs.uiuc.edu Fri Sep 12 11:22:13 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri Sep 12 11:22:13 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/llubenchmark/Makefile llubenchmark.c Message-ID: <200309121618.LAA07179@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/MultiSource/llubenchmark: Makefile (r1.1) removed llubenchmark.c (r1.1) removed --- Log message: Moved to llvm/test/Programs/MultiSource/Benchmarks. --- Diffs of the changes: From criswell at cs.uiuc.edu Fri Sep 12 11:22:26 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri Sep 12 11:22:26 2003 Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/sim/.cvsignore Makefile liv.42-48 sim.bat sim.c sim.doc sim.tbl tob.38-44 Message-ID: <200309121618.LAA07194@choi.cs.uiuc.edu> Changes in directory llvm/test/Programs/MultiSource/sim: .cvsignore (r1.1) removed Makefile (r1.3) removed liv.42-48 (r1.1) removed sim.bat (r1.1) removed sim.c (r1.5) removed sim.doc (r1.1) removed sim.tbl (r1.1) removed tob.38-44 (r1.1) removed --- Log message: Moved to llvm/test/Programs/MultiSource/Benchmarks. --- Diffs of the changes: From criswell at cs.uiuc.edu Fri Sep 12 11:32:02 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri Sep 12 11:32:02 2003 Subject: [llvm-commits] CVS: llvm/configure Message-ID: <200309121631.LAA17143@choi.cs.uiuc.edu> Changes in directory llvm: configure updated: 1.19 -> 1.20 --- Log message: Updated for the re-organization of llvm/test/Programs/MultiSource. --- Diffs of the changes: Index: llvm/configure diff -u llvm/configure:1.19 llvm/configure:1.20 --- llvm/configure:1.19 Thu Sep 11 15:53:46 2003 +++ llvm/configure Fri Sep 12 11:31:41 2003 @@ -1778,109 +1778,115 @@ ac_config_commands="$ac_config_commands test/Programs/MultiSource/Makefile.multisrc" - ac_config_commands="$ac_config_commands test/Programs/MultiSource/Burg/Makefile" + ac_config_commands="$ac_config_commands test/Programs/MultiSource/Applications/Makefile" - ac_config_commands="$ac_config_commands test/Programs/MultiSource/Fhourstones/Makefile" + ac_config_commands="$ac_config_commands test/Programs/MultiSource/Applications/Burg/Makefile" - ac_config_commands="$ac_config_commands test/Programs/MultiSource/McCat/Makefile" + ac_config_commands="$ac_config_commands test/Programs/MultiSource/Benchmarks/Makefile" - ac_config_commands="$ac_config_commands test/Programs/MultiSource/McCat/01-qbsort/Makefile" + ac_config_commands="$ac_config_commands test/Programs/MultiSource/Benchmarks/Fhourstones/Makefile" - ac_config_commands="$ac_config_commands test/Programs/MultiSource/McCat/03-testtrie/Makefile" + ac_config_commands="$ac_config_commands test/Programs/MultiSource/Benchmarks/McCat/Makefile" - ac_config_commands="$ac_config_commands test/Programs/MultiSource/McCat/04-bisect/Makefile" + ac_config_commands="$ac_config_commands test/Programs/MultiSource/Benchmarks/McCat/01-qbsort/Makefile" - ac_config_commands="$ac_config_commands test/Programs/MultiSource/McCat/05-eks/Makefile" + ac_config_commands="$ac_config_commands test/Programs/MultiSource/Benchmarks/McCat/03-testtrie/Makefile" - ac_config_commands="$ac_config_commands test/Programs/MultiSource/McCat/08-main/Makefile" + ac_config_commands="$ac_config_commands test/Programs/MultiSource/Benchmarks/McCat/04-bisect/Makefile" - ac_config_commands="$ac_config_commands test/Programs/MultiSource/McCat/09-vor/Makefile" + ac_config_commands="$ac_config_commands test/Programs/MultiSource/Benchmarks/McCat/05-eks/Makefile" - ac_config_commands="$ac_config_commands test/Programs/MultiSource/McCat/12-IOtest/Makefile" + ac_config_commands="$ac_config_commands test/Programs/MultiSource/Benchmarks/McCat/08-main/Makefile" - ac_config_commands="$ac_config_commands test/Programs/MultiSource/McCat/15-trie/Makefile" + ac_config_commands="$ac_config_commands test/Programs/MultiSource/Benchmarks/McCat/09-vor/Makefile" - ac_config_commands="$ac_config_commands test/Programs/MultiSource/McCat/17-bintr/Makefile" + ac_config_commands="$ac_config_commands test/Programs/MultiSource/Benchmarks/McCat/12-IOtest/Makefile" - ac_config_commands="$ac_config_commands test/Programs/MultiSource/McCat/18-imp/Makefile" + ac_config_commands="$ac_config_commands test/Programs/MultiSource/Benchmarks/McCat/15-trie/Makefile" - ac_config_commands="$ac_config_commands test/Programs/MultiSource/Olden/Makefile" + ac_config_commands="$ac_config_commands test/Programs/MultiSource/Benchmarks/McCat/17-bintr/Makefile" - ac_config_commands="$ac_config_commands test/Programs/MultiSource/Olden/bh/Makefile" + ac_config_commands="$ac_config_commands test/Programs/MultiSource/Benchmarks/McCat/18-imp/Makefile" - ac_config_commands="$ac_config_commands test/Programs/MultiSource/Olden/bisort/Makefile" + ac_config_commands="$ac_config_commands test/Programs/MultiSource/Benchmarks/Olden/Makefile" - ac_config_commands="$ac_config_commands test/Programs/MultiSource/Olden/em3d/Makefile" + ac_config_commands="$ac_config_commands test/Programs/MultiSource/Benchmarks/Olden/bh/Makefile" - ac_config_commands="$ac_config_commands test/Programs/MultiSource/Olden/health/Makefile" + ac_config_commands="$ac_config_commands test/Programs/MultiSource/Benchmarks/Olden/bisort/Makefile" - ac_config_commands="$ac_config_commands test/Programs/MultiSource/Olden/mst/Makefile" + ac_config_commands="$ac_config_commands test/Programs/MultiSource/Benchmarks/Olden/em3d/Makefile" - ac_config_commands="$ac_config_commands test/Programs/MultiSource/Olden/perimeter/Makefile" + ac_config_commands="$ac_config_commands test/Programs/MultiSource/Benchmarks/Olden/health/Makefile" - ac_config_commands="$ac_config_commands test/Programs/MultiSource/Olden/power/Makefile" + ac_config_commands="$ac_config_commands test/Programs/MultiSource/Benchmarks/Olden/mst/Makefile" - ac_config_commands="$ac_config_commands test/Programs/MultiSource/Olden/treeadd/Makefile" + ac_config_commands="$ac_config_commands test/Programs/MultiSource/Benchmarks/Olden/perimeter/Makefile" - ac_config_commands="$ac_config_commands test/Programs/MultiSource/Olden/tsp/Makefile" + ac_config_commands="$ac_config_commands test/Programs/MultiSource/Benchmarks/Olden/power/Makefile" - ac_config_commands="$ac_config_commands test/Programs/MultiSource/Olden/voronoi/Makefile" + ac_config_commands="$ac_config_commands test/Programs/MultiSource/Benchmarks/Olden/treeadd/Makefile" + + + ac_config_commands="$ac_config_commands test/Programs/MultiSource/Benchmarks/Olden/tsp/Makefile" + + + ac_config_commands="$ac_config_commands test/Programs/MultiSource/Benchmarks/Olden/voronoi/Makefile" ac_config_commands="$ac_config_commands test/Programs/MultiSource/OptimizerEval/Makefile" - ac_config_commands="$ac_config_commands test/Programs/MultiSource/Ptrdist/Makefile" + ac_config_commands="$ac_config_commands test/Programs/MultiSource/Benchmarks/Ptrdist/Makefile" - ac_config_commands="$ac_config_commands test/Programs/MultiSource/Ptrdist/anagram/Makefile" + ac_config_commands="$ac_config_commands test/Programs/MultiSource/Benchmarks/Ptrdist/anagram/Makefile" - ac_config_commands="$ac_config_commands test/Programs/MultiSource/Ptrdist/bc/Makefile" + ac_config_commands="$ac_config_commands test/Programs/MultiSource/Benchmarks/Ptrdist/bc/Makefile" - ac_config_commands="$ac_config_commands test/Programs/MultiSource/Ptrdist/ft/Makefile" + ac_config_commands="$ac_config_commands test/Programs/MultiSource/Benchmarks/Ptrdist/ft/Makefile" - ac_config_commands="$ac_config_commands test/Programs/MultiSource/Ptrdist/ks/Makefile" + ac_config_commands="$ac_config_commands test/Programs/MultiSource/Benchmarks/Ptrdist/ks/Makefile" - ac_config_commands="$ac_config_commands test/Programs/MultiSource/Ptrdist/yacr2/Makefile" + ac_config_commands="$ac_config_commands test/Programs/MultiSource/Benchmarks/Ptrdist/yacr2/Makefile" - ac_config_commands="$ac_config_commands test/Programs/MultiSource/aha/Makefile" + ac_config_commands="$ac_config_commands test/Programs/MultiSource/Applications/aha/Makefile" - ac_config_commands="$ac_config_commands test/Programs/MultiSource/llubenchmark/Makefile" + ac_config_commands="$ac_config_commands test/Programs/MultiSource/Benchmarks/llubenchmark/Makefile" - ac_config_commands="$ac_config_commands test/Programs/MultiSource/sgefa/Makefile" + ac_config_commands="$ac_config_commands test/Programs/MultiSource/Applications/sgefa/Makefile" - ac_config_commands="$ac_config_commands test/Programs/MultiSource/sim/Makefile" + ac_config_commands="$ac_config_commands test/Programs/MultiSource/Benchmarks/sim/Makefile" ac_config_commands="$ac_config_commands test/Programs/NoSource/Makefile" @@ -4377,7 +4383,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4380 "configure"' > conftest.$ac_ext + echo '#line 4386 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5218,7 +5224,7 @@ # Provide some information about the compiler. -echo "$as_me:5221:" \ +echo "$as_me:5227:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 @@ -6227,11 +6233,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6230: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6236: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6234: \$? = $ac_status" >&5 + echo "$as_me:6240: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -6459,11 +6465,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6462: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6468: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6466: \$? = $ac_status" >&5 + echo "$as_me:6472: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -6526,11 +6532,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6529: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6535: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:6533: \$? = $ac_status" >&5 + echo "$as_me:6539: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8538,7 +8544,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:10781: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:10779: \$? = $ac_status" >&5 + echo "$as_me:10785: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -10839,11 +10845,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10842: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10848: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:10846: \$? = $ac_status" >&5 + echo "$as_me:10852: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12082,7 +12088,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:13011: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13009: \$? = $ac_status" >&5 + echo "$as_me:13015: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -13069,11 +13075,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13072: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13078: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13076: \$? = $ac_status" >&5 + echo "$as_me:13082: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -15013,11 +15019,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15016: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15022: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15020: \$? = $ac_status" >&5 + echo "$as_me:15026: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -15245,11 +15251,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15248: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15254: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15252: \$? = $ac_status" >&5 + echo "$as_me:15258: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -15312,11 +15318,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15315: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15321: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15319: \$? = $ac_status" >&5 + echo "$as_me:15325: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17324,7 +17330,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext < Changes in directory llvm/autoconf: configure.ac updated: 1.12 -> 1.13 --- Log message: Updated for the re-organization of llvm/test/Programs/MultiSource. --- Diffs of the changes: Index: llvm/autoconf/configure.ac diff -u llvm/autoconf/configure.ac:1.12 llvm/autoconf/configure.ac:1.13 --- llvm/autoconf/configure.ac:1.12 Thu Sep 11 15:53:48 2003 +++ llvm/autoconf/configure.ac Fri Sep 12 11:31:43 2003 @@ -111,41 +111,43 @@ AC_CONFIG_MAKEFILE(test/Programs/LLVMSource/Makefile) AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Makefile) AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Makefile.multisrc) -AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Burg/Makefile) -AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Fhourstones/Makefile) -AC_CONFIG_MAKEFILE(test/Programs/MultiSource/McCat/Makefile) -AC_CONFIG_MAKEFILE(test/Programs/MultiSource/McCat/01-qbsort/Makefile) -AC_CONFIG_MAKEFILE(test/Programs/MultiSource/McCat/03-testtrie/Makefile) -AC_CONFIG_MAKEFILE(test/Programs/MultiSource/McCat/04-bisect/Makefile) -AC_CONFIG_MAKEFILE(test/Programs/MultiSource/McCat/05-eks/Makefile) -AC_CONFIG_MAKEFILE(test/Programs/MultiSource/McCat/08-main/Makefile) -AC_CONFIG_MAKEFILE(test/Programs/MultiSource/McCat/09-vor/Makefile) -AC_CONFIG_MAKEFILE(test/Programs/MultiSource/McCat/12-IOtest/Makefile) -AC_CONFIG_MAKEFILE(test/Programs/MultiSource/McCat/15-trie/Makefile) -AC_CONFIG_MAKEFILE(test/Programs/MultiSource/McCat/17-bintr/Makefile) -AC_CONFIG_MAKEFILE(test/Programs/MultiSource/McCat/18-imp/Makefile) -AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Olden/Makefile) -AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Olden/bh/Makefile) -AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Olden/bisort/Makefile) -AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Olden/em3d/Makefile) -AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Olden/health/Makefile) -AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Olden/mst/Makefile) -AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Olden/perimeter/Makefile) -AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Olden/power/Makefile) -AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Olden/treeadd/Makefile) -AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Olden/tsp/Makefile) -AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Olden/voronoi/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Applications/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Applications/Burg/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/Fhourstones/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/McCat/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/McCat/01-qbsort/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/McCat/03-testtrie/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/McCat/04-bisect/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/McCat/05-eks/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/McCat/08-main/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/McCat/09-vor/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/McCat/12-IOtest/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/McCat/15-trie/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/McCat/17-bintr/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/McCat/18-imp/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/Olden/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/Olden/bh/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/Olden/bisort/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/Olden/em3d/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/Olden/health/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/Olden/mst/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/Olden/perimeter/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/Olden/power/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/Olden/treeadd/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/Olden/tsp/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/Olden/voronoi/Makefile) AC_CONFIG_MAKEFILE(test/Programs/MultiSource/OptimizerEval/Makefile) -AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Ptrdist/Makefile) -AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Ptrdist/anagram/Makefile) -AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Ptrdist/bc/Makefile) -AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Ptrdist/ft/Makefile) -AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Ptrdist/ks/Makefile) -AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Ptrdist/yacr2/Makefile) -AC_CONFIG_MAKEFILE(test/Programs/MultiSource/aha/Makefile) -AC_CONFIG_MAKEFILE(test/Programs/MultiSource/llubenchmark/Makefile) -AC_CONFIG_MAKEFILE(test/Programs/MultiSource/sgefa/Makefile) -AC_CONFIG_MAKEFILE(test/Programs/MultiSource/sim/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/Ptrdist/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/Ptrdist/anagram/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/Ptrdist/bc/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/Ptrdist/ft/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/Ptrdist/ks/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/Ptrdist/yacr2/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Applications/aha/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/llubenchmark/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Applications/sgefa/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/sim/Makefile) AC_CONFIG_MAKEFILE(test/Programs/NoSource/Makefile) AC_CONFIG_MAKEFILE(test/Programs/NoSource/Flex/Makefile) AC_CONFIG_MAKEFILE(test/Programs/NoSource/Larn/Makefile) From criswell at cs.uiuc.edu Fri Sep 12 11:37:03 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri Sep 12 11:37:03 2003 Subject: [llvm-commits] CVS: llvm/configure Message-ID: <200309121636.LAA26960@choi.cs.uiuc.edu> Changes in directory llvm: configure updated: 1.20 -> 1.21 --- Log message: Caught a few misses in the last modification. --- Diffs of the changes: Index: llvm/configure diff -u llvm/configure:1.20 llvm/configure:1.21 --- llvm/configure:1.20 Fri Sep 12 11:31:41 2003 +++ llvm/configure Fri Sep 12 11:36:16 2003 @@ -1784,6 +1784,12 @@ ac_config_commands="$ac_config_commands test/Programs/MultiSource/Applications/Burg/Makefile" + ac_config_commands="$ac_config_commands test/Programs/MultiSource/Applications/aha/Makefile" + + + ac_config_commands="$ac_config_commands test/Programs/MultiSource/Applications/sgefa/Makefile" + + ac_config_commands="$ac_config_commands test/Programs/MultiSource/Benchmarks/Makefile" @@ -1856,7 +1862,7 @@ ac_config_commands="$ac_config_commands test/Programs/MultiSource/Benchmarks/Olden/voronoi/Makefile" - ac_config_commands="$ac_config_commands test/Programs/MultiSource/OptimizerEval/Makefile" + ac_config_commands="$ac_config_commands test/Programs/MultiSource/Benchmarks/OptimizerEval/Makefile" ac_config_commands="$ac_config_commands test/Programs/MultiSource/Benchmarks/Ptrdist/Makefile" @@ -1877,15 +1883,9 @@ ac_config_commands="$ac_config_commands test/Programs/MultiSource/Benchmarks/Ptrdist/yacr2/Makefile" - ac_config_commands="$ac_config_commands test/Programs/MultiSource/Applications/aha/Makefile" - - ac_config_commands="$ac_config_commands test/Programs/MultiSource/Benchmarks/llubenchmark/Makefile" - ac_config_commands="$ac_config_commands test/Programs/MultiSource/Applications/sgefa/Makefile" - - ac_config_commands="$ac_config_commands test/Programs/MultiSource/Benchmarks/sim/Makefile" @@ -23364,6 +23364,8 @@ ${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/MultiSource/Makefile.multisrc` ${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/MultiSource/Applications/Makefile` ${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/MultiSource/Applications/Burg/Makefile` +${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/MultiSource/Applications/aha/Makefile` +${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/MultiSource/Applications/sgefa/Makefile` ${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/MultiSource/Benchmarks/Makefile` ${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/MultiSource/Benchmarks/Fhourstones/Makefile` ${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/MultiSource/Benchmarks/McCat/Makefile` @@ -23388,16 +23390,14 @@ ${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/MultiSource/Benchmarks/Olden/treeadd/Makefile` ${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/MultiSource/Benchmarks/Olden/tsp/Makefile` ${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/MultiSource/Benchmarks/Olden/voronoi/Makefile` -${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/MultiSource/OptimizerEval/Makefile` +${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/MultiSource/Benchmarks/OptimizerEval/Makefile` ${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/MultiSource/Benchmarks/Ptrdist/Makefile` ${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/MultiSource/Benchmarks/Ptrdist/anagram/Makefile` ${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/MultiSource/Benchmarks/Ptrdist/bc/Makefile` ${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/MultiSource/Benchmarks/Ptrdist/ft/Makefile` ${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/MultiSource/Benchmarks/Ptrdist/ks/Makefile` ${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/MultiSource/Benchmarks/Ptrdist/yacr2/Makefile` -${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/MultiSource/Applications/aha/Makefile` ${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/MultiSource/Benchmarks/llubenchmark/Makefile` -${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/MultiSource/Applications/sgefa/Makefile` ${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/MultiSource/Benchmarks/sim/Makefile` ${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/NoSource/Makefile` ${srcdir}/autoconf/mkinstalldirs `dirname test/Programs/NoSource/Flex/Makefile` @@ -23550,6 +23550,8 @@ "test/Programs/MultiSource/Makefile.multisrc" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/MultiSource/Makefile.multisrc" ;; "test/Programs/MultiSource/Applications/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/MultiSource/Applications/Makefile" ;; "test/Programs/MultiSource/Applications/Burg/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/MultiSource/Applications/Burg/Makefile" ;; + "test/Programs/MultiSource/Applications/aha/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/MultiSource/Applications/aha/Makefile" ;; + "test/Programs/MultiSource/Applications/sgefa/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/MultiSource/Applications/sgefa/Makefile" ;; "test/Programs/MultiSource/Benchmarks/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/MultiSource/Benchmarks/Makefile" ;; "test/Programs/MultiSource/Benchmarks/Fhourstones/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/MultiSource/Benchmarks/Fhourstones/Makefile" ;; "test/Programs/MultiSource/Benchmarks/McCat/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/MultiSource/Benchmarks/McCat/Makefile" ;; @@ -23574,16 +23576,14 @@ "test/Programs/MultiSource/Benchmarks/Olden/treeadd/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/MultiSource/Benchmarks/Olden/treeadd/Makefile" ;; "test/Programs/MultiSource/Benchmarks/Olden/tsp/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/MultiSource/Benchmarks/Olden/tsp/Makefile" ;; "test/Programs/MultiSource/Benchmarks/Olden/voronoi/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/MultiSource/Benchmarks/Olden/voronoi/Makefile" ;; - "test/Programs/MultiSource/OptimizerEval/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/MultiSource/OptimizerEval/Makefile" ;; + "test/Programs/MultiSource/Benchmarks/OptimizerEval/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/MultiSource/Benchmarks/OptimizerEval/Makefile" ;; "test/Programs/MultiSource/Benchmarks/Ptrdist/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/MultiSource/Benchmarks/Ptrdist/Makefile" ;; "test/Programs/MultiSource/Benchmarks/Ptrdist/anagram/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/MultiSource/Benchmarks/Ptrdist/anagram/Makefile" ;; "test/Programs/MultiSource/Benchmarks/Ptrdist/bc/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/MultiSource/Benchmarks/Ptrdist/bc/Makefile" ;; "test/Programs/MultiSource/Benchmarks/Ptrdist/ft/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/MultiSource/Benchmarks/Ptrdist/ft/Makefile" ;; "test/Programs/MultiSource/Benchmarks/Ptrdist/ks/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/MultiSource/Benchmarks/Ptrdist/ks/Makefile" ;; "test/Programs/MultiSource/Benchmarks/Ptrdist/yacr2/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/MultiSource/Benchmarks/Ptrdist/yacr2/Makefile" ;; - "test/Programs/MultiSource/Applications/aha/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/MultiSource/Applications/aha/Makefile" ;; "test/Programs/MultiSource/Benchmarks/llubenchmark/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/MultiSource/Benchmarks/llubenchmark/Makefile" ;; - "test/Programs/MultiSource/Applications/sgefa/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/MultiSource/Applications/sgefa/Makefile" ;; "test/Programs/MultiSource/Benchmarks/sim/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/MultiSource/Benchmarks/sim/Makefile" ;; "test/Programs/NoSource/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/NoSource/Makefile" ;; "test/Programs/NoSource/Flex/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS test/Programs/NoSource/Flex/Makefile" ;; @@ -24366,6 +24366,8 @@ test/Programs/MultiSource/Makefile.multisrc ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/MultiSource/Makefile.multisrc test/Programs/MultiSource/Makefile.multisrc ;; test/Programs/MultiSource/Applications/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/MultiSource/Applications/Makefile test/Programs/MultiSource/Applications/Makefile ;; test/Programs/MultiSource/Applications/Burg/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/MultiSource/Applications/Burg/Makefile test/Programs/MultiSource/Applications/Burg/Makefile ;; + test/Programs/MultiSource/Applications/aha/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/MultiSource/Applications/aha/Makefile test/Programs/MultiSource/Applications/aha/Makefile ;; + test/Programs/MultiSource/Applications/sgefa/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/MultiSource/Applications/sgefa/Makefile test/Programs/MultiSource/Applications/sgefa/Makefile ;; test/Programs/MultiSource/Benchmarks/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/MultiSource/Benchmarks/Makefile test/Programs/MultiSource/Benchmarks/Makefile ;; test/Programs/MultiSource/Benchmarks/Fhourstones/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/MultiSource/Benchmarks/Fhourstones/Makefile test/Programs/MultiSource/Benchmarks/Fhourstones/Makefile ;; test/Programs/MultiSource/Benchmarks/McCat/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/MultiSource/Benchmarks/McCat/Makefile test/Programs/MultiSource/Benchmarks/McCat/Makefile ;; @@ -24390,16 +24392,14 @@ test/Programs/MultiSource/Benchmarks/Olden/treeadd/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/MultiSource/Benchmarks/Olden/treeadd/Makefile test/Programs/MultiSource/Benchmarks/Olden/treeadd/Makefile ;; test/Programs/MultiSource/Benchmarks/Olden/tsp/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/MultiSource/Benchmarks/Olden/tsp/Makefile test/Programs/MultiSource/Benchmarks/Olden/tsp/Makefile ;; test/Programs/MultiSource/Benchmarks/Olden/voronoi/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/MultiSource/Benchmarks/Olden/voronoi/Makefile test/Programs/MultiSource/Benchmarks/Olden/voronoi/Makefile ;; - test/Programs/MultiSource/OptimizerEval/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/MultiSource/OptimizerEval/Makefile test/Programs/MultiSource/OptimizerEval/Makefile ;; + test/Programs/MultiSource/Benchmarks/OptimizerEval/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/MultiSource/Benchmarks/OptimizerEval/Makefile test/Programs/MultiSource/Benchmarks/OptimizerEval/Makefile ;; test/Programs/MultiSource/Benchmarks/Ptrdist/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/MultiSource/Benchmarks/Ptrdist/Makefile test/Programs/MultiSource/Benchmarks/Ptrdist/Makefile ;; test/Programs/MultiSource/Benchmarks/Ptrdist/anagram/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/MultiSource/Benchmarks/Ptrdist/anagram/Makefile test/Programs/MultiSource/Benchmarks/Ptrdist/anagram/Makefile ;; test/Programs/MultiSource/Benchmarks/Ptrdist/bc/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/MultiSource/Benchmarks/Ptrdist/bc/Makefile test/Programs/MultiSource/Benchmarks/Ptrdist/bc/Makefile ;; test/Programs/MultiSource/Benchmarks/Ptrdist/ft/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/MultiSource/Benchmarks/Ptrdist/ft/Makefile test/Programs/MultiSource/Benchmarks/Ptrdist/ft/Makefile ;; test/Programs/MultiSource/Benchmarks/Ptrdist/ks/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/MultiSource/Benchmarks/Ptrdist/ks/Makefile test/Programs/MultiSource/Benchmarks/Ptrdist/ks/Makefile ;; test/Programs/MultiSource/Benchmarks/Ptrdist/yacr2/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/MultiSource/Benchmarks/Ptrdist/yacr2/Makefile test/Programs/MultiSource/Benchmarks/Ptrdist/yacr2/Makefile ;; - test/Programs/MultiSource/Applications/aha/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/MultiSource/Applications/aha/Makefile test/Programs/MultiSource/Applications/aha/Makefile ;; test/Programs/MultiSource/Benchmarks/llubenchmark/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/MultiSource/Benchmarks/llubenchmark/Makefile test/Programs/MultiSource/Benchmarks/llubenchmark/Makefile ;; - test/Programs/MultiSource/Applications/sgefa/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/MultiSource/Applications/sgefa/Makefile test/Programs/MultiSource/Applications/sgefa/Makefile ;; test/Programs/MultiSource/Benchmarks/sim/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/MultiSource/Benchmarks/sim/Makefile test/Programs/MultiSource/Benchmarks/sim/Makefile ;; test/Programs/NoSource/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/NoSource/Makefile test/Programs/NoSource/Makefile ;; test/Programs/NoSource/Flex/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/test/Programs/NoSource/Flex/Makefile test/Programs/NoSource/Flex/Makefile ;; From criswell at cs.uiuc.edu Fri Sep 12 11:37:15 2003 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri Sep 12 11:37:15 2003 Subject: [llvm-commits] CVS: llvm/autoconf/configure.ac Message-ID: <200309121636.LAA26967@choi.cs.uiuc.edu> Changes in directory llvm/autoconf: configure.ac updated: 1.13 -> 1.14 --- Log message: Caught a few misses in the last modification. --- Diffs of the changes: Index: llvm/autoconf/configure.ac diff -u llvm/autoconf/configure.ac:1.13 llvm/autoconf/configure.ac:1.14 --- llvm/autoconf/configure.ac:1.13 Fri Sep 12 11:31:43 2003 +++ llvm/autoconf/configure.ac Fri Sep 12 11:36:17 2003 @@ -113,6 +113,8 @@ AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Makefile.multisrc) AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Applications/Makefile) AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Applications/Burg/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Applications/aha/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Applications/sgefa/Makefile) AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/Makefile) AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/Fhourstones/Makefile) AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/McCat/Makefile) @@ -137,16 +139,14 @@ AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/Olden/treeadd/Makefile) AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/Olden/tsp/Makefile) AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/Olden/voronoi/Makefile) -AC_CONFIG_MAKEFILE(test/Programs/MultiSource/OptimizerEval/Makefile) +AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/OptimizerEval/Makefile) AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/Ptrdist/Makefile) AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/Ptrdist/anagram/Makefile) AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/Ptrdist/bc/Makefile) AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/Ptrdist/ft/Makefile) AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/Ptrdist/ks/Makefile) AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/Ptrdist/yacr2/Makefile) -AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Applications/aha/Makefile) AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/llubenchmark/Makefile) -AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Applications/sgefa/Makefile) AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/sim/Makefile) AC_CONFIG_MAKEFILE(test/Programs/NoSource/Makefile) AC_CONFIG_MAKEFILE(test/Programs/NoSource/Flex/Makefile) From lattner at cs.uiuc.edu Fri Sep 12 11:43:01 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Fri Sep 12 11:43:01 2003 Subject: [llvm-commits] CVS: llvm/test/Regression/Transforms/IndVarsSimplify/2003-09-12-MultiplePred.ll Message-ID: <200309121642.LAA24855@apoc.cs.uiuc.edu> Changes in directory llvm/test/Regression/Transforms/IndVarsSimplify: 2003-09-12-MultiplePred.ll added (r1.1) --- Log message: New testcase, this should be simplified --- Diffs of the changes: Index: llvm/test/Regression/Transforms/IndVarsSimplify/2003-09-12-MultiplePred.ll diff -c /dev/null llvm/test/Regression/Transforms/IndVarsSimplify/2003-09-12-MultiplePred.ll:1.1 *** /dev/null Fri Sep 12 11:42:26 2003 --- llvm/test/Regression/Transforms/IndVarsSimplify/2003-09-12-MultiplePred.ll Fri Sep 12 11:42:16 2003 *************** *** 0 **** --- 1,12 ---- + ; RUN: llvm-as < %s | opt -indvars | dis | grep indvar + + int %test() { + br bool true, label %LoopHead, label %LoopHead + + LoopHead: + %A = phi int [0, %0], [0, %0], [%B, %LoopHead] + %B = add int %A, 1 + br bool false, label %LoopHead, label %Out + Out: + ret int %B + } From lattner at cs.uiuc.edu Fri Sep 12 11:46:02 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Fri Sep 12 11:46:02 2003 Subject: [llvm-commits] CVS: llvm/lib/Transforms/Scalar/IndVarSimplify.cpp Message-ID: <200309121645.LAA24882@apoc.cs.uiuc.edu> Changes in directory llvm/lib/Transforms/Scalar: IndVarSimplify.cpp updated: 1.36 -> 1.37 --- Log message: Make sure to cannonicalize loops before running indvar simplify --- Diffs of the changes: Index: llvm/lib/Transforms/Scalar/IndVarSimplify.cpp diff -u llvm/lib/Transforms/Scalar/IndVarSimplify.cpp:1.36 llvm/lib/Transforms/Scalar/IndVarSimplify.cpp:1.37 --- llvm/lib/Transforms/Scalar/IndVarSimplify.cpp:1.36 Wed Sep 10 00:24:46 2003 +++ llvm/lib/Transforms/Scalar/IndVarSimplify.cpp Fri Sep 12 11:45:01 2003 @@ -193,6 +193,7 @@ virtual void getAnalysisUsage(AnalysisUsage &AU) const { AU.addRequired(); + AU.addRequiredID(LoopPreheadersID); AU.setPreservesCFG(); } }; From gaeke at cs.uiuc.edu Fri Sep 12 12:20:03 2003 From: gaeke at cs.uiuc.edu (Brian Gaeke) Date: Fri Sep 12 12:20:03 2003 Subject: [llvm-commits] CVS: reopt/lib/Makefile Message-ID: <200309121719.MAA02708@zion.cs.uiuc.edu> Changes in directory reopt/lib: Makefile updated: 1.15 -> 1.16 --- Log message: Turn off some dirs that don't compile, for now, under Linux/x86. --- Diffs of the changes: Index: reopt/lib/Makefile diff -u reopt/lib/Makefile:1.15 reopt/lib/Makefile:1.16 --- reopt/lib/Makefile:1.15 Wed Sep 10 10:05:37 2003 +++ reopt/lib/Makefile Fri Sep 12 12:18:58 2003 @@ -1,3 +1,9 @@ LEVEL = .. -DIRS = BinInterface Inst LightWtProfiling Mapping ScratchMemory TraceCache Trigger +DIRS := BinInterface Mapping ScratchMemory TraceCache Trigger + +# These dirs contain files that don't currently even compile under Linux/x86: +ifeq ($(ARCH),Sparc) +DIRS := $(DIRS) Inst LightWtProfiling +endif + include $(LEVEL)/Makefile.common From brukman at cs.uiuc.edu Fri Sep 12 15:44:01 2003 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Fri Sep 12 15:44:01 2003 Subject: [llvm-commits] CVS: llvm/tools/bugpoint/bugpoint.cpp Message-ID: <200309122043.PAA20685@zion.cs.uiuc.edu> Changes in directory llvm/tools/bugpoint: bugpoint.cpp updated: 1.6 -> 1.7 --- Log message: Bugpoint has the ability of generating a plethora of core files, so to avoid filling up the disk, set the max core file size to 0. --- Diffs of the changes: Index: llvm/tools/bugpoint/bugpoint.cpp diff -u llvm/tools/bugpoint/bugpoint.cpp:1.6 llvm/tools/bugpoint/bugpoint.cpp:1.7 --- llvm/tools/bugpoint/bugpoint.cpp:1.6 Thu Aug 7 16:19:30 2003 +++ llvm/tools/bugpoint/bugpoint.cpp Fri Sep 12 15:42:57 2003 @@ -9,6 +9,8 @@ #include "BugDriver.h" #include "llvm/Support/PassNameParser.h" #include "Support/CommandLine.h" +#include "Config/unistd.h" +#include static cl::list InputFilenames(cl::Positional, cl::OneOrMore, @@ -26,6 +28,16 @@ BugDriver D(argv[0]); if (D.addSources(InputFilenames)) return 1; D.addPasses(PassList.begin(), PassList.end()); + + // Bugpoint has the ability of generating a plethora of core files, so to + // avoid filling up the disk, set the max core file size to 0. + struct rlimit rlim; + rlim.rlim_cur = rlim.rlim_max = 0; + int res = setrlimit(RLIMIT_CORE, &rlim); + if (res < 0) { + // setrlimit() may have failed, but we're not going to let that stop us + perror("setrlimit: RLIMIT_CORE"); + } return D.run(); } From lattner at cs.uiuc.edu Fri Sep 12 18:38:03 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Fri Sep 12 18:38:03 2003 Subject: [llvm-commits] CVS: llvm/www/www-index.html Message-ID: <200309122337.SAA16659@apoc.cs.uiuc.edu> Changes in directory llvm/www: www-index.html updated: 1.49 -> 1.50 --- Log message: Add link to the new mailing list --- Diffs of the changes: Index: llvm/www/www-index.html diff -u llvm/www/www-index.html:1.49 llvm/www/www-index.html:1.50 --- llvm/www/www-index.html:1.49 Wed Sep 10 19:17:41 2003 +++ llvm/www/www-index.html Fri Sep 12 18:37:25 2003 @@ -315,7 +315,8 @@
  • LLVM Mailing Lists:
      -
    1. The Developer's List (help with LLVM & announcements)
    2. +
    3. The LLVM Anouncements List
    4. +
    5. The Developer's List (LLVM user & developer support)
    6. The Bugs & Patches Archive
    7. The CVS Commits Archive
    8. From lattner at cs.uiuc.edu Fri Sep 12 21:37:00 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Fri Sep 12 21:37:00 2003 Subject: [llvm-commits] CVS: llvm/autoconf/configure.ac Message-ID: <200309130236.VAA02033@apoc.cs.uiuc.edu> Changes in directory llvm/autoconf: configure.ac updated: 1.14 -> 1.15 --- Log message: Configure the llvm-ar directory --- Diffs of the changes: Index: llvm/autoconf/configure.ac diff -u llvm/autoconf/configure.ac:1.14 llvm/autoconf/configure.ac:1.15 --- llvm/autoconf/configure.ac:1.14 Fri Sep 12 11:36:17 2003 +++ llvm/autoconf/configure.ac Fri Sep 12 21:35:56 2003 @@ -179,6 +179,7 @@ AC_CONFIG_MAKEFILE(tools/opt/Makefile) AC_CONFIG_MAKEFILE(tools/llee/Makefile) AC_CONFIG_MAKEFILE(tools/llvm-as/Makefile) +AC_CONFIG_MAKEFILE(tools/llvm-ar/Makefile) AC_CONFIG_MAKEFILE(tools/llvm-dis/Makefile) AC_CONFIG_MAKEFILE(utils/Makefile) AC_CONFIG_MAKEFILE(utils/Burg/Makefile) From tbrethou at cs.uiuc.edu Fri Sep 12 22:20:02 2003 From: tbrethou at cs.uiuc.edu (Tanya Brethour) Date: Fri Sep 12 22:20:02 2003 Subject: [llvm-commits] CVS: llvm/tools/llvm-ar/llvm-ar.cpp Message-ID: <200309130319.WAA04302@apoc.cs.uiuc.edu> Changes in directory llvm/tools/llvm-ar: llvm-ar.cpp updated: 1.1 -> 1.2 --- Log message: Fixed warning. --- Diffs of the changes: Index: llvm/tools/llvm-ar/llvm-ar.cpp diff -u llvm/tools/llvm-ar/llvm-ar.cpp:1.1 llvm/tools/llvm-ar/llvm-ar.cpp:1.2 --- llvm/tools/llvm-ar/llvm-ar.cpp:1.1 Thu Aug 28 10:22:38 2003 +++ llvm/tools/llvm-ar/llvm-ar.cpp Fri Sep 12 22:18:56 2003 @@ -112,7 +112,7 @@ //Name of symbol table is '/' Hdr.name[0] = '/'; - Hdr.name[1] = '/0'; + Hdr.name[1] = '\0'; //Set the header trailer to a newline memcpy(Hdr.fmag,ARFMAG,sizeof(ARFMAG)); From tbrethou at cs.uiuc.edu Fri Sep 12 22:25:09 2003 From: tbrethou at cs.uiuc.edu (Tanya Brethour) Date: Fri Sep 12 22:25:09 2003 Subject: [llvm-commits] CVS: llvm/tools/Makefile Message-ID: <200309130324.WAA04363@apoc.cs.uiuc.edu> Changes in directory llvm/tools: Makefile updated: 1.20 -> 1.21 --- Log message: Added llvm-ar to the Makefile --- Diffs of the changes: Index: llvm/tools/Makefile diff -u llvm/tools/Makefile:1.20 llvm/tools/Makefile:1.21 --- llvm/tools/Makefile:1.20 Thu Aug 28 16:43:51 2003 +++ llvm/tools/Makefile Fri Sep 12 22:23:46 2003 @@ -1,6 +1,6 @@ LEVEL := .. PARALLEL_DIRS := as llvm-as dis llvm-dis opt gccas llc link lli gccld \ - analyze extract bugpoint + analyze extract bugpoint llvm-ar include $(LEVEL)/Makefile.common From lattner at cs.uiuc.edu Fri Sep 12 22:31:03 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Fri Sep 12 22:31:03 2003 Subject: [llvm-commits] CVS: llvm/configure Message-ID: <200309130330.WAA04408@apoc.cs.uiuc.edu> Changes in directory llvm: configure updated: 1.21 -> 1.22 --- Log message: manually add the llvm-ar stuff. this should be regenerated --- Diffs of the changes: Index: llvm/configure diff -u llvm/configure:1.21 llvm/configure:1.22 --- llvm/configure:1.21 Fri Sep 12 11:36:16 2003 +++ llvm/configure Fri Sep 12 22:29:53 2003 @@ -1982,6 +1982,9 @@ ac_config_commands="$ac_config_commands tools/llvm-as/Makefile" + ac_config_commands="$ac_config_commands tools/llvm-ar/Makefile" + + ac_config_commands="$ac_config_commands tools/llvm-dis/Makefile" @@ -23430,6 +23433,7 @@ ${srcdir}/autoconf/mkinstalldirs `dirname tools/opt/Makefile` ${srcdir}/autoconf/mkinstalldirs `dirname tools/llee/Makefile` ${srcdir}/autoconf/mkinstalldirs `dirname tools/llvm-as/Makefile` +${srcdir}/autoconf/mkinstalldirs `dirname tools/llvm-ar/Makefile` ${srcdir}/autoconf/mkinstalldirs `dirname tools/llvm-dis/Makefile` ${srcdir}/autoconf/mkinstalldirs `dirname utils/Makefile` ${srcdir}/autoconf/mkinstalldirs `dirname utils/Burg/Makefile` @@ -23615,7 +23619,7 @@ "tools/lli/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS tools/lli/Makefile" ;; "tools/opt/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS tools/opt/Makefile" ;; "tools/llee/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS tools/llee/Makefile" ;; - "tools/llvm-as/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS tools/llvm-as/Makefile" ;; + "tools/llvm-ar/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS tools/llvm-ar/Makefile" ;; "tools/llvm-dis/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS tools/llvm-dis/Makefile" ;; "utils/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS utils/Makefile" ;; "utils/Burg/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS utils/Burg/Makefile" ;; @@ -24432,6 +24436,7 @@ tools/opt/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/tools/opt/Makefile tools/opt/Makefile ;; tools/llee/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/tools/llee/Makefile tools/llee/Makefile ;; tools/llvm-as/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/tools/llvm-as/Makefile tools/llvm-as/Makefile ;; + tools/llvm-ar/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/tools/llvm-ar/Makefile tools/llvm-ar/Makefile ;; tools/llvm-dis/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/tools/llvm-dis/Makefile tools/llvm-dis/Makefile ;; utils/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/utils/Makefile utils/Makefile ;; utils/Burg/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/utils/Burg/Makefile utils/Burg/Makefile ;; From vadve at cs.uiuc.edu Sat Sep 13 16:13:02 2003 From: vadve at cs.uiuc.edu (Vikram Adve) Date: Sat Sep 13 16:13:02 2003 Subject: [llvm-commits] CVS: reopt/lib/Inst/lib/InstManip.cpp Phases.cpp SparcInstManip.cpp Message-ID: <200309132112.QAA29462@tank.cs.uiuc.edu> Changes in directory reopt/lib/Inst/lib: InstManip.cpp updated: 1.14 -> 1.15 Phases.cpp updated: 1.37 -> 1.38 SparcInstManip.cpp updated: 1.19 -> 1.20 --- Log message: Add #include to files that use assert(). --- Diffs of the changes: Index: reopt/lib/Inst/lib/InstManip.cpp diff -u reopt/lib/Inst/lib/InstManip.cpp:1.14 reopt/lib/Inst/lib/InstManip.cpp:1.15 --- reopt/lib/Inst/lib/InstManip.cpp:1.14 Fri Aug 22 12:43:39 2003 +++ reopt/lib/Inst/lib/InstManip.cpp Sat Sep 13 16:12:07 2003 @@ -6,6 +6,7 @@ #include #include +#include #include "reopt/TraceCache.h" #include "reopt/VirtualMem.h" Index: reopt/lib/Inst/lib/Phases.cpp diff -u reopt/lib/Inst/lib/Phases.cpp:1.37 reopt/lib/Inst/lib/Phases.cpp:1.38 --- reopt/lib/Inst/lib/Phases.cpp:1.37 Fri Aug 22 12:43:39 2003 +++ reopt/lib/Inst/lib/Phases.cpp Sat Sep 13 16:12:07 2003 @@ -53,6 +53,7 @@ // PHASE 5: Phase 5 isn't like the other phases; rather, it simply invokes all // registered instrumentation functions for a particular site. +#include #include #include #include Index: reopt/lib/Inst/lib/SparcInstManip.cpp diff -u reopt/lib/Inst/lib/SparcInstManip.cpp:1.19 reopt/lib/Inst/lib/SparcInstManip.cpp:1.20 --- reopt/lib/Inst/lib/SparcInstManip.cpp:1.19 Fri Aug 22 12:43:39 2003 +++ reopt/lib/Inst/lib/SparcInstManip.cpp Sat Sep 13 16:12:07 2003 @@ -60,6 +60,7 @@ #include #include +#include #include // mprotect() From vadve at cs.uiuc.edu Sat Sep 13 16:13:17 2003 From: vadve at cs.uiuc.edu (Vikram Adve) Date: Sat Sep 13 16:13:17 2003 Subject: [llvm-commits] CVS: reopt/lib/Inst/lib/Phase1/Phase1.cpp PrimInfo.cpp Message-ID: <200309132112.QAA29474@tank.cs.uiuc.edu> Changes in directory reopt/lib/Inst/lib/Phase1: Phase1.cpp updated: 1.28 -> 1.29 PrimInfo.cpp updated: 1.16 -> 1.17 --- Log message: Add #include to files that use assert(). --- Diffs of the changes: Index: reopt/lib/Inst/lib/Phase1/Phase1.cpp diff -u reopt/lib/Inst/lib/Phase1/Phase1.cpp:1.28 reopt/lib/Inst/lib/Phase1/Phase1.cpp:1.29 --- reopt/lib/Inst/lib/Phase1/Phase1.cpp:1.28 Thu Jun 26 11:45:59 2003 +++ reopt/lib/Inst/lib/Phase1/Phase1.cpp Sat Sep 13 16:12:09 2003 @@ -13,6 +13,7 @@ #include #include #include +#include #include "llvm/Pass.h" #include "llvm/Module.h" Index: reopt/lib/Inst/lib/Phase1/PrimInfo.cpp diff -u reopt/lib/Inst/lib/Phase1/PrimInfo.cpp:1.16 reopt/lib/Inst/lib/Phase1/PrimInfo.cpp:1.17 --- reopt/lib/Inst/lib/Phase1/PrimInfo.cpp:1.16 Tue Jun 24 10:39:53 2003 +++ reopt/lib/Inst/lib/Phase1/PrimInfo.cpp Sat Sep 13 16:12:09 2003 @@ -5,6 +5,7 @@ // purpose: Captures information about an instance of a performance primitive "marker" // in the code. +#include #include "llvm/Module.h" #include "llvm/Type.h" #include "llvm/DerivedTypes.h" From vadve at cs.uiuc.edu Sat Sep 13 16:13:29 2003 From: vadve at cs.uiuc.edu (Vikram Adve) Date: Sat Sep 13 16:13:29 2003 Subject: [llvm-commits] CVS: reopt/lib/LightWtProfiling/FirstTrigger.cpp Initialization.cpp SLI.cpp SecondTrigger.cpp TraceToFunction.cpp Message-ID: <200309132112.QAA29490@tank.cs.uiuc.edu> Changes in directory reopt/lib/LightWtProfiling: FirstTrigger.cpp updated: 1.14 -> 1.15 Initialization.cpp updated: 1.8 -> 1.9 SLI.cpp updated: 1.5 -> 1.6 SecondTrigger.cpp updated: 1.18 -> 1.19 TraceToFunction.cpp updated: 1.3 -> 1.4 --- Log message: Add #include to files that use assert(). --- Diffs of the changes: Index: reopt/lib/LightWtProfiling/FirstTrigger.cpp diff -u reopt/lib/LightWtProfiling/FirstTrigger.cpp:1.14 reopt/lib/LightWtProfiling/FirstTrigger.cpp:1.15 --- reopt/lib/LightWtProfiling/FirstTrigger.cpp:1.14 Fri Aug 22 12:43:40 2003 +++ reopt/lib/LightWtProfiling/FirstTrigger.cpp Sat Sep 13 16:12:11 2003 @@ -8,6 +8,7 @@ // //===----------------------------------------------------------------------===// +#include #include "GetTimer.h" #include "Globals.h" #include "SecondTrigger.h" Index: reopt/lib/LightWtProfiling/Initialization.cpp diff -u reopt/lib/LightWtProfiling/Initialization.cpp:1.8 reopt/lib/LightWtProfiling/Initialization.cpp:1.9 --- reopt/lib/LightWtProfiling/Initialization.cpp:1.8 Fri Aug 22 13:35:51 2003 +++ reopt/lib/LightWtProfiling/Initialization.cpp Sat Sep 13 16:12:11 2003 @@ -6,6 +6,7 @@ // //===----------------------------------------------------------------------===// +#include #include "GetTimer.h" #include "Globals.h" #include "Support/CommandLine.h" Index: reopt/lib/LightWtProfiling/SLI.cpp diff -u reopt/lib/LightWtProfiling/SLI.cpp:1.5 reopt/lib/LightWtProfiling/SLI.cpp:1.6 --- reopt/lib/LightWtProfiling/SLI.cpp:1.5 Fri Aug 22 12:43:40 2003 +++ reopt/lib/LightWtProfiling/SLI.cpp Sat Sep 13 16:12:11 2003 @@ -10,6 +10,7 @@ #include "llvm/Support/CFG.h" #include "llvm/Module.h" #include +#include using namespace std; Index: reopt/lib/LightWtProfiling/SecondTrigger.cpp diff -u reopt/lib/LightWtProfiling/SecondTrigger.cpp:1.18 reopt/lib/LightWtProfiling/SecondTrigger.cpp:1.19 --- reopt/lib/LightWtProfiling/SecondTrigger.cpp:1.18 Fri Aug 22 12:43:41 2003 +++ reopt/lib/LightWtProfiling/SecondTrigger.cpp Sat Sep 13 16:12:11 2003 @@ -21,6 +21,7 @@ #include "reopt/TraceCache.h" #include "reopt/GetTraceTime.h" #include "llvm/iTerminators.h" +#include #include #define CALL 0x40000000 Index: reopt/lib/LightWtProfiling/TraceToFunction.cpp diff -u reopt/lib/LightWtProfiling/TraceToFunction.cpp:1.3 reopt/lib/LightWtProfiling/TraceToFunction.cpp:1.4 --- reopt/lib/LightWtProfiling/TraceToFunction.cpp:1.3 Tue Sep 2 01:47:06 2003 +++ reopt/lib/LightWtProfiling/TraceToFunction.cpp Sat Sep 13 16:12:11 2003 @@ -16,6 +16,7 @@ #include "llvm/Constants.h" #include "Support/StringExtras.h" // for utostr() #include "Support/Debug.h" // for DEBUG() +#include #include typedef std::vector TypeVector; From vadve at cs.uiuc.edu Sat Sep 13 16:13:42 2003 From: vadve at cs.uiuc.edu (Vikram Adve) Date: Sat Sep 13 16:13:42 2003 Subject: [llvm-commits] CVS: reopt/lib/Mapping/getLLVMinfo.cpp Message-ID: <200309132112.QAA29498@tank.cs.uiuc.edu> Changes in directory reopt/lib/Mapping: getLLVMinfo.cpp updated: 1.19 -> 1.20 --- Log message: Add #include to files that use assert(). --- Diffs of the changes: Index: reopt/lib/Mapping/getLLVMinfo.cpp diff -u reopt/lib/Mapping/getLLVMinfo.cpp:1.19 reopt/lib/Mapping/getLLVMinfo.cpp:1.20 --- reopt/lib/Mapping/getLLVMinfo.cpp:1.19 Fri Aug 29 00:12:48 2003 +++ reopt/lib/Mapping/getLLVMinfo.cpp Sat Sep 13 16:12:12 2003 @@ -10,6 +10,7 @@ #include "reopt/MappingInfo.h" #include "llvm/Module.h" +#include #include using std::map; using std::pair; From vadve at cs.uiuc.edu Sat Sep 13 16:13:54 2003 From: vadve at cs.uiuc.edu (Vikram Adve) Date: Sat Sep 13 16:13:54 2003 Subject: [llvm-commits] CVS: reopt/lib/TraceCache/VirtualMem.cpp Message-ID: <200309132112.QAA29507@tank.cs.uiuc.edu> Changes in directory reopt/lib/TraceCache: VirtualMem.cpp updated: 1.12 -> 1.13 --- Log message: Add #include to files that use assert(). --- Diffs of the changes: Index: reopt/lib/TraceCache/VirtualMem.cpp diff -u reopt/lib/TraceCache/VirtualMem.cpp:1.12 reopt/lib/TraceCache/VirtualMem.cpp:1.13 --- reopt/lib/TraceCache/VirtualMem.cpp:1.12 Fri Aug 22 12:43:42 2003 +++ reopt/lib/TraceCache/VirtualMem.cpp Sat Sep 13 16:12:14 2003 @@ -9,6 +9,7 @@ #include "reopt/InstrUtils.h" #include "reopt/TraceCache.h" #include "reopt/GetTraceTime.h" +#include VirtualMem::VirtualMem(){ //open file pointer From vadve at cs.uiuc.edu Sat Sep 13 16:14:07 2003 From: vadve at cs.uiuc.edu (Vikram Adve) Date: Sat Sep 13 16:14:07 2003 Subject: [llvm-commits] CVS: reopt/lib/Trigger/Trigger.cpp TriggerAuxillary.cpp Message-ID: <200309132112.QAA29517@tank.cs.uiuc.edu> Changes in directory reopt/lib/Trigger: Trigger.cpp updated: 1.21 -> 1.22 TriggerAuxillary.cpp updated: 1.7 -> 1.8 --- Log message: Add #include to files that use assert(). --- Diffs of the changes: Index: reopt/lib/Trigger/Trigger.cpp diff -u reopt/lib/Trigger/Trigger.cpp:1.21 reopt/lib/Trigger/Trigger.cpp:1.22 --- reopt/lib/Trigger/Trigger.cpp:1.21 Fri Aug 22 12:43:43 2003 +++ reopt/lib/Trigger/Trigger.cpp Sat Sep 13 16:12:16 2003 @@ -31,6 +31,7 @@ #include #include #include +#include using std::vector; using std::map; Index: reopt/lib/Trigger/TriggerAuxillary.cpp diff -u reopt/lib/Trigger/TriggerAuxillary.cpp:1.7 reopt/lib/Trigger/TriggerAuxillary.cpp:1.8 --- reopt/lib/Trigger/TriggerAuxillary.cpp:1.7 Fri Aug 22 12:43:43 2003 +++ reopt/lib/Trigger/TriggerAuxillary.cpp Sat Sep 13 16:12:16 2003 @@ -33,6 +33,7 @@ #include #include #include +#include using std::vector; using std::map; From vadve at cs.uiuc.edu Sat Sep 13 16:14:19 2003 From: vadve at cs.uiuc.edu (Vikram Adve) Date: Sat Sep 13 16:14:19 2003 Subject: [llvm-commits] CVS: reopt/include/reopt/TraceCache.h Message-ID: <200309132112.QAA29569@tank.cs.uiuc.edu> Changes in directory reopt/include/reopt: TraceCache.h updated: 1.14 -> 1.15 --- Log message: Add #include to files that use assert(). --- Diffs of the changes: Index: reopt/include/reopt/TraceCache.h diff -u reopt/include/reopt/TraceCache.h:1.14 reopt/include/reopt/TraceCache.h:1.15 --- reopt/include/reopt/TraceCache.h:1.14 Fri Aug 22 12:43:34 2003 +++ reopt/include/reopt/TraceCache.h Sat Sep 13 16:11:58 2003 @@ -8,6 +8,7 @@ #define REOPT_TRACECACHE_H #include "Support/DataTypes.h" +#include #include #include #include From vadve at cs.uiuc.edu Sat Sep 13 16:14:32 2003 From: vadve at cs.uiuc.edu (Vikram Adve) Date: Sat Sep 13 16:14:32 2003 Subject: [llvm-commits] CVS: reopt/include/reopt/BinInterface/regmask.h sparcbin.h Message-ID: <200309132112.QAA29636@tank.cs.uiuc.edu> Changes in directory reopt/include/reopt/BinInterface: regmask.h updated: 1.4 -> 1.5 sparcbin.h updated: 1.6 -> 1.7 --- Log message: Add #include to files that use assert(). --- Diffs of the changes: Index: reopt/include/reopt/BinInterface/regmask.h diff -u reopt/include/reopt/BinInterface/regmask.h:1.4 reopt/include/reopt/BinInterface/regmask.h:1.5 --- reopt/include/reopt/BinInterface/regmask.h:1.4 Fri Aug 22 12:43:35 2003 +++ reopt/include/reopt/BinInterface/regmask.h Sat Sep 13 16:12:02 2003 @@ -9,6 +9,7 @@ #define REOPT_BININTERFACE_REGMASK_H #include "bitmath.h" +#include #include #include Index: reopt/include/reopt/BinInterface/sparcbin.h diff -u reopt/include/reopt/BinInterface/sparcbin.h:1.6 reopt/include/reopt/BinInterface/sparcbin.h:1.7 --- reopt/include/reopt/BinInterface/sparcbin.h:1.6 Fri Aug 22 12:43:36 2003 +++ reopt/include/reopt/BinInterface/sparcbin.h Sat Sep 13 16:12:02 2003 @@ -16,6 +16,7 @@ #include "reopt/InstrUtils.h" #include "analyze.h" #include "sparcpriv.h" +#include #include #include From vadve at cs.uiuc.edu Sat Sep 13 16:14:44 2003 From: vadve at cs.uiuc.edu (Vikram Adve) Date: Sat Sep 13 16:14:44 2003 Subject: [llvm-commits] CVS: reopt/lib/BinInterface/analyze.cpp construct.cpp emit.cpp select.cpp sparcbin.cpp Message-ID: <200309132112.QAA29657@tank.cs.uiuc.edu> Changes in directory reopt/lib/BinInterface: analyze.cpp updated: 1.13 -> 1.14 construct.cpp updated: 1.8 -> 1.9 emit.cpp updated: 1.8 -> 1.9 select.cpp updated: 1.9 -> 1.10 sparcbin.cpp updated: 1.12 -> 1.13 --- Log message: Add #include to files that use assert(). --- Diffs of the changes: Index: reopt/lib/BinInterface/analyze.cpp diff -u reopt/lib/BinInterface/analyze.cpp:1.13 reopt/lib/BinInterface/analyze.cpp:1.14 --- reopt/lib/BinInterface/analyze.cpp:1.13 Fri Aug 22 12:43:37 2003 +++ reopt/lib/BinInterface/analyze.cpp Sat Sep 13 16:12:05 2003 @@ -17,6 +17,7 @@ #include "reopt/BinInterface/sparc9.h" // SPARC9 opcode definitions #include "Config/stdio.h" #include "Config/stdlib.h" +#include //***************************************************************************** // unsigned sparc_analyzebr(unsigned instr) Index: reopt/lib/BinInterface/construct.cpp diff -u reopt/lib/BinInterface/construct.cpp:1.8 reopt/lib/BinInterface/construct.cpp:1.9 --- reopt/lib/BinInterface/construct.cpp:1.8 Fri Aug 22 12:43:37 2003 +++ reopt/lib/BinInterface/construct.cpp Sat Sep 13 16:12:05 2003 @@ -15,6 +15,7 @@ #include "reopt/BinInterface/regmask.h" // register mask allocator #include "Config/stdio.h" #include "Config/stdlib.h" +#include #include using std::pair; // use STL pair class Index: reopt/lib/BinInterface/emit.cpp diff -u reopt/lib/BinInterface/emit.cpp:1.8 reopt/lib/BinInterface/emit.cpp:1.9 --- reopt/lib/BinInterface/emit.cpp:1.8 Fri Aug 22 12:43:37 2003 +++ reopt/lib/BinInterface/emit.cpp Sat Sep 13 16:12:05 2003 @@ -13,6 +13,7 @@ #include "reopt/BinInterface/regmask.h" // Register mask allocator #include "Config/stdio.h" #include "Config/stdlib.h" +#include #include using std::pair; Index: reopt/lib/BinInterface/select.cpp diff -u reopt/lib/BinInterface/select.cpp:1.9 reopt/lib/BinInterface/select.cpp:1.10 --- reopt/lib/BinInterface/select.cpp:1.9 Fri Aug 22 12:43:38 2003 +++ reopt/lib/BinInterface/select.cpp Sat Sep 13 16:12:05 2003 @@ -14,6 +14,7 @@ #include "Config/stdio.h" #include "Config/stdlib.h" #include +#include using std::pair; Index: reopt/lib/BinInterface/sparcbin.cpp diff -u reopt/lib/BinInterface/sparcbin.cpp:1.12 reopt/lib/BinInterface/sparcbin.cpp:1.13 --- reopt/lib/BinInterface/sparcbin.cpp:1.12 Fri Aug 22 12:43:38 2003 +++ reopt/lib/BinInterface/sparcbin.cpp Sat Sep 13 16:12:06 2003 @@ -16,6 +16,7 @@ #include "reopt/BinInterface/sparc9.h" // SPARC 9 opcode definitions #include "Config/stdio.h" #include "Config/stdlib.h" +#include #include #include From vadve at cs.uiuc.edu Sat Sep 13 16:16:02 2003 From: vadve at cs.uiuc.edu (Vikram Adve) Date: Sat Sep 13 16:16:02 2003 Subject: [llvm-commits] CVS: reopt/Makefile.common.in Message-ID: <200309132115.QAA09764@psmith.cs.uiuc.edu> Changes in directory reopt: Makefile.common.in updated: 1.3 -> 1.4 --- Log message: Makefile.config now lives in obj_root, not in src_root. --- Diffs of the changes: Index: reopt/Makefile.common.in diff -u reopt/Makefile.common.in:1.3 reopt/Makefile.common.in:1.4 --- reopt/Makefile.common.in:1.3 Wed Sep 10 10:02:24 2003 +++ reopt/Makefile.common.in Sat Sep 13 16:15:21 2003 @@ -12,7 +12,7 @@ # # Include LLVM's Master Makefile. # -include $(LLVM_SRC_ROOT)/Makefile.config +include $(LLVM_OBJ_ROOT)/Makefile.config # # Set the source root and source directory pathnames From lattner at cs.uiuc.edu Sun Sep 14 01:02:02 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Sun Sep 14 01:02:02 2003 Subject: [llvm-commits] CVS: llvm/utils/NightlyTest.pl Message-ID: <200309140601.BAA07442@apoc.cs.uiuc.edu> Changes in directory llvm/utils: NightlyTest.pl updated: 1.29 -> 1.30 --- Log message: Fix the nightly tester now that olden has been moved --- Diffs of the changes: Index: llvm/utils/NightlyTest.pl diff -u llvm/utils/NightlyTest.pl:1.29 llvm/utils/NightlyTest.pl:1.30 --- llvm/utils/NightlyTest.pl:1.29 Thu Aug 21 15:22:52 2003 +++ llvm/utils/NightlyTest.pl Sun Sep 14 01:00:49 2003 @@ -377,7 +377,7 @@ my ($NATTime, $CBETime, $LLCTime, $JITTime, $OptTime, $BytecodeSize, $MachCodeSize) = ("","","","","","",""); if (!$NORUNNINGTESTS) { - chdir "test/Programs/MultiSource/Olden" or die "Olden tests moved?"; + chdir "test/Programs/MultiSource/Benchmarks/Olden" or die "Olden tests moved?"; # Clean out previous results... system "gmake $MAKEOPTS clean > /dev/null 2>&1"; From vadve at cs.uiuc.edu Sun Sep 14 18:45:01 2003 From: vadve at cs.uiuc.edu (Vikram Adve) Date: Sun Sep 14 18:45:01 2003 Subject: [llvm-commits] CVS: llvm/utils/makellvm Message-ID: <200309142344.SAA05734@psmith.cs.uiuc.edu> Changes in directory llvm/utils: makellvm updated: 1.7 -> 1.8 --- Log message: Update makellvm to work with the brave new world of separate obj-root trees. With these changes, you can still run makellvm directly from your source tree as follows: % makellvm [toolname] ## looks for obj-root in default places (see below) or % makellvm -obj obj-root [toolname] ## specify obj-root explicitly. With the first from, `makellvm' checks the following places in order and uses the first one that contains the file `Makefile.config': (1) Your src-root directory (2) /localhome/$USER/llvm Other choices can be added to this list. --- Diffs of the changes: Index: llvm/utils/makellvm diff -u llvm/utils/makellvm:1.7 llvm/utils/makellvm:1.8 --- llvm/utils/makellvm:1.7 Mon Sep 8 10:32:47 2003 +++ llvm/utils/makellvm Sun Sep 14 18:44:31 2003 @@ -2,7 +2,7 @@ set pstatus = 0 onintr cleanup -alias usage 'echo "USAGE: $0:t [-h] [-n] [gmake-flag...] [VAR=...] [toolname (default: opt)]"; set pstatus = 1; goto cleanup' +alias usage 'echo "USAGE: $0:t [-h] [-n] [-obj obj-root] [gmake-flags] [VAR=...] [toolname (default: opt)]"; set pstatus = 1; goto cleanup' set EXEC = opt set GMAKE_OPTS = "" @@ -19,6 +19,8 @@ shift argv; set MFILE = $argv[1]; shift argv; breaksw case -n : set doit = 0; shift argv; breaksw + case -obj : + set OBJROOT = $argv[1]; shift argv; shift argv; breaksw case -d : set doit = 0; set DEBUG = 1; shift argv; breaksw case -* : @@ -72,10 +74,29 @@ endif if ($#LLVMDIR == 0 || ! -d "$LLVMDIR") then - echo "Unable to find LLVM obj-root directory or directory is invalid." + echo "Unable to find LLVM src-root directory or directory is invalid." echo "Are you within a valid LLVM directory for running gmake?" exit 1 endif + +if ($?OBJROOT == 0) then + ## Check if source root is obj-root by looking for Makefile.config there + if (-f ${LLVMDIR}/Makefile.config) then + set OBJROOT = ${LLVMDIR} + set BUILDROOT = . + else ## Otherwise assume a default location for OBJROOT + set OBJROOT = "/localhome/$USER/llvm" + set SRCROOT = `sh -c "cd $LLVMDIR; pwd | sed 's/\//\\\//g'"` + set CURSRCDIR = `echo $cwd | sed -e "s/${SRCROOT}//"` + set BUILDROOT = ${OBJROOT}/${CURSRCDIR} + unset SRCROOT CURSRCDIR + endif + echo "Using OBJ-ROOT = ${OBJROOT} (specify '-obj obj-root' to override)." +endif +if ($DEBUG) then + echo "DEBUG: BUILDROOT = $BUILDROOT" +endif +cd $BUILDROOT set CMD = "gmake $GMAKE_OPTS && (cd $LLVMDIR/tools/$EXEC && gmake $GMAKE_OPTS)" From lattner at cs.uiuc.edu Sun Sep 14 19:34:01 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Sun Sep 14 19:34:01 2003 Subject: [llvm-commits] CVS: llvm/lib/Bytecode/Writer/Writer.cpp Message-ID: <200309150033.TAA03302@apoc.cs.uiuc.edu> Changes in directory llvm/lib/Bytecode/Writer: Writer.cpp updated: 1.37 -> 1.38 --- Log message: Fix a spello Misha made while fixing one of my appostrifications --- Diffs of the changes: Index: llvm/lib/Bytecode/Writer/Writer.cpp diff -u llvm/lib/Bytecode/Writer/Writer.cpp:1.37 llvm/lib/Bytecode/Writer/Writer.cpp:1.38 --- llvm/lib/Bytecode/Writer/Writer.cpp:1.37 Thu Sep 11 17:31:47 2003 +++ llvm/lib/Bytecode/Writer/Writer.cpp Sun Sep 14 19:33:20 2003 @@ -3,7 +3,7 @@ // This library implements the functionality defined in llvm/Bytecode/Writer.h // // Note that this file uses an unusual technique of outputting all the bytecode -// to a deque of unsigned chare, then copies the deque to an ostream. The +// to a deque of unsigned char, then copies the deque to an ostream. The // reason for this is that we must do "seeking" in the stream to do back- // patching, and some very important ostreams that we want to support (like // pipes) do not support seeking. :( :( :( From lattner at cs.uiuc.edu Sun Sep 14 20:08:02 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Sun Sep 14 20:08:02 2003 Subject: [llvm-commits] CVS: llvm/Makefile.rules Message-ID: <200309150107.UAA03669@apoc.cs.uiuc.edu> Changes in directory llvm: Makefile.rules updated: 1.136 -> 1.137 --- Log message: Make sure to #include the OBJROOT config.h file, not the SRCROOT config.h file! --- Diffs of the changes: Index: llvm/Makefile.rules diff -u llvm/Makefile.rules:1.136 llvm/Makefile.rules:1.137 --- llvm/Makefile.rules:1.136 Thu Sep 11 13:03:50 2003 +++ llvm/Makefile.rules Sun Sep 14 20:07:32 2003 @@ -264,11 +264,11 @@ # (locallly generated header files). # BUILD_SRC_DIR : Files local to the particular source directory. # BUILD_SRC_ROOT/include : Files global to the project. +# LLVM_OBJ_ROOT/include : config.h files generated by autoconf # LEVEL/include : config.h files for the project # LLVM_SRC_ROOT/include : Files global to LLVM. -# LLVM_OBJ_ROOT/include : config.h files generated by autoconf # -CPPFLAGS += -I$(BUILD_OBJ_DIR) -I$(BUILD_SRC_DIR) -I$(BUILD_SRC_ROOT)/include -I$(LEVEL)/include -I$(LLVM_SRC_ROOT)/include -I$(LLVM_OBJ_ROOT)/include +CPPFLAGS += -I$(BUILD_OBJ_DIR) -I$(BUILD_SRC_DIR) -I$(LLVM_OBJ_ROOT)/include -I$(BUILD_SRC_ROOT)/include -I$(LEVEL)/include -I$(LLVM_SRC_ROOT)/include # By default, strip symbol information from executable ifndef KEEP_SYMBOLS From lattner at cs.uiuc.edu Sun Sep 14 20:13:01 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Sun Sep 14 20:13:01 2003 Subject: [llvm-commits] CVS: llvm/Makefile.rules Message-ID: <200309150112.UAA03688@apoc.cs.uiuc.edu> Changes in directory llvm: Makefile.rules updated: 1.137 -> 1.138 --- Log message: Wrap long lines at 80 cols --- Diffs of the changes: Index: llvm/Makefile.rules diff -u llvm/Makefile.rules:1.137 llvm/Makefile.rules:1.138 --- llvm/Makefile.rules:1.137 Sun Sep 14 20:07:32 2003 +++ llvm/Makefile.rules Sun Sep 14 20:12:04 2003 @@ -268,7 +268,9 @@ # LEVEL/include : config.h files for the project # LLVM_SRC_ROOT/include : Files global to LLVM. # -CPPFLAGS += -I$(BUILD_OBJ_DIR) -I$(BUILD_SRC_DIR) -I$(LLVM_OBJ_ROOT)/include -I$(BUILD_SRC_ROOT)/include -I$(LEVEL)/include -I$(LLVM_SRC_ROOT)/include +CPPFLAGS += -I$(BUILD_OBJ_DIR) -I$(BUILD_SRC_DIR) -I$(LLVM_OBJ_ROOT)/include \ + -I$(BUILD_SRC_ROOT)/include -I$(LEVEL)/include \ + -I$(LLVM_SRC_ROOT)/include # By default, strip symbol information from executable ifndef KEEP_SYMBOLS @@ -342,7 +344,8 @@ # The local Makefile can list other Source files via ExtraSource = ... # ifndef Source -Source := $(notdir $(ExtraSource) $(wildcard $(SourceDir)/*.cpp $(SourceDir)/*.c $(SourceDir)/*.y $(SourceDir)/*.l)) +Source := $(notdir $(ExtraSource) $(wildcard $(SourceDir)/*.cpp \ + $(SourceDir)/*.c $(SourceDir)/*.y $(SourceDir)/*.l)) endif # From lattner at cs.uiuc.edu Sun Sep 14 21:08:01 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Sun Sep 14 21:08:01 2003 Subject: [llvm-commits] CVS: llvm/test/Regression/Transforms/Inline/2003-09-14-InlineValue.ll Message-ID: <200309150207.VAA05331@apoc.cs.uiuc.edu> Changes in directory llvm/test/Regression/Transforms/Inline: 2003-09-14-InlineValue.ll added (r1.1) --- Log message: New testcase --- Diffs of the changes: Index: llvm/test/Regression/Transforms/Inline/2003-09-14-InlineValue.ll diff -c /dev/null llvm/test/Regression/Transforms/Inline/2003-09-14-InlineValue.ll:1.1 *** /dev/null Sun Sep 14 21:07:47 2003 --- llvm/test/Regression/Transforms/Inline/2003-09-14-InlineValue.ll Sun Sep 14 21:07:37 2003 *************** *** 0 **** --- 1,20 ---- + ; RUN: llvm-as < %s | opt -inline -disable-output + + declare int %External() + + implementation + + internal int %Callee() { + %I = call int %External() + %J = add int %I, %I + ret int %J + } + + int %Caller() { + %V = invoke int %Callee() to label %Ok except label %Bad + Ok: + ret int %V + Bad: + ret int 0 + } + From lattner at cs.uiuc.edu Sun Sep 14 21:11:01 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Sun Sep 14 21:11:01 2003 Subject: [llvm-commits] CVS: llvm/lib/Transforms/Utils/InlineFunction.cpp Message-ID: <200309150210.VAA05595@apoc.cs.uiuc.edu> Changes in directory llvm/lib/Transforms/Utils: InlineFunction.cpp updated: 1.7 -> 1.8 --- Log message: Fix bug: Inline/2003-09-14-InlineValue.ll --- Diffs of the changes: Index: llvm/lib/Transforms/Utils/InlineFunction.cpp diff -u llvm/lib/Transforms/Utils/InlineFunction.cpp:1.7 llvm/lib/Transforms/Utils/InlineFunction.cpp:1.8 --- llvm/lib/Transforms/Utils/InlineFunction.cpp:1.7 Mon Sep 8 14:44:25 2003 +++ llvm/lib/Transforms/Utils/InlineFunction.cpp Sun Sep 14 21:10:16 2003 @@ -191,10 +191,14 @@ // Next, create the new invoke instruction, inserting it at the end // of the old basic block. - new InvokeInst(CI->getCalledValue(), Split, InvokeDest, - std::vector(CI->op_begin()+1, CI->op_end()), - CI->getName(), BB->getTerminator()); - + InvokeInst *II = + new InvokeInst(CI->getCalledValue(), Split, InvokeDest, + std::vector(CI->op_begin()+1, CI->op_end()), + CI->getName(), BB->getTerminator()); + + // Make sure that anything using the call now uses the invoke! + CI->replaceAllUsesWith(II); + // Delete the unconditional branch inserted by splitBasicBlock BB->getInstList().pop_back(); Split->getInstList().pop_front(); // Delete the original call From lattner at cs.uiuc.edu Sun Sep 14 21:23:02 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Sun Sep 14 21:23:02 2003 Subject: [llvm-commits] CVS: llvm/test/Regression/Transforms/PruneEH/2003-09-14-ExternalCall.llx Message-ID: <200309150222.VAA06465@apoc.cs.uiuc.edu> Changes in directory llvm/test/Regression/Transforms/PruneEH: 2003-09-14-ExternalCall.llx added (r1.1) --- Log message: New testcase --- Diffs of the changes: Index: llvm/test/Regression/Transforms/PruneEH/2003-09-14-ExternalCall.llx diff -c /dev/null llvm/test/Regression/Transforms/PruneEH/2003-09-14-ExternalCall.llx:1.1 *** /dev/null Sun Sep 14 21:22:45 2003 --- llvm/test/Regression/Transforms/PruneEH/2003-09-14-ExternalCall.llx Sun Sep 14 21:22:35 2003 *************** *** 0 **** --- 1,11 ---- + ; RUN: llvm-as < %s | opt -prune-eh | llvm-dis | grep invoke + + declare void %External() + + implementation + + void %foo() { + invoke void %External() to label %Cont except label %Cont + Cont: + ret void + } From lattner at cs.uiuc.edu Sun Sep 14 21:24:01 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Sun Sep 14 21:24:01 2003 Subject: [llvm-commits] CVS: llvm/lib/Transforms/IPO/PruneEH.cpp Message-ID: <200309150223.VAA06476@apoc.cs.uiuc.edu> Changes in directory llvm/lib/Transforms/IPO: PruneEH.cpp updated: 1.3 -> 1.4 --- Log message: Fix bug: PruneEH/2003-09-14-ExternalCall.llx --- Diffs of the changes: Index: llvm/lib/Transforms/IPO/PruneEH.cpp diff -u llvm/lib/Transforms/IPO/PruneEH.cpp:1.3 llvm/lib/Transforms/IPO/PruneEH.cpp:1.4 --- llvm/lib/Transforms/IPO/PruneEH.cpp:1.3 Mon Sep 8 14:44:23 2003 +++ llvm/lib/Transforms/IPO/PruneEH.cpp Sun Sep 14 21:22:50 2003 @@ -48,11 +48,14 @@ std::find(SCC.begin(), SCC.end(), SCC[i]) == SCC.end()) { SCCMightThrow = true; break; } else if (Function *F = SCC[i]->getFunction()) - if (!F->isExternal()) + if (F->isExternal()) { + SCCMightThrow = true; break; + } else { for (Function::iterator I = F->begin(), E = F->end(); I != E; ++I) if (isa(I->getTerminator())) { // Uses unwind! SCCMightThrow = true; break; } + } bool MadeChange = false; From lattner at cs.uiuc.edu Sun Sep 14 23:30:01 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Sun Sep 14 23:30:01 2003 Subject: [llvm-commits] CVS: llvm/lib/Analysis/IPA/CallGraph.cpp Message-ID: <200309150429.XAA09510@apoc.cs.uiuc.edu> Changes in directory llvm/lib/Analysis/IPA: CallGraph.cpp updated: 1.24 -> 1.25 --- Log message: Make the print output more useful --- Diffs of the changes: Index: llvm/lib/Analysis/IPA/CallGraph.cpp diff -u llvm/lib/Analysis/IPA/CallGraph.cpp:1.24 llvm/lib/Analysis/IPA/CallGraph.cpp:1.25 --- llvm/lib/Analysis/IPA/CallGraph.cpp:1.24 Sun Aug 31 15:36:52 2003 +++ llvm/lib/Analysis/IPA/CallGraph.cpp Sun Sep 14 23:29:37 2003 @@ -135,7 +135,7 @@ o << "Call graph node for function: '" << CGN->getFunction()->getName() <<"'\n"; else - o << "Call graph node null function:\n"; + o << "Call graph node <>:\n"; for (unsigned i = 0; i < CGN->size(); ++i) if ((*CGN)[i]->getFunction()) @@ -146,8 +146,12 @@ } void CallGraph::print(std::ostream &o, const Module *M) const { - o << "CallGraph Root is:\n" << getRoot(); - + o << "CallGraph Root is: "; + if (getRoot()->getFunction()) + o << getRoot()->getFunction()->getName() << "\n"; + else + o << "<>\n"; + for (CallGraph::const_iterator I = begin(), E = end(); I != E; ++I) WriteToOutput(I->second, o); } From lattner at cs.uiuc.edu Sun Sep 14 23:36:01 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Sun Sep 14 23:36:01 2003 Subject: [llvm-commits] CVS: llvm/lib/Analysis/IPA/CallGraph.cpp Message-ID: <200309150435.XAA09873@apoc.cs.uiuc.edu> Changes in directory llvm/lib/Analysis/IPA: CallGraph.cpp updated: 1.25 -> 1.26 --- Log message: These two conditions are not exclusive!! --- Diffs of the changes: Index: llvm/lib/Analysis/IPA/CallGraph.cpp diff -u llvm/lib/Analysis/IPA/CallGraph.cpp:1.25 llvm/lib/Analysis/IPA/CallGraph.cpp:1.26 --- llvm/lib/Analysis/IPA/CallGraph.cpp:1.25 Sun Sep 14 23:29:37 2003 +++ llvm/lib/Analysis/IPA/CallGraph.cpp Sun Sep 14 23:35:16 2003 @@ -64,7 +64,7 @@ void CallGraph::addToCallGraph(Function *F) { CallGraphNode *Node = getNodeFor(F); - // If this function has external linkage, + // If this function has external linkage, anything could call it... if (!F->hasInternalLinkage()) { ExternalNode->addCalledFunction(Node); @@ -75,9 +75,12 @@ else Root = Node; // Found a main, keep track of it! } - } else if (F->isExternal()) { // Not defined in this xlation unit? - Node->addCalledFunction(ExternalNode); // It could call anything... } + + // If this function is not defined in this translation unit, it could call + // anything. + if (F->isExternal()) + Node->addCalledFunction(ExternalNode); // Loop over all of the users of the function... looking for callers... // From lattner at cs.uiuc.edu Sun Sep 14 23:53:02 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Sun Sep 14 23:53:02 2003 Subject: [llvm-commits] CVS: llvm/lib/Transforms/IPO/GlobalDCE.cpp Message-ID: <200309150452.XAA12277@apoc.cs.uiuc.edu> Changes in directory llvm/lib/Transforms/IPO: GlobalDCE.cpp updated: 1.25 -> 1.26 --- Log message: Ugh, a bug fix needed because of the bug in the CallGraph code --- Diffs of the changes: Index: llvm/lib/Transforms/IPO/GlobalDCE.cpp diff -u llvm/lib/Transforms/IPO/GlobalDCE.cpp:1.25 llvm/lib/Transforms/IPO/GlobalDCE.cpp:1.26 --- llvm/lib/Transforms/IPO/GlobalDCE.cpp:1.25 Thu Aug 7 09:43:13 2003 +++ llvm/lib/Transforms/IPO/GlobalDCE.cpp Sun Sep 14 23:52:00 2003 @@ -56,9 +56,11 @@ // Walk the function list, removing prototypes for functions which are not // used. for (Module::iterator I = M.begin(), E = M.end(); I != E; ++I) - if (I->use_size() == 0 && I->isExternal()) + if (I->use_size() == 0 && I->isExternal()) { + CallGraph[I]->removeAllCalledFunctions(); delete CallGraph.removeFunctionFromModule(I); - + } + return true; } From lattner at cs.uiuc.edu Sun Sep 14 23:57:01 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Sun Sep 14 23:57:01 2003 Subject: [llvm-commits] CVS: llvm/lib/Transforms/IPO/LowerSetJmp.cpp Message-ID: <200309150456.XAA12311@apoc.cs.uiuc.edu> Changes in directory llvm/lib/Transforms/IPO: LowerSetJmp.cpp added (r1.1) --- Log message: Initial checkin of the Setjmp/Longjmp lowering/transformation pass, contributed by the masterful Bill Wendling! --- Diffs of the changes: Index: llvm/lib/Transforms/IPO/LowerSetJmp.cpp diff -c /dev/null llvm/lib/Transforms/IPO/LowerSetJmp.cpp:1.1 *** /dev/null Sun Sep 14 23:56:37 2003 --- llvm/lib/Transforms/IPO/LowerSetJmp.cpp Sun Sep 14 23:56:27 2003 *************** *** 0 **** --- 1,501 ---- + //===- LowerSetJmp.cpp - Code pertaining to lowering set/long jumps -------===// + // + // This file implements the lowering of setjmp and longjmp to use the + // LLVM invoke instruction as necessary. + // + // Lowering of longjmp is fairly trivial. We replace the call with a + // call to the LLVM library function "__llvm_sjljeh_throw_longjmp()". + // This unwinds the stack for us calling all of the destructors for + // objects allocated on the stack. + // + // At a setjmp call, the basic block is split and the setjmp removed. + // The calls in a function that have a setjmp are converted to invoke + // where the except part checks to see if it's a longjmp exception and, + // if so, if it's handled in the function. If it is, then it gets the + // value returned by the longjmp and goes to where the basic block was + // split. Invoke instructions are handled in a similar fashion with the + // original except block being executed if it isn't a longjmp except + // that is handled by that function. + // + //===----------------------------------------------------------------------===// + + //===----------------------------------------------------------------------===// + // FIXME: This pass doesn't deal with PHI statements just yet. That is, + // we expect this to occur before SSAification is done. This would seem + // to make sense, but in general, it might be a good idea to make this + // pass invokable via the "opt" command at will. + //===----------------------------------------------------------------------===// + + #include "llvm/Constants.h" + #include "llvm/DerivedTypes.h" + #include "llvm/Instructions.h" + #include "llvm/Intrinsics.h" + #include "llvm/Module.h" + #include "llvm/Pass.h" + #include "llvm/Support/InstIterator.h" + #include "llvm/Support/InstVisitor.h" + #include "Support/Statistic.h" + #include "Support/StringExtras.h" + #include "Support/VectorExtras.h" + + #include + + namespace { + Statistic<> LongJmpsTransformed("lowersetjmp", + "Number of longjmps transformed"); + Statistic<> SetJmpsTransformed("lowersetjmp", + "Number of setjmps transformed"); + + //===--------------------------------------------------------------------===// + // LowerSetJmp pass implementation. This is subclassed from the "Pass" + // class because it works on a module as a whole, not a function at a + // time. + + class LowerSetJmp : public Pass, + public InstVisitor { + // LLVM library functions... + Function* InitSJMap; // __llvm_sjljeh_init_setjmpmap + Function* DestroySJMap; // __llvm_sjljeh_destroy_setjmpmap + Function* AddSJToMap; // __llvm_sjljeh_add_setjmp_to_map + Function* ThrowLongJmp; // __llvm_sjljeh_throw_longjmp + Function* TryCatchLJ; // __llvm_sjljeh_try_catching_longjmp_exception + Function* IsLJException; // __llvm_sjljeh_is_longjmp_exception + Function* GetLJValue; // __llvm_sjljeh_get_longjmp_value + + typedef std::pair SwitchValuePair; + + // The setjmp map is going to hold information about which setjmps + // were called (each setjmp gets its own number) and with which + // buffer it was called. + std::map SJMap; + + // The rethrow basic block map holds the basic block to branch to if + // the exception isn't handled in the current function and needs to + // be rethrown. + std::map RethrowBBMap; + + // The preliminary basic block map holds a basic block that grabs the + // exception and determines if it's handled by the current function. + std::map PrelimBBMap; + + // The switch/value map holds a switch inst/call inst pair. The + // switch inst controls which handler (if any) gets called and the + // value is the value returned to that handler by the call to + // __llvm_sjljeh_get_longjmp_value. + std::map SwitchValMap; + + // A map of which setjmps we've seen so far in a function. + std::map SetJmpIDMap; + + AllocaInst* GetSetJmpMap(Function* Func); + BasicBlock* GetRethrowBB(Function* Func); + SwitchValuePair GetSJSwitch(Function* Func, BasicBlock* Rethrow); + + void TransformLongJmpCall(CallInst* Inst); + void TransformSetJmpCall(CallInst* Inst); + + bool IsTransformableFunction(const std::string& Name); + public: + void visitCallInst(CallInst& CI); + void visitInvokeInst(InvokeInst& II); + void visitReturnInst(ReturnInst& RI); + void visitUnwindInst(UnwindInst& UI); + + bool run(Module& M); + bool doInitialization(Module& M); + }; + + RegisterOpt X("lowersetjmp", "Lower Set Jump"); + } // end anonymous namespace + + // run - Run the transformation on the program. We grab the function + // prototypes for longjmp and setjmp. If they are used in the program, + // then we can go directly to the places they're at and transform them. + bool LowerSetJmp::run(Module& M) + { + bool Changed = false; + + // These are what the functions are called. + Function* SetJmp = M.getNamedFunction("llvm.setjmp"); + Function* LongJmp = M.getNamedFunction("llvm.longjmp"); + + // This program doesn't have longjmp and setjmp calls. + if ((!LongJmp || LongJmp->use_empty()) && + (!SetJmp || SetJmp->use_empty())) return false; + + // Initialize some values and functions we'll need to transform the + // setjmp/longjmp functions. + doInitialization(M); + + if (SetJmp) + while (!SetJmp->use_empty()) { + assert(isa(SetJmp->use_back()) && + "User of setjmp intrinsic not a call?"); + TransformSetJmpCall(cast(SetJmp->use_back())); + Changed = true; + } + + if (LongJmp) + while (!LongJmp->use_empty()) { + assert(isa(LongJmp->use_back()) && + "User of longjmp intrinsic not a call?"); + TransformLongJmpCall(cast(LongJmp->use_back())); + Changed = true; + } + + // Now go through the affected functions and convert calls and invokes + // to new invokes... + for (std::map::iterator + B = SJMap.begin(), E = SJMap.end(); B != E; ++B) { + Function* F = B->first; + for (Function::iterator BB = F->begin(), BE = F->end(); BB != BE; ++BB) + for (BasicBlock::iterator IB = BB->begin(), IE = BB->end(); IB != IE; ) { + visit(*IB++); + if (IB != BB->end() && IB->getParent() != BB) + break; // The next instruction got moved to a different block! + } + } + + SJMap.clear(); + RethrowBBMap.clear(); + PrelimBBMap.clear(); + SwitchValMap.clear(); + SetJmpIDMap.clear(); + + return Changed; + } + + // doInitialization - For the lower long/setjmp pass, this ensures that a + // module contains a declaration for the intrisic functions we are going + // to call to convert longjmp and setjmp calls. + // + // This function is always successful, unless it isn't. + bool LowerSetJmp::doInitialization(Module& M) + { + const Type *SBPTy = PointerType::get(Type::SByteTy); + const Type *SBPPTy = PointerType::get(SBPTy); + + // N.B. See llvm/runtime/GCCLibraries/libexception/SJLJ-Exception.h for + // a description of the following library functions. + + // void __llvm_sjljeh_init_setjmpmap(void**) + InitSJMap = M.getOrInsertFunction("__llvm_sjljeh_init_setjmpmap", + Type::VoidTy, SBPPTy, 0); + // void __llvm_sjljeh_destroy_setjmpmap(void**) + DestroySJMap = M.getOrInsertFunction("__llvm_sjljeh_destroy_setjmpmap", + Type::VoidTy, SBPPTy, 0); + + // void __llvm_sjljeh_add_setjmp_to_map(void**, void*, unsigned) + AddSJToMap = M.getOrInsertFunction("__llvm_sjljeh_add_setjmp_to_map", + Type::VoidTy, SBPPTy, SBPTy, + Type::UIntTy, 0); + + // void __llvm_sjljeh_throw_longjmp(int*, int) + ThrowLongJmp = M.getOrInsertFunction("__llvm_sjljeh_throw_longjmp", + Type::VoidTy, SBPTy, Type::IntTy, 0); + + // unsigned __llvm_sjljeh_try_catching_longjmp_exception(void **) + TryCatchLJ = + M.getOrInsertFunction("__llvm_sjljeh_try_catching_longjmp_exception", + Type::UIntTy, SBPPTy, 0); + + // bool __llvm_sjljeh_is_longjmp_exception() + IsLJException = M.getOrInsertFunction("__llvm_sjljeh_is_longjmp_exception", + Type::BoolTy, 0); + + // int __llvm_sjljeh_get_longjmp_value() + GetLJValue = M.getOrInsertFunction("__llvm_sjljeh_get_longjmp_value", + Type::IntTy, 0); + return true; + } + + // IsTransformableFunction - Return true if the function name isn't one + // of the ones we don't want transformed. Currently, don't transform any + // "llvm.{setjmp,longjmp}" functions and none of the setjmp/longjmp error + // handling functions (beginning with __llvm_sjljeh_...they don't throw + // exceptions). + bool LowerSetJmp::IsTransformableFunction(const std::string& Name) + { + std::string SJLJEh("__llvm_sjljeh"); + + if (Name.size() > SJLJEh.size()) { + std::string N(Name.begin(), Name.begin() + SJLJEh.size()); + return N != SJLJEh; + } + + return true; + } + + // TransformLongJmpCall - Transform a longjmp call into a call to the + // internal __llvm_sjljeh_throw_longjmp function. It then takes care of + // throwing the exception for us. + void LowerSetJmp::TransformLongJmpCall(CallInst* Inst) + { + const Type* SBPTy = PointerType::get(Type::SByteTy); + + // Create the call to "__llvm_sjljeh_throw_longjmp". This takes the + // same parameters as "longjmp", except that the buffer is cast to a + // char*. It returns "void", so it doesn't need to replace any of + // Inst's uses and doesn't get a name. + CastInst* CI = new CastInst(Inst->getOperand(1), SBPTy, "LJBuf", Inst); + new CallInst(ThrowLongJmp, make_vector(CI, Inst->getOperand(2), 0), + "", Inst); + + SwitchValuePair& SVP = SwitchValMap[Inst->getParent()->getParent()]; + + // If the function has a setjmp call in it (they are transformed first) + // we should branch to the basic block that determines if this longjmp + // is applicable here. Otherwise, issue an unwind. + if (SVP.first) + new BranchInst(SVP.first->getParent(), Inst); + else + new UnwindInst(Inst); + + // Remove all insts after the branch/unwind inst. + Inst->getParent()->getInstList().erase(Inst, + Inst->getParent()->getInstList().end()); + + ++LongJmpsTransformed; + } + + // GetSetJmpMap - Retrieve (create and initialize, if necessary) the + // setjmp map. This map is going to hold information about which setjmps + // were called (each setjmp gets its own number) and with which buffer it + // was called. There can be only one! + AllocaInst* LowerSetJmp::GetSetJmpMap(Function* Func) + { + if (SJMap[Func]) return SJMap[Func]; + + // Insert the setjmp map initialization before the first instruction in + // the function. + Instruction* Inst = Func->getEntryNode().begin(); + assert(Inst && "Couldn't find even ONE instruction in entry block!"); + + // Fill in the alloca and call to initialize the SJ map. + const Type *SBPTy = PointerType::get(Type::SByteTy); + AllocaInst* Map = new AllocaInst(SBPTy, 0, "SJMap", Inst); + new CallInst(InitSJMap, make_vector(Map, 0), "", Inst); + return SJMap[Func] = Map; + } + + // GetRethrowBB - Only one rethrow basic block is needed per function. + // If this is a longjmp exception but not handled in this block, this BB + // performs the rethrow. + BasicBlock* LowerSetJmp::GetRethrowBB(Function* Func) + { + if (RethrowBBMap[Func]) return RethrowBBMap[Func]; + + // The basic block we're going to jump to if we need to rethrow the + // exception. + BasicBlock* Rethrow = new BasicBlock("RethrowExcept", Func); + BasicBlock::InstListType& RethrowBlkIL = Rethrow->getInstList(); + + // Fill in the "Rethrow" BB with a call to rethrow the exception. This + // is the last instruction in the BB since at this point the runtime + // should exit this function and go to the next function. + RethrowBlkIL.push_back(new UnwindInst()); + return RethrowBBMap[Func] = Rethrow; + } + + // GetSJSwitch - Return the switch statement that controls which handler + // (if any) gets called and the value returned to that handler. + LowerSetJmp::SwitchValuePair LowerSetJmp::GetSJSwitch(Function* Func, + BasicBlock* Rethrow) + { + if (SwitchValMap[Func].first) return SwitchValMap[Func]; + + BasicBlock* LongJmpPre = new BasicBlock("LongJmpBlkPre", Func); + BasicBlock::InstListType& LongJmpPreIL = LongJmpPre->getInstList(); + + // Keep track of the preliminary basic block for some of the other + // transformations. + PrelimBBMap[Func] = LongJmpPre; + + // Grab the exception. + CallInst* Cond = new + CallInst(IsLJException, std::vector(), "IsLJExcept"); + LongJmpPreIL.push_back(Cond); + + // The "decision basic block" gets the number associated with the + // setjmp call returning to switch on and the value returned by + // longjmp. + BasicBlock* DecisionBB = new BasicBlock("LJDecisionBB", Func); + BasicBlock::InstListType& DecisionBBIL = DecisionBB->getInstList(); + + LongJmpPreIL.push_back(new BranchInst(DecisionBB, Rethrow, Cond)); + + // Fill in the "decision" basic block. + CallInst* LJVal = new CallInst(GetLJValue, std::vector(), "LJVal"); + DecisionBBIL.push_back(LJVal); + CallInst* SJNum = new + CallInst(TryCatchLJ, make_vector(GetSetJmpMap(Func), 0), "SJNum"); + DecisionBBIL.push_back(SJNum); + + SwitchInst* SI = new SwitchInst(SJNum, Rethrow); + DecisionBBIL.push_back(SI); + return SwitchValMap[Func] = SwitchValuePair(SI, LJVal); + } + + // TransformSetJmpCall - The setjmp call is a bit trickier to transform. + // We're going to convert all setjmp calls to nops. Then all "call" and + // "invoke" instructions in the function are converted to "invoke" where + // the "except" branch is used when returning from a longjmp call. + void LowerSetJmp::TransformSetJmpCall(CallInst* Inst) + { + BasicBlock* ABlock = Inst->getParent(); + Function* Func = ABlock->getParent(); + + // Add this setjmp to the setjmp map. + const Type* SBPTy = PointerType::get(Type::SByteTy); + CastInst* BufPtr = new CastInst(Inst->getOperand(1), SBPTy, "SBJmpBuf", Inst); + new CallInst(AddSJToMap, + make_vector(GetSetJmpMap(Func), BufPtr, + ConstantUInt::get(Type::UIntTy, + SetJmpIDMap[Func]++), 0), + "", Inst); + + // FIXME: This is a nasty piece of code. We want the jump buffer to + // dominate all uses. However, we're doing unnatural things to the CFG + // which cause this dominance to be lost. The only way to guarantee we + // get it back is to place where the jump buffer is being allocated + // into the entry block. That's what this code does. The alloca for the + // jump buffer is followed by a getelementptr call. + if (GetElementPtrInst* GEP = dyn_cast(Inst->getOperand(1))) + if (GEP->use_size() > 1) { + if (AllocaInst* AI = dyn_cast(GEP->getPointerOperand())) { + BasicBlock& Entry = Func->getEntryNode(); + BasicBlock::InstListType& EntryIL = Entry.getInstList(); + + Instruction* NewAI = AI->clone(); + Instruction* NewGEP = GEP->clone(); + NewAI->setName(AI->getName()); + NewGEP->setName(GEP->getName()); + EntryIL.push_front(NewGEP); + EntryIL.push_front(NewAI); + GEP->replaceAllUsesWith(NewGEP); + AI->replaceAllUsesWith(NewAI); + } + } + + // Change the setjmp call into a branch statement. We'll remove the + // setjmp call in a little bit. No worries. + BasicBlock* SetJmpContBlock = ABlock->splitBasicBlock(Inst); + assert(SetJmpContBlock && "Couldn't split setjmp BB!!"); + + SetJmpContBlock->setName("SetJmpContBlock"); + + // Reposition the split BB in the BB list to make things tidier. + Func->getBasicBlockList().remove(SetJmpContBlock); + Func->getBasicBlockList().insert(++Function::iterator(ABlock), + SetJmpContBlock); + + // This PHI node will be in the new block created from the + // splitBasicBlock call. + PHINode* PHI = new PHINode(Type::IntTy, "SetJmpReturn", Inst); + + // Coming from a call to setjmp, the return is 0. + PHI->addIncoming(ConstantInt::getNullValue(Type::IntTy), ABlock); + + // Add the case for this setjmp's number... + SwitchValuePair SVP = GetSJSwitch(Func, GetRethrowBB(Func)); + SVP.first->addCase(ConstantUInt::get(Type::UIntTy, SetJmpIDMap[Func] - 1), + SetJmpContBlock); + + // Value coming from the handling of the exception. + PHI->addIncoming(SVP.second, SVP.second->getParent()); + + // Replace all uses of this instruction with the PHI node created by + // the eradication of setjmp. + Inst->replaceAllUsesWith(PHI); + Inst->getParent()->getInstList().erase(Inst); + + ++SetJmpsTransformed; + } + + // visitCallInst - This converts all LLVM call instructions into invoke + // instructions. The except part of the invoke goes to the "LongJmpBlkPre" + // that grabs the exception and proceeds to determine if it's a longjmp + // exception or not. + void LowerSetJmp::visitCallInst(CallInst& CI) + { + if (CI.getCalledFunction()) + if (!IsTransformableFunction(CI.getCalledFunction()->getName()) || + CI.getCalledFunction()->isIntrinsic()) return; + + BasicBlock* OldBB = CI.getParent(); + BasicBlock* NewBB = OldBB->splitBasicBlock(CI); + assert(NewBB && "Couldn't split BB of \"call\" instruction!!"); + NewBB->setName("Call2Invoke"); + + // Reposition the split BB in the BB list to make things tidier. + Function* Func = OldBB->getParent(); + Func->getBasicBlockList().remove(NewBB); + Func->getBasicBlockList().insert(++Function::iterator(OldBB), NewBB); + + // Construct the new "invoke" instruction. + TerminatorInst* Term = OldBB->getTerminator(); + std::vector Params(CI.op_begin() + 1, CI.op_end()); + InvokeInst* II = new + InvokeInst(CI.getCalledValue(), NewBB, PrelimBBMap[Func], + Params, CI.getName(), Term); + + // Replace the old call inst with the invoke inst and remove the call. + CI.replaceAllUsesWith(II); + CI.getParent()->getInstList().erase(&CI); + + // The old terminator is useless now that we have the invoke inst. + Term->getParent()->getInstList().erase(Term); + } + + // visitInvokeInst - Converting the "invoke" instruction is fairly + // straight-forward. The old exception part is replaced by a query asking + // if this is a longjmp exception. If it is, then it goes to the longjmp + // exception blocks. Otherwise, control is passed the old exception. + void LowerSetJmp::visitInvokeInst(InvokeInst& II) + { + if (II.getCalledFunction()) + if (!IsTransformableFunction(II.getCalledFunction()->getName()) || + II.getCalledFunction()->isIntrinsic()) return; + + Function* Func = II.getParent()->getParent(); + + BasicBlock* NormalBB = II.getNormalDest(); + BasicBlock* ExceptBB = II.getExceptionalDest(); + + BasicBlock* NewExceptBB = new BasicBlock("InvokeExcept", Func); + BasicBlock::InstListType& InstList = NewExceptBB->getInstList(); + + // If this is a longjmp exception, then branch to the preliminary BB of + // the longjmp exception handling. Otherwise, go to the old exception. + CallInst* IsLJExcept = new + CallInst(IsLJException, std::vector(), "IsLJExcept"); + InstList.push_back(IsLJExcept); + + BranchInst* BR = new BranchInst(PrelimBBMap[Func], ExceptBB, IsLJExcept); + InstList.push_back(BR); + + II.setExceptionalDest(NewExceptBB); + } + + // visitReturnInst - We want to destroy the setjmp map upon exit from the + // function. + void LowerSetJmp::visitReturnInst(ReturnInst& RI) + { + Function* Func = RI.getParent()->getParent(); + new CallInst(DestroySJMap, make_vector(GetSetJmpMap(Func), 0), + "", &RI); + } + + // visitUnwindInst - We want to destroy the setjmp map upon exit from the + // function. + void LowerSetJmp::visitUnwindInst(UnwindInst& UI) + { + Function* Func = UI.getParent()->getParent(); + new CallInst(DestroySJMap, make_vector(GetSetJmpMap(Func), 0), + "", &UI); + } + + Pass* createLowerSetJmpPass() + { + return new LowerSetJmp(); + } From lattner at cs.uiuc.edu Sun Sep 14 23:57:03 2003 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Sun Sep 14 23:57:03 2003 Subject: [llvm-commits] CVS: llvm/tools/gccas/gccas.cpp Message-ID: <200309150456.XAA12320@apoc.cs.uiuc.edu> Changes in directory llvm/tools/gccas: gccas.cpp updated: 1.73 -> 1.74 --- Log message: Enable the setjmp/longjmp lowering pass --- Diffs of the changes: Index: llvm/tools/gccas/gccas.cpp diff -u llvm/tools/gccas/gccas.cpp:1.73 llvm/tools/gccas/gccas.cpp:1.74 --- llvm/tools/gccas/gccas.cpp:1.73 Thu Sep 11 11:46:10 2003 +++ llvm/tools/gccas/gccas.cpp Sun Sep 14 23:56:44 2003 @@ -45,6 +45,7 @@ void AddConfiguredTransformationPasses(PassManager &PM) { PM.add(createVerifierPass()); // Verify that input is correct + addPass(PM, createLowerSetJmpPass()); // Lower llvm.setjmp/.longjmp addPass(PM, createFunctionResolvingPass()); // Resolve (...) functions addPass(PM, createRaiseAllocationsPass()); // call %malloc -> malloc inst addPass(PM, createGlobalDCEPass()); // Remove unused globals