From kremenek at apple.com Mon Oct 20 01:07:14 2008 From: kremenek at apple.com (Ted Kremenek) Date: Mon, 20 Oct 2008 06:07:14 -0000 Subject: [llvm-commits] [llvm] r57799 - /llvm/tags/checker/checker-112/ Message-ID: <200810200607.m9K67Egd022622@zion.cs.uiuc.edu> Author: kremenek Date: Mon Oct 20 01:07:13 2008 New Revision: 57799 URL: http://llvm.org/viewvc/llvm-project?rev=57799&view=rev Log: Removing checker-112. Removed: llvm/tags/checker/checker-112/ From kremenek at apple.com Mon Oct 20 01:07:43 2008 From: kremenek at apple.com (Ted Kremenek) Date: Mon, 20 Oct 2008 06:07:43 -0000 Subject: [llvm-commits] [llvm] r57801 - /llvm/tags/checker/checker-112/ Message-ID: <200810200607.m9K67h1W022654@zion.cs.uiuc.edu> Author: kremenek Date: Mon Oct 20 01:07:43 2008 New Revision: 57801 URL: http://llvm.org/viewvc/llvm-project?rev=57801&view=rev Log: Tagging checker-112. Added: llvm/tags/checker/checker-112/ - copied from r57800, llvm/trunk/ From evan.cheng at apple.com Mon Oct 20 01:10:40 2008 From: evan.cheng at apple.com (Evan Cheng) Date: Sun, 19 Oct 2008 23:10:40 -0700 Subject: [llvm-commits] [llvm] r57786 - /llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp In-Reply-To: <200810192051.m9JKpExj003636@zion.cs.uiuc.edu> References: <200810192051.m9JKpExj003636@zion.cs.uiuc.edu> Message-ID: Hi Bill, Just a suggestion. It would make the patch more readable if you commit the cosmetic changes separately. Thanks, Evan On Oct 19, 2008, at 1:51 PM, Bill Wendling wrote: > Author: void > Date: Sun Oct 19 15:51:12 2008 > New Revision: 57786 > > URL: http://llvm.org/viewvc/llvm-project?rev=57786&view=rev > Log: > Set N->OperandList to 0 after deletion. Otherwise, it's possible > that it will > be either deleted or referenced afterwards. > > Modified: > llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp > > Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp?rev=57786&r1=57785&r2=57786&view=diff > > = > = > = > = > = > = > = > = > ====================================================================== > --- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp (original) > +++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp Sun Oct 19 > 15:51:12 2008 > @@ -216,7 +216,7 @@ > unsigned OldG = (Operation >> 1) & 1; > return ISD::CondCode((Operation & ~6) | // Keep the N, U, E bits > (OldL << 1) | // New G bit > - (OldG << 2)); // New L bit. > + (OldG << 2)); // New L bit. > } > > /// getSetCCInverse - Return the operation corresponding to !(X op > Y), where > @@ -227,8 +227,10 @@ > Operation ^= 7; // Flip L, G, E bits, but not U. > else > Operation ^= 15; // Flip all of the condition bits. > + > if (Operation > ISD::SETTRUE2) > - Operation &= ~8; // Don't let N and U bits get set. > + Operation &= ~8; // Don't let N and U bits get set. > + > return ISD::CondCode(Operation); > } > > @@ -506,7 +508,8 @@ > /// encodeMemSDNodeFlags - Generic routine for computing a value for > use in > /// the CSE map that carries both alignment and volatility > information. > /// > -static unsigned encodeMemSDNodeFlags(bool isVolatile, unsigned > Alignment) { > +static inline unsigned > +encodeMemSDNodeFlags(bool isVolatile, unsigned Alignment) { > return isVolatile | ((Log2_32(Alignment) + 1) << 1); > } > > @@ -561,9 +564,10 @@ > if (Operand->use_empty()) > DeadNodes.push_back(Operand); > } > - if (N->OperandsNeedDelete) { > + > + if (N->OperandsNeedDelete) > delete[] N->OperandList; > - } > + > N->OperandList = 0; > N->NumOperands = 0; > > @@ -589,12 +593,14 @@ > } > > void SelectionDAG::DeleteNodeNotInCSEMaps(SDNode *N) { > - > // Drop all of the operands and decrement used node's use counts. > for (SDNode::op_iterator I = N->op_begin(), E = N->op_end(); I != > E; ++I) > I->getVal()->removeUser(std::distance(N->op_begin(), I), N); > - if (N->OperandsNeedDelete) > + > + if (N->OperandsNeedDelete) { > delete[] N->OperandList; > + N->OperandList = 0; > + } > > assert(N != AllNodes.begin()); > NodeAllocator.Deallocate(AllNodes.remove(N)); > @@ -675,13 +681,13 @@ > case ISD::DBG_STOPPOINT: > case ISD::EH_LABEL: > case ISD::DECLARE: > - return 0; // Never add these nodes. > + return 0; // Never add these nodes. > } > > // Check that remaining values produced are not flags. > for (unsigned i = 1, e = N->getNumValues(); i != e; ++i) > if (N->getValueType(i) == MVT::Flag) > - return 0; // Never CSE anything that produces a flag. > + return 0; // Never CSE anything that produces a flag. > > SDNode *New = CSEMap.GetOrInsertNode(N); > if (New != N) return New; // Node already existed. > @@ -703,13 +709,13 @@ > case ISD::DBG_LABEL: > case ISD::DBG_STOPPOINT: > case ISD::EH_LABEL: > - return 0; // Never add these nodes. > + return 0; // Never add these nodes. > } > > // Check that remaining values produced are not flags. > for (unsigned i = 1, e = N->getNumValues(); i != e; ++i) > if (N->getValueType(i) == MVT::Flag) > - return 0; // Never CSE anything that produces a flag. > + return 0; // Never CSE anything that produces a flag. > > SDValue Ops[] = { Op }; > FoldingSetNodeID ID; > @@ -729,7 +735,7 @@ > // Check that remaining values produced are not flags. > for (unsigned i = 1, e = N->getNumValues(); i != e; ++i) > if (N->getValueType(i) == MVT::Flag) > - return 0; // Never CSE anything that produces a flag. > + return 0; // Never CSE anything that produces a flag. > > SDValue Ops[] = { Op1, Op2 }; > FoldingSetNodeID ID; > @@ -755,13 +761,13 @@ > case ISD::DBG_STOPPOINT: > case ISD::EH_LABEL: > case ISD::DECLARE: > - return 0; // Never add these nodes. > + return 0; // Never add these nodes. > } > > // Check that remaining values produced are not flags. > for (unsigned i = 1, e = N->getNumValues(); i != e; ++i) > if (N->getValueType(i) == MVT::Flag) > - return 0; // Never CSE anything that produces a flag. > + return 0; // Never CSE anything that produces a flag. > > FoldingSetNodeID ID; > AddNodeIDNode(ID, N->getOpcode(), N->getVTList(), Ops, NumOps); > @@ -833,8 +839,12 @@ > while (!AllNodes.empty()) { > SDNode *N = AllNodes.remove(AllNodes.begin()); > N->SetNextInBucket(0); > - if (N->OperandsNeedDelete) > + > + if (N->OperandsNeedDelete) { > delete [] N->OperandList; > + N->OperandList = 0; > + } > + > NodeAllocator.Deallocate(N); > } > } > @@ -4208,6 +4218,7 @@ > if (NumOps > N->NumOperands) { > if (N->OperandsNeedDelete) > delete[] N->OperandList; > + > if (N->isMachineOpcode()) { > // We're creating a final node that will live unmorphed for the > // remainder of the current SelectionDAG iteration, so we can > allocate > > > _______________________________________________ > llvm-commits mailing list > llvm-commits at cs.uiuc.edu > http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits From isanbard at gmail.com Mon Oct 20 01:26:53 2008 From: isanbard at gmail.com (Bill Wendling) Date: Sun, 19 Oct 2008 23:26:53 -0700 Subject: [llvm-commits] [llvm] r57786 - /llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp In-Reply-To: <200810200502.53130.baldrick@free.fr> References: <200810192051.m9JKpExj003636@zion.cs.uiuc.edu> <200810200502.53130.baldrick@free.fr> Message-ID: <16F8D279-C057-4CC0-BEC0-2642C96733E3@gmail.com> On Oct 19, 2008, at 8:02 PM, Duncan Sands wrote: > Hi Bill, > >> @@ -4208,6 +4218,7 @@ >> if (NumOps > N->NumOperands) { >> if (N->OperandsNeedDelete) >> delete[] N->OperandList; >> + >> if (N->isMachineOpcode()) { >> // We're creating a final node that will live unmorphed for the >> // remainder of the current SelectionDAG iteration, so we can >> allocate > > is it needed here too? > I had it there at first, but then noticed that the N->OperandList is assigned right afterwards, so I didn't add it. -bw From isanbard at gmail.com Mon Oct 20 01:27:34 2008 From: isanbard at gmail.com (Bill Wendling) Date: Sun, 19 Oct 2008 23:27:34 -0700 Subject: [llvm-commits] [llvm] r57786 - /llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp In-Reply-To: References: <200810192051.m9JKpExj003636@zion.cs.uiuc.edu> Message-ID: <6AC89150-C446-4332-A48B-B5F60C9A877B@gmail.com> Sorry about that. I didn't realize that there were so many of them until afterwards. :-( -bw On Oct 19, 2008, at 11:10 PM, Evan Cheng wrote: > Hi Bill, > > Just a suggestion. It would make the patch more readable if you commit > the cosmetic changes separately. > > Thanks, > > Evan > > On Oct 19, 2008, at 1:51 PM, Bill Wendling wrote: > >> Author: void >> Date: Sun Oct 19 15:51:12 2008 >> New Revision: 57786 >> >> URL: http://llvm.org/viewvc/llvm-project?rev=57786&view=rev >> Log: >> Set N->OperandList to 0 after deletion. Otherwise, it's possible >> that it will >> be either deleted or referenced afterwards. >> >> Modified: >> llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp >> >> Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp >> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp?rev=57786&r1=57785&r2=57786&view=diff >> >> = >> = >> = >> = >> = >> = >> = >> = >> = >> ===================================================================== >> --- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp (original) >> +++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp Sun Oct 19 >> 15:51:12 2008 >> @@ -216,7 +216,7 @@ >> unsigned OldG = (Operation >> 1) & 1; >> return ISD::CondCode((Operation & ~6) | // Keep the N, U, E bits >> (OldL << 1) | // New G bit >> - (OldG << 2)); // New L bit. >> + (OldG << 2)); // New L bit. >> } >> >> /// getSetCCInverse - Return the operation corresponding to !(X op >> Y), where >> @@ -227,8 +227,10 @@ >> Operation ^= 7; // Flip L, G, E bits, but not U. >> else >> Operation ^= 15; // Flip all of the condition bits. >> + >> if (Operation > ISD::SETTRUE2) >> - Operation &= ~8; // Don't let N and U bits get set. >> + Operation &= ~8; // Don't let N and U bits get set. >> + >> return ISD::CondCode(Operation); >> } >> >> @@ -506,7 +508,8 @@ >> /// encodeMemSDNodeFlags - Generic routine for computing a value for >> use in >> /// the CSE map that carries both alignment and volatility >> information. >> /// >> -static unsigned encodeMemSDNodeFlags(bool isVolatile, unsigned >> Alignment) { >> +static inline unsigned >> +encodeMemSDNodeFlags(bool isVolatile, unsigned Alignment) { >> return isVolatile | ((Log2_32(Alignment) + 1) << 1); >> } >> >> @@ -561,9 +564,10 @@ >> if (Operand->use_empty()) >> DeadNodes.push_back(Operand); >> } >> - if (N->OperandsNeedDelete) { >> + >> + if (N->OperandsNeedDelete) >> delete[] N->OperandList; >> - } >> + >> N->OperandList = 0; >> N->NumOperands = 0; >> >> @@ -589,12 +593,14 @@ >> } >> >> void SelectionDAG::DeleteNodeNotInCSEMaps(SDNode *N) { >> - >> // Drop all of the operands and decrement used node's use counts. >> for (SDNode::op_iterator I = N->op_begin(), E = N->op_end(); I != >> E; ++I) >> I->getVal()->removeUser(std::distance(N->op_begin(), I), N); >> - if (N->OperandsNeedDelete) >> + >> + if (N->OperandsNeedDelete) { >> delete[] N->OperandList; >> + N->OperandList = 0; >> + } >> >> assert(N != AllNodes.begin()); >> NodeAllocator.Deallocate(AllNodes.remove(N)); >> @@ -675,13 +681,13 @@ >> case ISD::DBG_STOPPOINT: >> case ISD::EH_LABEL: >> case ISD::DECLARE: >> - return 0; // Never add these nodes. >> + return 0; // Never add these nodes. >> } >> >> // Check that remaining values produced are not flags. >> for (unsigned i = 1, e = N->getNumValues(); i != e; ++i) >> if (N->getValueType(i) == MVT::Flag) >> - return 0; // Never CSE anything that produces a flag. >> + return 0; // Never CSE anything that produces a flag. >> >> SDNode *New = CSEMap.GetOrInsertNode(N); >> if (New != N) return New; // Node already existed. >> @@ -703,13 +709,13 @@ >> case ISD::DBG_LABEL: >> case ISD::DBG_STOPPOINT: >> case ISD::EH_LABEL: >> - return 0; // Never add these nodes. >> + return 0; // Never add these nodes. >> } >> >> // Check that remaining values produced are not flags. >> for (unsigned i = 1, e = N->getNumValues(); i != e; ++i) >> if (N->getValueType(i) == MVT::Flag) >> - return 0; // Never CSE anything that produces a flag. >> + return 0; // Never CSE anything that produces a flag. >> >> SDValue Ops[] = { Op }; >> FoldingSetNodeID ID; >> @@ -729,7 +735,7 @@ >> // Check that remaining values produced are not flags. >> for (unsigned i = 1, e = N->getNumValues(); i != e; ++i) >> if (N->getValueType(i) == MVT::Flag) >> - return 0; // Never CSE anything that produces a flag. >> + return 0; // Never CSE anything that produces a flag. >> >> SDValue Ops[] = { Op1, Op2 }; >> FoldingSetNodeID ID; >> @@ -755,13 +761,13 @@ >> case ISD::DBG_STOPPOINT: >> case ISD::EH_LABEL: >> case ISD::DECLARE: >> - return 0; // Never add these nodes. >> + return 0; // Never add these nodes. >> } >> >> // Check that remaining values produced are not flags. >> for (unsigned i = 1, e = N->getNumValues(); i != e; ++i) >> if (N->getValueType(i) == MVT::Flag) >> - return 0; // Never CSE anything that produces a flag. >> + return 0; // Never CSE anything that produces a flag. >> >> FoldingSetNodeID ID; >> AddNodeIDNode(ID, N->getOpcode(), N->getVTList(), Ops, NumOps); >> @@ -833,8 +839,12 @@ >> while (!AllNodes.empty()) { >> SDNode *N = AllNodes.remove(AllNodes.begin()); >> N->SetNextInBucket(0); >> - if (N->OperandsNeedDelete) >> + >> + if (N->OperandsNeedDelete) { >> delete [] N->OperandList; >> + N->OperandList = 0; >> + } >> + >> NodeAllocator.Deallocate(N); >> } >> } >> @@ -4208,6 +4218,7 @@ >> if (NumOps > N->NumOperands) { >> if (N->OperandsNeedDelete) >> delete[] N->OperandList; >> + >> if (N->isMachineOpcode()) { >> // We're creating a final node that will live unmorphed for the >> // remainder of the current SelectionDAG iteration, so we can >> allocate >> >> >> _______________________________________________ >> llvm-commits mailing list >> llvm-commits at cs.uiuc.edu >> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits > > _______________________________________________ > llvm-commits mailing list > llvm-commits at cs.uiuc.edu > http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits From matthijs at stdin.nl Mon Oct 20 02:55:17 2008 From: matthijs at stdin.nl (Matthijs Kooijman) Date: Mon, 20 Oct 2008 09:55:17 +0200 Subject: [llvm-commits] [llvm] r57442 - /llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp In-Reply-To: <200810131800.44959.baldrick@free.fr> References: <200810131517.m9DFH380013820@zion.cs.uiuc.edu> <200810131739.51434.baldrick@free.fr> <20081013154735.GL28837@katherina.student.utwente.nl> <200810131800.44959.baldrick@free.fr> Message-ID: <20081020075517.GI26043@katherina.student.utwente.nl> Hi Duncan, > > > can stripPointerCasts be used here somehow? > > it does actually seem that that method does exactly what getBitCastOperand() > > does, with the exception that getBitCastOperand() works for non-pointers as > > well. However, both uses of getBitCastOperand only work with pointers AFAICS, > > so perhaps getBitCastOperand should just be removed alltogether, then? > do you mean that getBitCastOperand never actually returns null? In that case, > I agree that it's best to delete it. Uh, no. getBitCastOperand returns null in the cast the Value passed in is not bitcast-like. However, stripPointerCasts just returns the Value itself in that case, so both function do exactly the same thing. By updating the callers to use stripPointerCasts instead and checking for the old Value instead of NULL, getBitCastOperand could be deleted, I think? Agree to replace them? Gr. Matthijs -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 189 bytes Desc: Digital signature Url : http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20081020/14b306af/attachment.bin From matthijs at stdin.nl Mon Oct 20 03:45:35 2008 From: matthijs at stdin.nl (Matthijs Kooijman) Date: Mon, 20 Oct 2008 08:45:35 -0000 Subject: [llvm-commits] [llvm] r57820 - /llvm/trunk/docs/TableGenFundamentals.html Message-ID: <200810200845.m9K8jZuM004936@zion.cs.uiuc.edu> Author: matthijs Date: Mon Oct 20 03:45:34 2008 New Revision: 57820 URL: http://llvm.org/viewvc/llvm-project?rev=57820&view=rev Log: Fix spelling error. Modified: llvm/trunk/docs/TableGenFundamentals.html Modified: llvm/trunk/docs/TableGenFundamentals.html URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/TableGenFundamentals.html?rev=57820&r1=57819&r2=57820&view=diff ============================================================================== --- llvm/trunk/docs/TableGenFundamentals.html (original) +++ llvm/trunk/docs/TableGenFundamentals.html Mon Oct 20 03:45:34 2008 @@ -694,7 +694,7 @@ end-user to factor out commonality from the records.

File-scope "let" expressions take a comma-separated list of bindings to -apply, and one of more records to bind the values in. Here are some +apply, and one or more records to bind the values in. Here are some examples:

From baldrick at free.fr Mon Oct 20 04:28:18 2008 From: baldrick at free.fr (Duncan Sands) Date: Mon, 20 Oct 2008 11:28:18 +0200 Subject: [llvm-commits] [llvm] r57442 - /llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp In-Reply-To: <20081020075517.GI26043@katherina.student.utwente.nl> References: <200810131517.m9DFH380013820@zion.cs.uiuc.edu> <200810131800.44959.baldrick@free.fr> <20081020075517.GI26043@katherina.student.utwente.nl> Message-ID: <200810201128.19147.baldrick@free.fr> > Uh, no. getBitCastOperand returns null in the cast the Value passed in is not > bitcast-like. However, stripPointerCasts just returns the Value itself in that > case, so both function do exactly the same thing. By updating the callers to > use stripPointerCasts instead and checking for the old Value instead of NULL, > getBitCastOperand could be deleted, I think? > > Agree to replace them? Sure, be my guest :) Ciao, Duncan. From matthijs at stdin.nl Mon Oct 20 06:21:14 2008 From: matthijs at stdin.nl (Matthijs Kooijman) Date: Mon, 20 Oct 2008 11:21:14 -0000 Subject: [llvm-commits] [llvm] r57827 - /llvm/trunk/include/llvm/Target/TargetRegisterInfo.h Message-ID: <200810201121.m9KBLFtK011039@zion.cs.uiuc.edu> Author: matthijs Date: Mon Oct 20 06:21:12 2008 New Revision: 57827 URL: http://llvm.org/viewvc/llvm-project?rev=57827&view=rev Log: Remove an inappropriate (probably outdated) comment. Modified: llvm/trunk/include/llvm/Target/TargetRegisterInfo.h Modified: llvm/trunk/include/llvm/Target/TargetRegisterInfo.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/TargetRegisterInfo.h?rev=57827&r1=57826&r2=57827&view=diff ============================================================================== --- llvm/trunk/include/llvm/Target/TargetRegisterInfo.h (original) +++ llvm/trunk/include/llvm/Target/TargetRegisterInfo.h Mon Oct 20 06:21:12 2008 @@ -554,9 +554,7 @@ int SPAdj, RegScavenger *RS=NULL) const = 0; /// emitProlog/emitEpilog - These methods insert prolog and epilog code into - /// the function. The return value is the number of instructions - /// added to (negative if removed from) the basic block (entry for prologue). - /// + /// the function. virtual void emitPrologue(MachineFunction &MF) const = 0; virtual void emitEpilogue(MachineFunction &MF, MachineBasicBlock &MBB) const = 0; From matthijs at stdin.nl Mon Oct 20 06:23:18 2008 From: matthijs at stdin.nl (Matthijs Kooijman) Date: Mon, 20 Oct 2008 11:23:18 -0000 Subject: [llvm-commits] [llvm] r57828 - /llvm/trunk/include/llvm/Target/TargetRegisterInfo.h Message-ID: <200810201123.m9KBNI1V011095@zion.cs.uiuc.edu> Author: matthijs Date: Mon Oct 20 06:23:18 2008 New Revision: 57828 URL: http://llvm.org/viewvc/llvm-project?rev=57828&view=rev Log: Remove another stale comment. Modified: llvm/trunk/include/llvm/Target/TargetRegisterInfo.h Modified: llvm/trunk/include/llvm/Target/TargetRegisterInfo.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/TargetRegisterInfo.h?rev=57828&r1=57827&r2=57828&view=diff ============================================================================== --- llvm/trunk/include/llvm/Target/TargetRegisterInfo.h (original) +++ llvm/trunk/include/llvm/Target/TargetRegisterInfo.h Mon Oct 20 06:23:18 2008 @@ -547,9 +547,7 @@ /// eliminated by this method. This method may modify or replace the /// specified instruction, as long as it keeps the iterator pointing the the /// finished product. SPAdj is the SP adjustment due to call frame setup - /// instruction. The return value is the number of instructions added to - /// (negative if removed from) the basic block. - /// + /// instruction. virtual void eliminateFrameIndex(MachineBasicBlock::iterator MI, int SPAdj, RegScavenger *RS=NULL) const = 0; From matthijs at stdin.nl Mon Oct 20 06:24:58 2008 From: matthijs at stdin.nl (Matthijs Kooijman) Date: Mon, 20 Oct 2008 11:24:58 -0000 Subject: [llvm-commits] [llvm] r57829 - /llvm/trunk/include/llvm/Target/TargetRegisterInfo.h Message-ID: <200810201124.m9KBOwFJ011161@zion.cs.uiuc.edu> Author: matthijs Date: Mon Oct 20 06:24:57 2008 New Revision: 57829 URL: http://llvm.org/viewvc/llvm-project?rev=57829&view=rev Log: Fix typo in a comment. Modified: llvm/trunk/include/llvm/Target/TargetRegisterInfo.h Modified: llvm/trunk/include/llvm/Target/TargetRegisterInfo.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/TargetRegisterInfo.h?rev=57829&r1=57828&r2=57829&view=diff ============================================================================== --- llvm/trunk/include/llvm/Target/TargetRegisterInfo.h (original) +++ llvm/trunk/include/llvm/Target/TargetRegisterInfo.h Mon Oct 20 06:24:57 2008 @@ -563,7 +563,7 @@ /// getDwarfRegNum - Map a target register to an equivalent dwarf register /// number. Returns -1 if there is no equivalent value. The second /// parameter allows targets to use different numberings for EH info and - /// deubgging info. + /// debugging info. virtual int getDwarfRegNum(unsigned RegNum, bool isEH) const = 0; /// getFrameRegister - This method should return the register used as a base From stefanus.dutoit at rapidmind.com Mon Oct 20 10:18:01 2008 From: stefanus.dutoit at rapidmind.com (Stefanus Du Toit) Date: Mon, 20 Oct 2008 11:18:01 -0400 Subject: [llvm-commits] vector widening patch In-Reply-To: References: Message-ID: <5101CC65-BB18-4133-8A1A-1D852CD8EECA@rapidmind.com> Hi Mon Ping, > + // If it a vector of two, we will assume it doesn't make sense to > widen > + if (NElts == 2) > + return MVT::Other; What's the reasoning behind this? In our experience this makes a lot of sense, at least on x86 SSE2+ (assuming MMX is disabled). Stefanus On 18-Oct-08, at 12:12 AM, Mon Ping Wang wrote: > Hi, > > Here is a patch for vector widen. In certain cases, it is more > profitable to widen a vector from an illegal type to a legal type > (e.g., v7i8 to v8i8) instead of scalarzing the vector. This patch > implements that. The default implementation is to widen if there is a > legal type that is wider than the illegal type and the vector has more > elements. Any target can override the default logic and implement it > own policy. Please let me know if you have any comments or concerns. > > Thanks, > -- Mon Ping > -- Stefanus Du Toit RapidMind Inc. phone: +1 519 885 5455 x116 -- fax: +1 519 885 1463 From alenhar2 at cs.uiuc.edu Mon Oct 20 10:48:54 2008 From: alenhar2 at cs.uiuc.edu (Andrew Lenharth) Date: Mon, 20 Oct 2008 15:48:54 -0000 Subject: [llvm-commits] [poolalloc] r57830 - in /poolalloc/trunk: include/dsa/ include/poolalloc/ lib/DSA/ lib/PoolAllocate/ Message-ID: <200810201548.m9KFmtSa021869@zion.cs.uiuc.edu> Author: alenhar2 Date: Mon Oct 20 10:48:53 2008 New Revision: 57830 URL: http://llvm.org/viewvc/llvm-project?rev=57830&view=rev Log: fix use after free errors and make interfaces more uniform Modified: poolalloc/trunk/include/dsa/DSGraph.h poolalloc/trunk/include/dsa/DataStructure.h poolalloc/trunk/include/poolalloc/PoolAllocate.h poolalloc/trunk/lib/DSA/BottomUpClosure.cpp poolalloc/trunk/lib/DSA/CallTargets.cpp poolalloc/trunk/lib/DSA/DataStructure.cpp poolalloc/trunk/lib/DSA/DataStructureAA.cpp poolalloc/trunk/lib/DSA/DataStructureOpt.cpp poolalloc/trunk/lib/DSA/DataStructureStats.cpp poolalloc/trunk/lib/DSA/EquivClassGraphs.cpp poolalloc/trunk/lib/DSA/GraphChecker.cpp poolalloc/trunk/lib/DSA/Local.cpp poolalloc/trunk/lib/DSA/Printer.cpp poolalloc/trunk/lib/DSA/StdLibPass.cpp poolalloc/trunk/lib/DSA/TopDownClosure.cpp poolalloc/trunk/lib/PoolAllocate/AccessTrace.cpp poolalloc/trunk/lib/PoolAllocate/Heuristic.cpp poolalloc/trunk/lib/PoolAllocate/Heuristic.h poolalloc/trunk/lib/PoolAllocate/PASimple.cpp poolalloc/trunk/lib/PoolAllocate/PointerCompress.cpp poolalloc/trunk/lib/PoolAllocate/PoolAllocate.cpp poolalloc/trunk/lib/PoolAllocate/TransformFunctionBody.cpp Modified: poolalloc/trunk/include/dsa/DSGraph.h URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/include/dsa/DSGraph.h?rev=57830&r1=57829&r2=57830&view=diff ============================================================================== --- poolalloc/trunk/include/dsa/DSGraph.h (original) +++ poolalloc/trunk/include/dsa/DSGraph.h Mon Oct 20 10:48:53 2008 @@ -250,7 +250,7 @@ // source. You need to set a new GlobalsGraph with the setGlobalsGraph // method. // - DSGraph( DSGraph &DSG, EquivalenceClasses &ECs, + DSGraph( DSGraph* DSG, EquivalenceClasses &ECs, unsigned CloneFlags = 0); ~DSGraph(); @@ -316,6 +316,10 @@ return AuxFunctionCalls; } + // addAuxFunctionCall - Add a call site to the AuxFunctionCallList + void addAuxFunctionCall(DSCallSite D) { AuxFunctionCalls.push_front(D); } + + /// removeFunction - Specify that all call sites to the function have been /// fully specified by a pass such as StdLibPass. void removeFunctionCalls(Function& F); @@ -498,13 +502,13 @@ /// this graph, then clearing the RHS graph. Instead of performing this as /// two seperate operations, do it as a single, much faster, one. /// - void spliceFrom(DSGraph &RHS); + void spliceFrom(DSGraph* RHS); /// cloneInto - Clone the specified DSGraph into the current graph. /// /// The CloneFlags member controls various aspects of the cloning process. /// - void cloneInto(DSGraph &G, unsigned CloneFlags = 0); + void cloneInto(DSGraph* G, unsigned CloneFlags = 0); /// getFunctionArgumentsForCall - Given a function that is currently in this /// graph, return the DSNodeHandles that correspond to the pointer-compatible @@ -567,8 +571,8 @@ /// all of the nodes reachable from it are automatically brought over as well. /// class ReachabilityCloner { - DSGraph &Dest; - const DSGraph &Src; + DSGraph* Dest; + const DSGraph* Src; /// BitsToKeep - These bits are retained from the source node when the /// source nodes are merged into the destination graph. @@ -579,9 +583,9 @@ // represent them in the destination graph. DSGraph::NodeMapTy NodeMap; public: - ReachabilityCloner(DSGraph &dest, const DSGraph &src, unsigned cloneFlags) + ReachabilityCloner(DSGraph* dest, const DSGraph* src, unsigned cloneFlags) : Dest(dest), Src(src), CloneFlags(cloneFlags) { - assert(&Dest != &Src && "Cannot clone from graph to same graph!"); + assert(Dest != Src && "Cannot clone from graph to same graph!"); BitsToKeep = ~DSNode::DeadNode; if (CloneFlags & DSGraph::StripAllocaBit) BitsToKeep &= ~DSNode::AllocaNode; Modified: poolalloc/trunk/include/dsa/DataStructure.h URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/include/dsa/DataStructure.h?rev=57830&r1=57829&r2=57830&view=diff ============================================================================== --- poolalloc/trunk/include/dsa/DataStructure.h (original) +++ poolalloc/trunk/include/dsa/DataStructure.h Mon Oct 20 10:48:53 2008 @@ -140,19 +140,19 @@ /// getDSGraph - Return the data structure graph for the specified function. /// - DSGraph &getDSGraph(const Function &F) const { + DSGraph *getDSGraph(const Function &F) const { hash_map::const_iterator I = DSInfo.find(&F); assert(I != DSInfo.end() && "Function not in module!"); - return *I->second; + return I->second; } void setDSGraph(const Function& F, DSGraph* G) { DSInfo[&F] = G; } - DSGraph& getOrCreateGraph(const Function* F); + DSGraph* getOrCreateGraph(const Function* F); - DSGraph &getGlobalsGraph() const { return *GlobalsGraph; } + DSGraph* getGlobalsGraph() const { return GlobalsGraph; } EquivalenceClasses &getGlobalECs() { return GlobalECs; } @@ -246,9 +246,9 @@ bool runOnModuleInternal(Module &M); private: - void calculateGraph(DSGraph &G); + void calculateGraph(DSGraph* G); - void inlineUnresolved(DSGraph &G); + void inlineUnresolved(DSGraph* G); unsigned calculateGraphs(const Function *F, std::vector &Stack, @@ -256,7 +256,7 @@ hash_map &ValMap); - void CloneAuxIntoGlobal(DSGraph& G); + void CloneAuxIntoGlobal(DSGraph* G); void finalizeGlobals(void); }; @@ -367,7 +367,7 @@ void markReachableFunctionsExternallyAccessible(DSNode *N, hash_set &Visited); - void InlineCallersIntoGraph(DSGraph &G); + void InlineCallersIntoGraph(DSGraph* G); void ComputePostOrder(const Function &F, hash_set &Visited, std::vector &PostOrder); }; Modified: poolalloc/trunk/include/poolalloc/PoolAllocate.h URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/include/poolalloc/PoolAllocate.h?rev=57830&r1=57829&r2=57830&view=diff ============================================================================== --- poolalloc/trunk/include/poolalloc/PoolAllocate.h (original) +++ poolalloc/trunk/include/poolalloc/PoolAllocate.h Mon Oct 20 10:48:53 2008 @@ -121,11 +121,11 @@ return Graphs->hasDSGraph (F); } - virtual DSGraph & getDSGraph (const Function & F) const { + virtual DSGraph* getDSGraph (const Function & F) const { return Graphs->getDSGraph (F); } - virtual DSGraph & getGlobalsGraph () const { + virtual DSGraph* getGlobalsGraph () const { return Graphs->getGlobalsGraph (); } @@ -237,11 +237,11 @@ return ArrayType::get(VoidPtrType, 16); } - virtual DSGraph & getDSGraph (const Function & F) const { + virtual DSGraph* getDSGraph (const Function & F) const { return Graphs->getDSGraph (F); } - virtual DSGraph & getGlobalsGraph () const { + virtual DSGraph* getGlobalsGraph () const { return Graphs->getGlobalsGraph (); } @@ -320,11 +320,11 @@ /// pools specified in the NodesToPA list. This adds an entry to the /// PoolDescriptors map for each DSNode. /// - void CreatePools(Function &F, DSGraph &G, + void CreatePools(Function &F, DSGraph* G, const std::vector &NodesToPA, std::map &PoolDescriptors); - void TransformBody(DSGraph &g, PA::FuncInfo &fi, + void TransformBody(DSGraph* g, PA::FuncInfo &fi, std::multimap &poolUses, std::multimap &poolFrees, Function &F); @@ -378,12 +378,12 @@ void ProcessFunctionBodySimple(Function& F, TargetData & TD); - virtual DSGraph & getDSGraph (const Function & F) const { - return *CombinedDSGraph; + virtual DSGraph* getDSGraph (const Function & F) const { + return CombinedDSGraph; } - virtual DSGraph & getGlobalsGraph () const { - return *CombinedDSGraph; + virtual DSGraph* getGlobalsGraph () const { + return CombinedDSGraph; } virtual Value * getGlobalPool (const DSNode * Node) { Modified: poolalloc/trunk/lib/DSA/BottomUpClosure.cpp URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/DSA/BottomUpClosure.cpp?rev=57830&r1=57829&r2=57830&view=diff ============================================================================== --- poolalloc/trunk/lib/DSA/BottomUpClosure.cpp (original) +++ poolalloc/trunk/lib/DSA/BottomUpClosure.cpp Mon Oct 20 10:48:53 2008 @@ -95,21 +95,21 @@ // into the main function's graph so that the main function contains all of // the information about global pools and GV usage in the program. if (MainFunc && !MainFunc->isDeclaration()) { - DSGraph &MainGraph = getOrCreateGraph(MainFunc); - const DSGraph &GG = *MainGraph.getGlobalsGraph(); + DSGraph* MainGraph = getOrCreateGraph(MainFunc); + const DSGraph* GG = MainGraph->getGlobalsGraph(); ReachabilityCloner RC(MainGraph, GG, DSGraph::DontCloneCallNodes | DSGraph::DontCloneAuxCallNodes); // Clone the global nodes into this graph. - for (DSScalarMap::global_iterator I = GG.getScalarMap().global_begin(), - E = GG.getScalarMap().global_end(); I != E; ++I) + for (DSScalarMap::global_iterator I = GG->getScalarMap().global_begin(), + E = GG->getScalarMap().global_end(); I != E; ++I) if (isa(*I)) - RC.getClonedNH(GG.getNodeForValue(*I)); + RC.getClonedNH(GG->getNodeForValue(*I)); - MainGraph.maskIncompleteMarkers(); - MainGraph.markIncompleteNodes(DSGraph::MarkFormalArgs | - DSGraph::IgnoreGlobals); + MainGraph->maskIncompleteMarkers(); + MainGraph->markIncompleteNodes(DSGraph::MarkFormalArgs | + DSGraph::IgnoreGlobals); } NumCallEdges += callee_size(); @@ -194,17 +194,17 @@ /// GetAllAuxCallees - Return a list containing all of the resolvable callees in /// the aux list for the specified graph in the Callees vector. -static void GetAllAuxCallees(DSGraph &G, std::vector &Callees) { +static void GetAllAuxCallees(DSGraph* G, std::vector &Callees) { Callees.clear(); - for (DSGraph::afc_iterator I = G.afc_begin(), E = G.afc_end(); I != E; ++I) + for (DSGraph::afc_iterator I = G->afc_begin(), E = G->afc_end(); I != E; ++I) GetAllCallees(*I, Callees); } /// GetAnyAuxCallees - Return a list containing all of the callees in /// the aux list for the specified graph in the Callees vector. -static void GetAnyAuxCallees(DSGraph &G, std::vector &Callees) { +static void GetAnyAuxCallees(DSGraph* G, std::vector &Callees) { Callees.clear(); - for (DSGraph::afc_iterator I = G.afc_begin(), E = G.afc_end(); I != E; ++I) + for (DSGraph::afc_iterator I = G->afc_begin(), E = G->afc_end(); I != E; ++I) GetAnyCallees(*I, Callees); } @@ -227,7 +227,7 @@ return Min; } - DSGraph &Graph = getOrCreateGraph(F); + DSGraph* Graph = getOrCreateGraph(F); // Find all callee functions. std::vector CalleeFunctions; @@ -261,7 +261,7 @@ DOUT << " [BU] Calculating graph for: " << F->getName()<< "\n"; calculateGraph(Graph); DOUT << " [BU] Done inlining: " << F->getName() << " [" - << Graph.getGraphSize() << "+" << Graph.getAuxFunctionCalls().size() + << Graph->getGraphSize() << "+" << Graph->getAuxFunctionCalls().size() << "]\n"; if (MaxSCC < 1) MaxSCC = 1; @@ -295,7 +295,7 @@ unsigned SCCSize = 1; const Function *NF = Stack.back(); ValMap[NF] = ~0U; - DSGraph &SCCGraph = getDSGraph(*NF); + DSGraph* SCCGraph = getDSGraph(*NF); // First thing first, collapse all of the DSGraphs into a single graph for // the entire SCC. Splice all of the graphs into one and discard all of the @@ -306,17 +306,18 @@ NF = Stack.back(); ValMap[NF] = ~0U; - DSGraph &NFG = getDSGraph(*NF); + DSGraph* NFG = getDSGraph(*NF); - // Update the Function -> DSG map. - for (DSGraph::retnodes_iterator I = NFG.retnodes_begin(), - E = NFG.retnodes_end(); I != E; ++I) - setDSGraph(*I->first, &SCCGraph); - - SCCGraph.spliceFrom(NFG); - delete &NFG; - - ++SCCSize; + if (NFG != SCCGraph) { + // Update the Function -> DSG map. + for (DSGraph::retnodes_iterator I = NFG->retnodes_begin(), + E = NFG->retnodes_end(); I != E; ++I) + setDSGraph(*I->first, SCCGraph); + + SCCGraph->spliceFrom(NFG); + delete NFG; + ++SCCSize; + } } Stack.pop_back(); @@ -328,13 +329,13 @@ MaxSCC = SCCSize; // Clean up the graph before we start inlining a bunch again... - SCCGraph.removeDeadNodes(DSGraph::KeepUnreachableGlobals); + SCCGraph->removeDeadNodes(DSGraph::KeepUnreachableGlobals); // Now that we have one big happy family, resolve all of the call sites in // the graph... calculateGraph(SCCGraph); - DOUT << " [BU] Done inlining SCC [" << SCCGraph.getGraphSize() - << "+" << SCCGraph.getAuxFunctionCalls().size() << "]\n" + DOUT << " [BU] Done inlining SCC [" << SCCGraph->getGraphSize() + << "+" << SCCGraph->getAuxFunctionCalls().size() << "]\n" << "DONE with SCC #: " << MyID << "\n"; // We never have to revisit "SCC" processed functions... @@ -346,35 +347,35 @@ return MyID; // == Min } -void BUDataStructures::CloneAuxIntoGlobal(DSGraph& G) { - DSGraph& GG = *G.getGlobalsGraph(); +void BUDataStructures::CloneAuxIntoGlobal(DSGraph* G) { + DSGraph* GG = G->getGlobalsGraph(); ReachabilityCloner RC(GG, G, 0); - for(DSGraph::afc_iterator ii = G.afc_begin(), ee = G.afc_end(); + for(DSGraph::afc_iterator ii = G->afc_begin(), ee = G->afc_end(); ii != ee; ++ii) { //cerr << "Pushing " << ii->getCallSite().getInstruction()->getOperand(0) << "\n"; //If we can, merge with an existing call site for this instruction - if (GG.hasNodeForValue(ii->getCallSite().getInstruction()->getOperand(0))) { + if (GG->hasNodeForValue(ii->getCallSite().getInstruction()->getOperand(0))) { DSGraph::afc_iterator GGii; - for(GGii = GG.afc_begin(); GGii != GG.afc_end(); ++GGii) + for(GGii = GG->afc_begin(); GGii != GG->afc_end(); ++GGii) if (GGii->getCallSite().getInstruction()->getOperand(0) == ii->getCallSite().getInstruction()->getOperand(0)) break; - if (GGii != GG.afc_end()) + if (GGii != GG->afc_end()) RC.cloneCallSite(*ii).mergeWith(*GGii); else - GG.getAuxFunctionCalls().push_front(RC.cloneCallSite(*ii)); + GG->addAuxFunctionCall(RC.cloneCallSite(*ii)); } else { - GG.getAuxFunctionCalls().push_front(RC.cloneCallSite(*ii)); + GG->addAuxFunctionCall(RC.cloneCallSite(*ii)); } } } -void BUDataStructures::calculateGraph(DSGraph &Graph) { +void BUDataStructures::calculateGraph(DSGraph* Graph) { // If this graph contains the main function, clone the globals graph into this // graph before we inline callees and other fun stuff. bool ContainsMain = false; - DSGraph::ReturnNodesTy &ReturnNodes = Graph.getReturnNodes(); + DSGraph::ReturnNodesTy &ReturnNodes = Graph->getReturnNodes(); for (DSGraph::ReturnNodesTy::iterator I = ReturnNodes.begin(), E = ReturnNodes.end(); I != E; ++I) @@ -388,22 +389,22 @@ // of a global, we have to make sure to link up nodes due to global-argument // bindings. if (ContainsMain || ReInlineGlobals) { - const DSGraph &GG = *Graph.getGlobalsGraph(); + const DSGraph* GG = Graph->getGlobalsGraph(); ReachabilityCloner RC(Graph, GG, DSGraph::DontCloneCallNodes | DSGraph::DontCloneAuxCallNodes); if (ContainsMain) { // Clone the global nodes into this graph. - for (DSScalarMap::global_iterator I = GG.getScalarMap().global_begin(), - E = GG.getScalarMap().global_end(); I != E; ++I) + for (DSScalarMap::global_iterator I = GG->getScalarMap().global_begin(), + E = GG->getScalarMap().global_end(); I != E; ++I) if (isa(*I)) - RC.getClonedNH(GG.getNodeForValue(*I)); + RC.getClonedNH(GG->getNodeForValue(*I)); } else { // Clone used the global nodes into this graph. - for (DSScalarMap::global_iterator I = Graph.getScalarMap().global_begin(), - E = Graph.getScalarMap().global_end(); I != E; ++I) + for (DSScalarMap::global_iterator I = Graph->getScalarMap().global_begin(), + E = Graph->getScalarMap().global_end(); I != E; ++I) if (isa(*I)) - RC.getClonedNH(GG.getNodeForValue(*I)); + RC.getClonedNH(GG->getNodeForValue(*I)); } } @@ -411,7 +412,7 @@ // Move our call site list into TempFCs so that inline call sites go into the // new call site list and doesn't invalidate our iterators! std::list TempFCs; - std::list &AuxCallsList = Graph.getAuxFunctionCalls(); + std::list &AuxCallsList = Graph->getAuxFunctionCalls(); TempFCs.swap(AuxCallsList); std::vector CalledFuncs; @@ -447,18 +448,18 @@ const Function *Callee = CalledFuncs[0]; // Get the data structure graph for the called function. - GI = &getDSGraph(*Callee); // Graph to inline + GI = getDSGraph(*Callee); // Graph to inline DOUT << " Inlining graph for " << Callee->getName() << "[" << GI->getGraphSize() << "+" << GI->getAuxFunctionCalls().size() << "] into '" - << Graph.getFunctionNames() << "' [" << Graph.getGraphSize() <<"+" - << Graph.getAuxFunctionCalls().size() << "]\n"; - Graph.mergeInGraph(CS, *Callee, *GI, - DSGraph::StripAllocaBit|DSGraph::DontCloneCallNodes| - (isComplete?0:DSGraph::DontCloneAuxCallNodes)); + << Graph->getFunctionNames() << "' [" << Graph->getGraphSize() <<"+" + << Graph->getAuxFunctionCalls().size() << "]\n"; + Graph->mergeInGraph(CS, *Callee, *GI, + DSGraph::StripAllocaBit|DSGraph::DontCloneCallNodes| + (isComplete?0:DSGraph::DontCloneAuxCallNodes)); ++NumInlines; } else if (CalledFuncs.size() > 1) { - DEBUG(std::cerr << "In Fns: " << Graph.getFunctionNames() << "\n"); + DEBUG(std::cerr << "In Fns: " << Graph->getFunctionNames() << "\n"); DEBUG(std::cerr << " calls " << CalledFuncs.size() << " fns from site: " << CS.getCallSite().getInstruction() << " " << *CS.getCallSite().getInstruction()); @@ -489,7 +490,7 @@ // Start with a copy of the first graph. GI = IndCallGraph.first = new DSGraph(getDSGraph(**I), GlobalECs); - GI->setGlobalsGraph(Graph.getGlobalsGraph()); + GI->setGlobalsGraph(Graph->getGlobalsGraph()); std::vector &Args = IndCallGraph.second; // Get the argument nodes for the first callee. The return value is @@ -528,13 +529,13 @@ DOUT << " Inlining multi callee graph " << "[" << GI->getGraphSize() << "+" << GI->getAuxFunctionCalls().size() << "] into '" - << Graph.getFunctionNames() << "' [" << Graph.getGraphSize() <<"+" - << Graph.getAuxFunctionCalls().size() << "]\n"; + << Graph->getFunctionNames() << "' [" << Graph->getGraphSize() <<"+" + << Graph->getAuxFunctionCalls().size() << "]\n"; - Graph.mergeInGraph(CS, IndCallGraph.second, *GI, - DSGraph::StripAllocaBit | - DSGraph::DontCloneCallNodes| - (isComplete?0:DSGraph::DontCloneAuxCallNodes)); + Graph->mergeInGraph(CS, IndCallGraph.second, *GI, + DSGraph::StripAllocaBit | + DSGraph::DontCloneCallNodes| + (isComplete?0:DSGraph::DontCloneAuxCallNodes)); ++NumInlines; } } @@ -544,17 +545,17 @@ } // Recompute the Incomplete markers - Graph.maskIncompleteMarkers(); - Graph.markIncompleteNodes(DSGraph::MarkFormalArgs); + Graph->maskIncompleteMarkers(); + Graph->markIncompleteNodes(DSGraph::MarkFormalArgs); // Delete dead nodes. Treat globals that are unreachable but that can // reach live nodes as live. - Graph.removeDeadNodes(DSGraph::KeepUnreachableGlobals); + Graph->removeDeadNodes(DSGraph::KeepUnreachableGlobals); // When this graph is finalized, clone the globals in the graph into the // globals graph to make sure it has everything, from all graphs. - DSScalarMap &MainSM = Graph.getScalarMap(); - ReachabilityCloner RC(*GlobalsGraph, Graph, DSGraph::StripAllocaBit); + DSScalarMap &MainSM = Graph->getScalarMap(); + ReachabilityCloner RC(GlobalsGraph, Graph, DSGraph::StripAllocaBit); // Clone everything reachable from globals in the function graph into the // globals graph. @@ -565,8 +566,8 @@ //Graph.writeGraphToFile(cerr, "bu_" + F.getName()); } -void BUDataStructures::inlineUnresolved(DSGraph &Graph) { - for (DSGraph::afc_iterator aii = Graph.afc_begin(), aee = Graph.afc_end(); +void BUDataStructures::inlineUnresolved(DSGraph* Graph) { + for (DSGraph::afc_iterator aii = Graph->afc_begin(), aee = Graph->afc_end(); aii != aee; ++aii) { std::vector CalledFuncs; DSCallSite CS = *aii; @@ -585,18 +586,18 @@ const Function *Callee = CalledFuncs[0]; // Get the data structure graph for the called function. - GI = &getDSGraph(*Callee); // Graph to inline - if (GI == &Graph) continue; + GI = getDSGraph(*Callee); // Graph to inline + if (GI == Graph) continue; DOUT << " Inlining graph for " << Callee->getName() << "[" << GI->getGraphSize() << "+" << GI->getAuxFunctionCalls().size() << "] into '" - << Graph.getFunctionNames() << "' [" << Graph.getGraphSize() <<"+" - << Graph.getAuxFunctionCalls().size() << "]\n"; - Graph.mergeInGraph(CS, *Callee, *GI, + << Graph->getFunctionNames() << "' [" << Graph->getGraphSize() <<"+" + << Graph->getAuxFunctionCalls().size() << "]\n"; + Graph->mergeInGraph(CS, *Callee, *GI, DSGraph::StripAllocaBit|DSGraph::DontCloneCallNodes); ++NumInlines; } else { - DEBUG(std::cerr << "In Fns: " << Graph.getFunctionNames() << "\n"); + DEBUG(std::cerr << "In Fns: " << Graph->getFunctionNames() << "\n"); DEBUG(std::cerr << " calls " << CalledFuncs.size() << " fns from site: " << CS.getCallSite().getInstruction() << " " << *CS.getCallSite().getInstruction()); @@ -621,7 +622,7 @@ std::pair > &IndCallGraph = IndCallGraphMap[CalledFuncs]; - if (IndCallGraph.first == &Graph) continue; + if (IndCallGraph.first == Graph) continue; if (IndCallGraph.first == 0) { std::vector::iterator I = CalledFuncs.begin(), @@ -629,7 +630,7 @@ // Start with a copy of the first graph. GI = IndCallGraph.first = new DSGraph(getDSGraph(**I), GlobalECs); - GI->setGlobalsGraph(Graph.getGlobalsGraph()); + GI->setGlobalsGraph(Graph->getGlobalsGraph()); std::vector &Args = IndCallGraph.second; // Get the argument nodes for the first callee. The return value is @@ -668,28 +669,28 @@ DOUT << " Inlining multi callee graph " << "[" << GI->getGraphSize() << "+" << GI->getAuxFunctionCalls().size() << "] into '" - << Graph.getFunctionNames() << "' [" << Graph.getGraphSize() <<"+" - << Graph.getAuxFunctionCalls().size() << "]\n"; + << Graph->getFunctionNames() << "' [" << Graph->getGraphSize() <<"+" + << Graph->getAuxFunctionCalls().size() << "]\n"; - Graph.mergeInGraph(CS, IndCallGraph.second, *GI, - DSGraph::StripAllocaBit | - DSGraph::DontCloneCallNodes); + Graph->mergeInGraph(CS, IndCallGraph.second, *GI, + DSGraph::StripAllocaBit | + DSGraph::DontCloneCallNodes); ++NumInlines; } } // Recompute the Incomplete markers - Graph.maskIncompleteMarkers(); - Graph.markIncompleteNodes(DSGraph::MarkFormalArgs); + Graph->maskIncompleteMarkers(); + Graph->markIncompleteNodes(DSGraph::MarkFormalArgs); // Delete dead nodes. Treat globals that are unreachable but that can // reach live nodes as live. - Graph.removeDeadNodes(DSGraph::KeepUnreachableGlobals); + Graph->removeDeadNodes(DSGraph::KeepUnreachableGlobals); // When this graph is finalized, clone the globals in the graph into the // globals graph to make sure it has everything, from all graphs. - DSScalarMap &MainSM = Graph.getScalarMap(); - ReachabilityCloner RC(*GlobalsGraph, Graph, DSGraph::StripAllocaBit); + DSScalarMap &MainSM = Graph->getScalarMap(); + ReachabilityCloner RC(GlobalsGraph, Graph, DSGraph::StripAllocaBit); // Clone everything reachable from globals in the function graph into the // globals graph. Modified: poolalloc/trunk/lib/DSA/CallTargets.cpp URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/DSA/CallTargets.cpp?rev=57830&r1=57829&r2=57830&view=diff ============================================================================== --- poolalloc/trunk/lib/DSA/CallTargets.cpp (original) +++ poolalloc/trunk/lib/DSA/CallTargets.cpp Mon Oct 20 10:48:53 2008 @@ -53,7 +53,7 @@ if (!cs.getCalledFunction()) { IndCall++; DSNode* N = T->getDSGraph(*cs.getCaller()) - .getNodeForValue(cs.getCalledValue()).getNode(); + ->getNodeForValue(cs.getCalledValue()).getNode(); N->addFullFunctionList(IndMap[cs]); if (N->isCompleteNode() && IndMap[cs].size()) { CompleteSites.insert(cs); Modified: poolalloc/trunk/lib/DSA/DataStructure.cpp URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/DSA/DataStructure.cpp?rev=57830&r1=57829&r2=57830&view=diff ============================================================================== --- poolalloc/trunk/lib/DSA/DataStructure.cpp (original) +++ poolalloc/trunk/lib/DSA/DataStructure.cpp Mon Oct 20 10:48:53 2008 @@ -1040,14 +1040,14 @@ // If SrcNH has globals and the destination graph has one of the same globals, // merge this node with the destination node, which is much more efficient. if (SN->globals_begin() != SN->globals_end()) { - DSScalarMap &DestSM = Dest.getScalarMap(); + DSScalarMap &DestSM = Dest->getScalarMap(); for (DSNode::globals_iterator I = SN->globals_begin(),E = SN->globals_end(); I != E; ++I) { const GlobalValue *GV = *I; DSScalarMap::iterator GI = DestSM.find(GV); if (GI != DestSM.end() && !GI->second.isNull()) { // We found one, use merge instead! - merge(GI->second, Src.getNodeForValue(GV)); + merge(GI->second, Src->getNodeForValue(GV)); assert(!NH.isNull() && "Didn't merge node!"); DSNode *NHN = NH.getNode(); return DSNodeHandle(NHN, NH.getOffset()+SrcNH.getOffset()); @@ -1055,7 +1055,7 @@ } } - DSNode *DN = new DSNode(*SN, &Dest, true /* Null out all links */); + DSNode *DN = new DSNode(*SN, Dest, true /* Null out all links */); DN->maskNodeTypes(BitsToKeep); NH = DN; //DOUT << "getClonedNH: " << SN << " becomes " << DN << "\n"; @@ -1100,11 +1100,11 @@ for (DSNode::globals_iterator I = SN->globals_begin(), E = SN->globals_end(); I != E; ++I) { const GlobalValue *GV = *I; - const DSNodeHandle &SrcGNH = Src.getNodeForValue(GV); + const DSNodeHandle &SrcGNH = Src->getNodeForValue(GV); DSNodeHandle &DestGNH = NodeMap[SrcGNH.getNode()]; assert(DestGNH.getNode() == NH.getNode() &&"Global mapping inconsistent"); - Dest.getNodeForValue(GV).mergeWith(DSNodeHandle(DestGNH.getNode(), - DestGNH.getOffset()+SrcGNH.getOffset())); + Dest->getNodeForValue(GV).mergeWith(DSNodeHandle(DestGNH.getNode(), + DestGNH.getOffset()+SrcGNH.getOffset())); } NH.getNode()->mergeGlobals(SN->getGlobalsList()); @@ -1189,10 +1189,10 @@ for (DSNode::globals_iterator I = SN->globals_begin(), E = SN->globals_end(); I != E; ++I) { const GlobalValue *GV = *I; - const DSNodeHandle &SrcGNH = Src.getNodeForValue(GV); + const DSNodeHandle &SrcGNH = Src->getNodeForValue(GV); DSNodeHandle &DestGNH = NodeMap[SrcGNH.getNode()]; assert(DestGNH.getNode()==NH.getNode() &&"Global mapping inconsistent"); - Dest.getNodeForValue(GV).mergeWith(DSNodeHandle(DestGNH.getNode(), + Dest->getNodeForValue(GV).mergeWith(DSNodeHandle(DestGNH.getNode(), DestGNH.getOffset()+SrcGNH.getOffset())); } NH.getNode()->mergeGlobals(SN->getGlobalsList()); @@ -1200,7 +1200,7 @@ } else { // We cannot handle this case without allocating a temporary node. Fall // back on being simple. - DSNode *NewDN = new DSNode(*SN, &Dest, true /* Null out all links */); + DSNode *NewDN = new DSNode(*SN, Dest, true /* Null out all links */); NewDN->maskNodeTypes(BitsToKeep); unsigned NHOffset = NH.getOffset(); @@ -1220,11 +1220,11 @@ for (DSNode::globals_iterator I = SN->globals_begin(), E = SN->globals_end(); I != E; ++I) { const GlobalValue *GV = *I; - const DSNodeHandle &SrcGNH = Src.getNodeForValue(GV); + const DSNodeHandle &SrcGNH = Src->getNodeForValue(GV); DSNodeHandle &DestGNH = NodeMap[SrcGNH.getNode()]; assert(DestGNH.getNode()==NH.getNode() &&"Global mapping inconsistent"); assert(SrcGNH.getNode() == SN && "Global mapping inconsistent"); - Dest.getNodeForValue(GV).mergeWith(DSNodeHandle(DestGNH.getNode(), + Dest->getNodeForValue(GV).mergeWith(DSNodeHandle(DestGNH.getNode(), DestGNH.getOffset()+SrcGNH.getOffset())); } } @@ -1428,9 +1428,9 @@ } -DSGraph::DSGraph(DSGraph &G, EquivalenceClasses &ECs, +DSGraph::DSGraph(DSGraph* G, EquivalenceClasses &ECs, unsigned CloneFlags) - : GlobalsGraph(0), ScalarMap(ECs), TD(G.TD) { + : GlobalsGraph(0), ScalarMap(ECs), TD(G->TD) { PrintAuxCalls = false; cloneInto(G, CloneFlags); } @@ -1514,9 +1514,9 @@ /// /// The CloneFlags member controls various aspects of the cloning process. /// -void DSGraph::cloneInto( DSGraph &G, unsigned CloneFlags) { +void DSGraph::cloneInto( DSGraph* G, unsigned CloneFlags) { TIME_REGION(X, "cloneInto"); - assert(&G != this && "Cannot clone graph into itself!"); + assert(G != this && "Cannot clone graph into itself!"); NodeMapTy OldNodeMap; @@ -1526,7 +1526,7 @@ | ((CloneFlags & StripIncompleteBit)? DSNode::IncompleteNode : 0); BitsToClear |= DSNode::DeadNode; // Clear dead flag... - for (node_const_iterator I = G.node_begin(), E = G.node_end(); I != E; ++I) { + for (node_const_iterator I = G->node_begin(), E = G->node_end(); I != E; ++I) { assert(!I->isForwarding() && "Forward nodes shouldn't be in node list!"); DSNode *New = new DSNode(*I, this); @@ -1550,8 +1550,8 @@ I->second.getNode()->remapLinks(OldNodeMap); // Copy the scalar map... merging all of the global nodes... - for (DSScalarMap::const_iterator I = G.ScalarMap.begin(), - E = G.ScalarMap.end(); I != E; ++I) { + for (DSScalarMap::const_iterator I = G->ScalarMap.begin(), + E = G->ScalarMap.end(); I != E; ++I) { DSNodeHandle &MappedNode = OldNodeMap[I->second.getNode()]; DSNodeHandle &H = ScalarMap.getRawEntryRef(I->first); DSNode *MappedNodeN = MappedNode.getNode(); @@ -1561,19 +1561,19 @@ if (!(CloneFlags & DontCloneCallNodes)) { // Copy the function calls list. - for (fc_iterator I = G.fc_begin(), E = G.fc_end(); I != E; ++I) + for (fc_iterator I = G->fc_begin(), E = G->fc_end(); I != E; ++I) FunctionCalls.push_back(DSCallSite(*I, OldNodeMap)); } if (!(CloneFlags & DontCloneAuxCallNodes)) { // Copy the auxiliary function calls list. - for (afc_iterator I = G.afc_begin(), E = G.afc_end(); I != E; ++I) + for (afc_iterator I = G->afc_begin(), E = G->afc_end(); I != E; ++I) AuxFunctionCalls.push_back(DSCallSite(*I, OldNodeMap)); } // Map the return node pointers over... - for (retnodes_iterator I = G.retnodes_begin(), - E = G.retnodes_end(); I != E; ++I) { + for (retnodes_iterator I = G->retnodes_begin(), + E = G->retnodes_end(); I != E; ++I) { const DSNodeHandle &Ret = I->second; DSNodeHandle &MappedRet = OldNodeMap[Ret.getNode()]; DSNode *MappedRetN = MappedRet.getNode(); @@ -1587,28 +1587,29 @@ /// this graph, then clearing the RHS graph. Instead of performing this as /// two seperate operations, do it as a single, much faster, one. /// -void DSGraph::spliceFrom(DSGraph &RHS) { +void DSGraph::spliceFrom(DSGraph* RHS) { + assert(this != RHS && "Splicing self"); // Change all of the nodes in RHS to think we are their parent. - for (NodeListTy::iterator I = RHS.Nodes.begin(), E = RHS.Nodes.end(); + for (NodeListTy::iterator I = RHS->Nodes.begin(), E = RHS->Nodes.end(); I != E; ++I) I->setParentGraph(this); // Take all of the nodes. - Nodes.splice(Nodes.end(), RHS.Nodes); + Nodes.splice(Nodes.end(), RHS->Nodes); // Take all of the calls. - FunctionCalls.splice(FunctionCalls.end(), RHS.FunctionCalls); - AuxFunctionCalls.splice(AuxFunctionCalls.end(), RHS.AuxFunctionCalls); + FunctionCalls.splice(FunctionCalls.end(), RHS->FunctionCalls); + AuxFunctionCalls.splice(AuxFunctionCalls.end(), RHS->AuxFunctionCalls); // Take all of the return nodes. if (ReturnNodes.empty()) { - ReturnNodes.swap(RHS.ReturnNodes); + ReturnNodes.swap(RHS->ReturnNodes); } else { - ReturnNodes.insert(RHS.ReturnNodes.begin(), RHS.ReturnNodes.end()); - RHS.ReturnNodes.clear(); + ReturnNodes.insert(RHS->ReturnNodes.begin(), RHS->ReturnNodes.end()); + RHS->ReturnNodes.clear(); } // Merge the scalar map in. - ScalarMap.spliceFrom(RHS.ScalarMap); + ScalarMap.spliceFrom(RHS->ScalarMap); } /// spliceFrom - Copy all entries from RHS, then clear RHS. @@ -1783,7 +1784,7 @@ // Clone the callee's graph into the current graph, keeping track of where // scalars in the old graph _used_ to point, and of the new nodes matching // nodes of the old graph. - ReachabilityCloner RC(*this, Graph, CloneFlags); + ReachabilityCloner RC(this, &Graph, CloneFlags); // Map the return node pointer over. if (!CS.getRetVal().isNull()) @@ -2348,7 +2349,7 @@ // Strip all incomplete bits since they are short-lived properties and they // will be correctly computed when rematerializing nodes into the functions. // - ReachabilityCloner GGCloner(*GlobalsGraph, *this, DSGraph::StripAllocaBit | + ReachabilityCloner GGCloner(GlobalsGraph, this, DSGraph::StripAllocaBit | DSGraph::StripIncompleteBit); // Mark all nodes reachable by (non-global) scalar nodes as alive... @@ -2647,7 +2648,7 @@ /// void DSGraph::updateFromGlobalGraph() { TIME_REGION(X, "updateFromGlobalGraph"); - ReachabilityCloner RC(*this, *GlobalsGraph, 0); + ReachabilityCloner RC(this, GlobalsGraph, 0); // Clone the non-up-to-date global nodes into this graph. for (DSScalarMap::global_iterator I = getScalarMap().global_begin(), @@ -2678,12 +2679,12 @@ void DataStructures::deleteValue(Value *V) { if (const Function *F = getFnForValue(V)) { // Function local value? // If this is a function local value, just delete it from the scalar map! - getDSGraph(*F).getScalarMap().eraseIfExists(V); + getDSGraph(*F)->getScalarMap().eraseIfExists(V); return; } if (Function *F = dyn_cast(V)) { - assert(getDSGraph(*F).getReturnNodes().size() == 1 && + assert(getDSGraph(*F)->getReturnNodes().size() == 1 && "cannot handle scc's"); delete DSInfo[F]; DSInfo.erase(F); @@ -2697,7 +2698,7 @@ if (From == To) return; if (const Function *F = getFnForValue(From)) { // Function local value? // If this is a function local value, just delete it from the scalar map! - getDSGraph(*F).getScalarMap().copyScalarIfExists(From, To); + getDSGraph(*F)->getScalarMap().copyScalarIfExists(From, To); return; } @@ -2716,8 +2717,7 @@ } if (const Function *F = getFnForValue(To)) { - DSGraph &G = getDSGraph(*F); - G.getScalarMap().copyScalarIfExists(From, To); + getDSGraph(*F)->getScalarMap().copyScalarIfExists(From, To); return; } @@ -2727,12 +2727,12 @@ abort(); } -DSGraph& DataStructures::getOrCreateGraph(const Function* F) { +DSGraph* DataStructures::getOrCreateGraph(const Function* F) { assert(F && "No function"); DSGraph *&G = DSInfo[F]; if (!G) { //Clone or Steal the Source Graph - DSGraph &BaseGraph = GraphSource->getDSGraph(*F); + DSGraph* BaseGraph = GraphSource->getDSGraph(*F); if (Clone) { G = new DSGraph(BaseGraph, GlobalECs, DSGraph::DontCloneAuxCallNodes); } else { @@ -2751,7 +2751,7 @@ if (RI->first != F) DSInfo[RI->first] = G; } - return *G; + return G; } @@ -2873,11 +2873,13 @@ } void DataStructures::releaseMemory() { + hash_set toDelete; for (DSInfoTy::iterator I = DSInfo.begin(), E = DSInfo.end(); I != E; ++I) { - I->second->getReturnNodes().erase(I->first); - if (I->second->getReturnNodes().empty()) - delete I->second; + I->second->getReturnNodes().clear(); + toDelete.insert(I->second); } + for (hash_set::iterator I = toDelete.begin(), E = toDelete.end(); I != E; ++I) + delete *I; // Empty map so next time memory is released, data structures are not // re-deleted. Modified: poolalloc/trunk/lib/DSA/DataStructureAA.cpp URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/DSA/DataStructureAA.cpp?rev=57830&r1=57829&r2=57830&view=diff ============================================================================== --- poolalloc/trunk/lib/DSA/DataStructureAA.cpp (original) +++ poolalloc/trunk/lib/DSA/DataStructureAA.cpp Mon Oct 20 10:48:53 2008 @@ -113,11 +113,11 @@ // DSGraph *DSAA::getGraphForValue(const Value *V) { if (const Instruction *I = dyn_cast(V)) - return &TD->getDSGraph(*I->getParent()->getParent()); + return TD->getDSGraph(*I->getParent()->getParent()); else if (const Argument *A = dyn_cast(V)) - return &TD->getDSGraph(*A->getParent()); + return TD->getDSGraph(*A->getParent()); else if (const BasicBlock *BB = dyn_cast(V)) - return &TD->getDSGraph(*BB->getParent()); + return TD->getDSGraph(*BB->getParent()); return 0; } @@ -130,9 +130,9 @@ assert((!G1 || !G2 || G1 == G2) && "Alias query for 2 different functions?"); // Get the graph to use... - DSGraph &G = *(G1 ? G1 : (G2 ? G2 : &TD->getGlobalsGraph())); + DSGraph* G = G1 ? G1 : (G2 ? G2 : TD->getGlobalsGraph()); - const DSGraph::ScalarMapTy &GSM = G.getScalarMap(); + const DSGraph::ScalarMapTy &GSM = G->getScalarMap(); DSGraph::ScalarMapTy::const_iterator I = GSM.find((Value*)V1); if (I == GSM.end()) return NoAlias; @@ -178,10 +178,10 @@ if (CS.getInstruction() == MapCS.getInstruction()) { { const Function *Caller = CS.getInstruction()->getParent()->getParent(); - DSGraph &CallerTDGraph = TD->getDSGraph(*Caller); + DSGraph* CallerTDGraph = TD->getDSGraph(*Caller); // Figure out which node in the TD graph this pointer corresponds to. - DSScalarMap &CallerSM = CallerTDGraph.getScalarMap(); + DSScalarMap &CallerSM = CallerTDGraph->getScalarMap(); DSScalarMap::iterator NI = CallerSM.find(P); if (NI == CallerSM.end()) { InvalidateCache(); @@ -229,7 +229,7 @@ // the portion of the program we have analyzed, we can draw conclusions // based on whether the global escapes the program. Function *Caller = CS.getInstruction()->getParent()->getParent(); - DSGraph *G = &TD->getDSGraph(*Caller); + DSGraph *G = TD->getDSGraph(*Caller); DSScalarMap::iterator NI = G->getScalarMap().find(P); if (NI == G->getScalarMap().end()) { // If it wasn't in the local function graph, check the global graph. This @@ -251,11 +251,11 @@ // Get the graphs for the callee and caller. Note that we want the BU graph // for the callee because we don't want all caller's effects incorporated! const Function *Caller = CS.getInstruction()->getParent()->getParent(); - DSGraph &CallerTDGraph = TD->getDSGraph(*Caller); - DSGraph &CalleeBUGraph = BU->getDSGraph(*F); + DSGraph* CallerTDGraph = TD->getDSGraph(*Caller); + DSGraph* CalleeBUGraph = BU->getDSGraph(*F); // Figure out which node in the TD graph this pointer corresponds to. - DSScalarMap &CallerSM = CallerTDGraph.getScalarMap(); + DSScalarMap &CallerSM = CallerTDGraph->getScalarMap(); DSScalarMap::iterator NI = CallerSM.find(P); if (NI == CallerSM.end()) { ModRefResult Result = ModRef; @@ -267,9 +267,9 @@ "This isn't a global that DSA inconsiderately dropped " "from the graph?"); - DSGraph &GG = *CallerTDGraph.getGlobalsGraph(); - DSScalarMap::iterator NI = GG.getScalarMap().find(P); - if (NI != GG.getScalarMap().end() && !NI->second.isNull()) { + DSGraph* GG = CallerTDGraph->getGlobalsGraph(); + DSScalarMap::iterator NI = GG->getScalarMap().find(P); + if (NI != GG->getScalarMap().end() && !NI->second.isNull()) { // Otherwise, if the node is only M or R, return this. This can be // useful for globals that should be marked const but are not. DSNode *N = NI->second.getNode(); @@ -287,9 +287,9 @@ // Compute the mapping from nodes in the callee graph to the nodes in the // caller graph for this call site. DSGraph::NodeMapTy CalleeCallerMap; - DSCallSite DSCS = CallerTDGraph.getDSCallSiteForCallSite(CS); - CallerTDGraph.computeCalleeCallerMapping(DSCS, *F, CalleeBUGraph, - CalleeCallerMap); + DSCallSite DSCS = CallerTDGraph->getDSCallSiteForCallSite(CS); + CallerTDGraph->computeCalleeCallerMapping(DSCS, *F, *CalleeBUGraph, + CalleeCallerMap); // Remember the mapping and the call site for future queries. MapCS = CS; Modified: poolalloc/trunk/lib/DSA/DataStructureOpt.cpp URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/DSA/DataStructureOpt.cpp?rev=57830&r1=57829&r2=57830&view=diff ============================================================================== --- poolalloc/trunk/lib/DSA/DataStructureOpt.cpp (original) +++ poolalloc/trunk/lib/DSA/DataStructureOpt.cpp Mon Oct 20 10:48:53 2008 @@ -60,8 +60,8 @@ /// global variables. /// bool DSOpt::OptimizeGlobals(Module &M) { - DSGraph &GG = TD->getGlobalsGraph(); - const DSGraph::ScalarMapTy &SM = GG.getScalarMap(); + DSGraph* GG = TD->getGlobalsGraph(); + const DSGraph::ScalarMapTy &SM = GG->getScalarMap(); bool Changed = false; for (Module::global_iterator I = M.global_begin(), E = M.global_end(); I != E; ++I) Modified: poolalloc/trunk/lib/DSA/DataStructureStats.cpp URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/DSA/DataStructureStats.cpp?rev=57830&r1=57829&r2=57830&view=diff ============================================================================== --- poolalloc/trunk/lib/DSA/DataStructureStats.cpp (original) +++ poolalloc/trunk/lib/DSA/DataStructureStats.cpp Mon Oct 20 10:48:53 2008 @@ -146,7 +146,7 @@ bool DSGraphStats::runOnFunction(Function& F) { - TDGraph = &getAnalysis().getDSGraph(F); + TDGraph = getAnalysis().getDSGraph(F); countCallees(F); visit(F); return true; Modified: poolalloc/trunk/lib/DSA/EquivClassGraphs.cpp URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/DSA/EquivClassGraphs.cpp?rev=57830&r1=57829&r2=57830&view=diff ============================================================================== --- poolalloc/trunk/lib/DSA/EquivClassGraphs.cpp (original) +++ poolalloc/trunk/lib/DSA/EquivClassGraphs.cpp Mon Oct 20 10:48:53 2008 @@ -65,7 +65,7 @@ MI != GlobalECs.member_end(); ++MI) { if (const Function* F = dyn_cast(*MI)) { if (!BaseGraph) { - BaseGraph = &getOrCreateGraph(F); + BaseGraph = getOrCreateGraph(F); BaseGraph->getFunctionArgumentsForCall(F, Args); } else if (BaseGraph->containsFunction(F)) { //already merged Modified: poolalloc/trunk/lib/DSA/GraphChecker.cpp URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/DSA/GraphChecker.cpp?rev=57830&r1=57829&r2=57830&view=diff ============================================================================== --- poolalloc/trunk/lib/DSA/GraphChecker.cpp (original) +++ poolalloc/trunk/lib/DSA/GraphChecker.cpp Mon Oct 20 10:48:53 2008 @@ -71,7 +71,7 @@ void print(std::ostream &O, const Module *M) const {} private: - void verify(const DSGraph &G); + void verify(const DSGraph* G); }; RegisterPass X("datastructure-gc", "DSA Graph Checking Pass"); @@ -120,14 +120,14 @@ /// verify - This is the function which checks to make sure that all of the /// invariants established on the command line are true. /// -void DSGC::verify(const DSGraph &G) { +void DSGC::verify(const DSGraph* G) { // Loop over all of the nodes, checking to see if any are collapsed... if (AbortIfAnyCollapsed) { - for (DSGraph::node_const_iterator I = G.node_begin(), E = G.node_end(); + for (DSGraph::node_const_iterator I = G->node_begin(), E = G->node_end(); I != E; ++I) if (I->isNodeCompletelyFolded()) { cerr << "Node is collapsed: "; - I->print(cerr, &G); + I->print(cerr, G); abort(); } } @@ -168,7 +168,7 @@ // Now we loop over all of the scalars, checking to see if any are collapsed // that are not supposed to be, or if any are merged together. - const DSGraph::ScalarMapTy &SM = G.getScalarMap(); + const DSGraph::ScalarMapTy &SM = G->getScalarMap(); std::map AbortIfMergedNodes; for (DSGraph::ScalarMapTy::const_iterator I = SM.begin(), E = SM.end(); @@ -180,7 +180,7 @@ // Verify it is not collapsed if it is not supposed to be... if (N->isNodeCompletelyFolded() && AbortIfCollapsedS.count(Name)) { cerr << "Node for value '%" << Name << "' is collapsed: "; - N->print(cerr, &G); + N->print(cerr, G); abort(); } @@ -188,7 +188,7 @@ cerr << "Node flags are not as expected for node: " << Name << " (" << CheckFlagsM[Name] << ":" <getNodeFlags() << ")\n"; - N->print(cerr, &G); + N->print(cerr, G); abort(); } @@ -197,7 +197,7 @@ if (AbortIfMergedNodes.count(N)) { cerr << "Nodes for values '%" << Name << "' and '%" << AbortIfMergedNodes[N] << "' is merged: "; - N->print(cerr, &G); + N->print(cerr, G); abort(); } AbortIfMergedNodes[N] = Name; Modified: poolalloc/trunk/lib/DSA/Local.cpp URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/DSA/Local.cpp?rev=57830&r1=57829&r2=57830&view=diff ============================================================================== --- poolalloc/trunk/lib/DSA/Local.cpp (original) +++ poolalloc/trunk/lib/DSA/Local.cpp Mon Oct 20 10:48:53 2008 @@ -140,7 +140,7 @@ // If there are any constant globals referenced in this function, merge their // initializers into the local graph from the globals graph. if (g.getScalarMap().global_begin() != g.getScalarMap().global_end()) { - ReachabilityCloner RC(g, *g.getGlobalsGraph(), 0); + ReachabilityCloner RC(&g, g.getGlobalsGraph(), 0); for (DSScalarMap::global_iterator I = g.getScalarMap().global_begin(); I != g.getScalarMap().global_end(); ++I) Modified: poolalloc/trunk/lib/DSA/Printer.cpp URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/DSA/Printer.cpp?rev=57830&r1=57829&r2=57830&view=diff ============================================================================== --- poolalloc/trunk/lib/DSA/Printer.cpp (original) +++ poolalloc/trunk/lib/DSA/Printer.cpp Mon Oct 20 10:48:53 2008 @@ -283,15 +283,15 @@ unsigned TotalNumNodes = 0, TotalCallNodes = 0; for (Module::const_iterator I = M->begin(), E = M->end(); I != E; ++I) if (C.hasDSGraph(*I)) { - DSGraph &Gr = C.getDSGraph((Function&)*I); - unsigned NumCalls = Gr.shouldPrintAuxCalls() ? - Gr.getAuxFunctionCalls().size() : Gr.getFunctionCalls().size(); + DSGraph* Gr = C.getDSGraph((Function&)*I); + unsigned NumCalls = Gr->shouldPrintAuxCalls() ? + Gr->getAuxFunctionCalls().size() : Gr->getFunctionCalls().size(); bool IsDuplicateGraph = false; if (I->getName() == "main" || !OnlyPrintMain) { - const Function *SCCFn = Gr.retnodes_begin()->first; + const Function *SCCFn = Gr->retnodes_begin()->first; if (&*I == SCCFn) { - Gr.writeGraphToFile(O, Prefix+I->getName()); + Gr->writeGraphToFile(O, Prefix+I->getName()); } else { IsDuplicateGraph = true; // Don't double count node/call nodes. O << "Didn't write '" << Prefix+I->getName() @@ -299,36 +299,36 @@ << "\n"; } } else { - const Function *SCCFn = Gr.retnodes_begin()->first; + const Function *SCCFn = Gr->retnodes_begin()->first; if (&*I == SCCFn) { O << "Skipped Writing '" << Prefix+I->getName() << ".dot'... [" - << Gr.getGraphSize() << "+" << NumCalls << "]\n"; + << Gr->getGraphSize() << "+" << NumCalls << "]\n"; } else { IsDuplicateGraph = true; // Don't double count node/call nodes. } } if (!IsDuplicateGraph) { - unsigned GraphSize = Gr.getGraphSize(); + unsigned GraphSize = Gr->getGraphSize(); if (MaxGraphSize < GraphSize) MaxGraphSize = GraphSize; - TotalNumNodes += Gr.getGraphSize(); + TotalNumNodes += Gr->getGraphSize(); TotalCallNodes += NumCalls; - for (DSGraph::node_iterator NI = Gr.node_begin(), E = Gr.node_end(); + for (DSGraph::node_iterator NI = Gr->node_begin(), E = Gr->node_end(); NI != E; ++NI) if (NI->isNodeCompletelyFolded()) ++NumFoldedNodes; } } - DSGraph &GG = C.getGlobalsGraph(); - TotalNumNodes += GG.getGraphSize(); - TotalCallNodes += GG.getFunctionCalls().size(); + DSGraph* GG = C.getGlobalsGraph(); + TotalNumNodes += GG->getGraphSize(); + TotalCallNodes += GG->getFunctionCalls().size(); if (!OnlyPrintMain) { - GG.writeGraphToFile(O, Prefix+"GlobalsGraph"); + GG->writeGraphToFile(O, Prefix+"GlobalsGraph"); } else { O << "Skipped Writing '" << Prefix << "GlobalsGraph.dot'... [" - << GG.getGraphSize() << "+" << GG.getFunctionCalls().size() << "]\n"; + << GG->getGraphSize() << "+" << GG->getFunctionCalls().size() << "]\n"; } O << "\nGraphs contain [" << TotalNumNodes << "+" << TotalCallNodes Modified: poolalloc/trunk/lib/DSA/StdLibPass.cpp URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/DSA/StdLibPass.cpp?rev=57830&r1=57829&r2=57830&view=diff ============================================================================== --- poolalloc/trunk/lib/DSA/StdLibPass.cpp (original) +++ poolalloc/trunk/lib/DSA/StdLibPass.cpp Mon Oct 20 10:48:53 2008 @@ -170,10 +170,10 @@ ii != ee; ++ii) if (CallInst* CI = dyn_cast(ii)) if (CI->getOperand(0) == F) { - DSGraph& Graph = getDSGraph(*CI->getParent()->getParent()); + DSGraph* Graph = getDSGraph(*CI->getParent()->getParent()); //delete the call DOUT << "Removing " << F->getName() << " from " << CI->getParent()->getParent()->getName() << "\n"; - Graph.removeFunctionCalls(*F); + Graph->removeFunctionCalls(*F); } } @@ -194,46 +194,46 @@ ii != ee; ++ii) if (CallInst* CI = dyn_cast(ii)) if (CI->getOperand(0) == F) { - DSGraph& Graph = getDSGraph(*CI->getParent()->getParent()); + DSGraph* Graph = getDSGraph(*CI->getParent()->getParent()); if (recFuncs[x].action.read[0]) - Graph.getNodeForValue(CI).getNode()->setReadMarker(); + Graph->getNodeForValue(CI).getNode()->setReadMarker(); if (recFuncs[x].action.write[0]) - Graph.getNodeForValue(CI).getNode()->setModifiedMarker(); + Graph->getNodeForValue(CI).getNode()->setModifiedMarker(); if (recFuncs[x].action.heap[0]) - Graph.getNodeForValue(CI).getNode()->setHeapMarker(); + Graph->getNodeForValue(CI).getNode()->setHeapMarker(); for (unsigned y = 1; y < CI->getNumOperands(); ++y) if (recFuncs[x].action.read[y]) if (isa(CI->getOperand(y)->getType())) - if (DSNode * Node=Graph.getNodeForValue(CI->getOperand(y)).getNode()) + if (DSNode * Node=Graph->getNodeForValue(CI->getOperand(y)).getNode()) Node->setReadMarker(); for (unsigned y = 1; y < CI->getNumOperands(); ++y) if (recFuncs[x].action.write[y]) if (isa(CI->getOperand(y)->getType())) - if (DSNode * Node=Graph.getNodeForValue(CI->getOperand(y)).getNode()) + if (DSNode * Node=Graph->getNodeForValue(CI->getOperand(y)).getNode()) Node->setModifiedMarker(); for (unsigned y = 1; y < CI->getNumOperands(); ++y) if (recFuncs[x].action.heap[y]) if (isa(CI->getOperand(y)->getType())) - if (DSNode * Node=Graph.getNodeForValue(CI->getOperand(y)).getNode()) + if (DSNode * Node=Graph->getNodeForValue(CI->getOperand(y)).getNode()) Node->setHeapMarker(); std::vector toMerge; if (recFuncs[x].action.mergeWithRet) - toMerge.push_back(Graph.getNodeForValue(CI)); + toMerge.push_back(Graph->getNodeForValue(CI)); if (recFuncs[x].action.mergeAllArgs || recFuncs[x].action.mergeWithRet) for (unsigned y = 1; y < CI->getNumOperands(); ++y) if (isa(CI->getOperand(y)->getType())) - toMerge.push_back(Graph.getNodeForValue(CI->getOperand(y))); + toMerge.push_back(Graph->getNodeForValue(CI->getOperand(y))); for (unsigned y = 1; y < toMerge.size(); ++y) toMerge[0].mergeWith(toMerge[y]); if (recFuncs[x].action.collapse) { if (isa(CI->getType())) - Graph.getNodeForValue(CI).getNode()->foldNodeCompletely(); + Graph->getNodeForValue(CI).getNode()->foldNodeCompletely(); for (unsigned y = 1; y < CI->getNumOperands(); ++y) if (isa(CI->getOperand(y)->getType())) - if (DSNode * Node=Graph.getNodeForValue(CI->getOperand(y)).getNode()) + if (DSNode * Node=Graph->getNodeForValue(CI->getOperand(y)).getNode()) Node->foldNodeCompletely(); } } @@ -241,10 +241,10 @@ ii != ee; ++ii) if (CallInst* CI = dyn_cast(ii)) if (CI->getOperand(0) == F) { - DSGraph& Graph = getDSGraph(*CI->getParent()->getParent()); + DSGraph* Graph = getDSGraph(*CI->getParent()->getParent()); //delete the call DOUT << "Removing " << F->getName() << " from " << CI->getParent()->getParent()->getName() << "\n"; - Graph.removeFunctionCalls(*F); + Graph->removeFunctionCalls(*F); } } Modified: poolalloc/trunk/lib/DSA/TopDownClosure.cpp URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/DSA/TopDownClosure.cpp?rev=57830&r1=57829&r2=57830&view=diff ============================================================================== --- poolalloc/trunk/lib/DSA/TopDownClosure.cpp (original) +++ poolalloc/trunk/lib/DSA/TopDownClosure.cpp Mon Oct 20 10:48:53 2008 @@ -125,7 +125,7 @@ // Visit each of the graphs in reverse post-order now! while (!PostOrder.empty()) { - InlineCallersIntoGraph(*PostOrder.back()); + InlineCallersIntoGraph(PostOrder.back()); PostOrder.pop_back(); } } @@ -148,29 +148,29 @@ hash_set &Visited, std::vector &PostOrder) { if (F.isDeclaration()) return; - DSGraph &G = getOrCreateGraph(&F); - if (Visited.count(&G)) return; - Visited.insert(&G); + DSGraph* G = getOrCreateGraph(&F); + if (Visited.count(G)) return; + Visited.insert(G); // Recursively traverse all of the callee graphs. - for (DSGraph::fc_iterator CI = G.fc_begin(), CE = G.fc_end(); CI != CE; ++CI){ + for (DSGraph::fc_iterator CI = G->fc_begin(), CE = G->fc_end(); CI != CE; ++CI){ Instruction *CallI = CI->getCallSite().getInstruction(); for (callee_iterator I = callee_begin(CallI), E = callee_end(CallI); I != E; ++I) ComputePostOrder(**I, Visited, PostOrder); } - PostOrder.push_back(&G); + PostOrder.push_back(G); } /// InlineCallersIntoGraph - Inline all of the callers of the specified DS graph /// into it, then recompute completeness of nodes in the resultant graph. -void TDDataStructures::InlineCallersIntoGraph(DSGraph &DSG) { +void TDDataStructures::InlineCallersIntoGraph(DSGraph* DSG) { // Inline caller graphs into this graph. First step, get the list of call // sites that call into this graph. std::vector EdgesFromCaller; std::map >::iterator - CEI = CallerEdges.find(&DSG); + CEI = CallerEdges.find(DSG); if (CEI != CallerEdges.end()) { std::swap(CEI->second, EdgesFromCaller); CallerEdges.erase(CEI); @@ -186,21 +186,21 @@ // post-pass over all of the graphs. We need to take cloning out of // removeDeadNodes and gut removeDeadNodes at the same time first though. :( { - DSGraph &GG = *DSG.getGlobalsGraph(); + DSGraph* GG = DSG->getGlobalsGraph(); ReachabilityCloner RC(DSG, GG, DSGraph::DontCloneCallNodes | DSGraph::DontCloneAuxCallNodes); for (DSScalarMap::global_iterator - GI = DSG.getScalarMap().global_begin(), - E = DSG.getScalarMap().global_end(); GI != E; ++GI) - RC.getClonedNH(GG.getNodeForValue(*GI)); + GI = DSG->getScalarMap().global_begin(), + E = DSG->getScalarMap().global_end(); GI != E; ++GI) + RC.getClonedNH(GG->getNodeForValue(*GI)); } - DOUT << "[TD] Inlining callers into '" << DSG.getFunctionNames() << "'\n"; + DOUT << "[TD] Inlining callers into '" << DSG->getFunctionNames() << "'\n"; // Iteratively inline caller graphs into this graph. while (!EdgesFromCaller.empty()) { - DSGraph &CallerGraph = *EdgesFromCaller.back().CallerGraph; + DSGraph* CallerGraph = EdgesFromCaller.back().CallerGraph; // Iterate through all of the call sites of this graph, cloning and merging // any nodes required by the call. @@ -213,7 +213,7 @@ const DSCallSite &CS = *EdgesFromCaller.back().CS; const Function &CF = *EdgesFromCaller.back().CalledFunction; DOUT << " [TD] Inlining graph into Fn '" << CF.getName() << "' from "; - if (CallerGraph.getReturnNodes().empty()) + if (CallerGraph->getReturnNodes().empty()) DOUT << "SYNTHESIZED INDIRECT GRAPH"; else DOUT << "Fn '" << CS.getCallSite().getInstruction()-> @@ -222,25 +222,25 @@ // Get the formal argument and return nodes for the called function and // merge them with the cloned subgraph. - DSCallSite T1 = DSG.getCallSiteForArguments(CF); + DSCallSite T1 = DSG->getCallSiteForArguments(CF); RC.mergeCallSite(T1, CS); ++NumTDInlines; EdgesFromCaller.pop_back(); } while (!EdgesFromCaller.empty() && - EdgesFromCaller.back().CallerGraph == &CallerGraph); + EdgesFromCaller.back().CallerGraph == CallerGraph); } // Next, now that this graph is finalized, we need to recompute the // incompleteness markers for this graph and remove unreachable nodes. - DSG.maskIncompleteMarkers(); + DSG->maskIncompleteMarkers(); // If any of the functions has incomplete incoming arguments, don't mark any // of them as complete. bool HasIncompleteArgs = false; - for (DSGraph::retnodes_iterator I = DSG.retnodes_begin(), - E = DSG.retnodes_end(); I != E; ++I) + for (DSGraph::retnodes_iterator I = DSG->retnodes_begin(), + E = DSG->retnodes_end(); I != E; ++I) if (ArgsRemainIncomplete.count(I->first)) { HasIncompleteArgs = true; break; @@ -249,28 +249,28 @@ // Recompute the Incomplete markers. Depends on whether args are complete unsigned Flags = HasIncompleteArgs ? DSGraph::MarkFormalArgs : DSGraph::IgnoreFormalArgs; - DSG.markIncompleteNodes(Flags | DSGraph::IgnoreGlobals); + DSG->markIncompleteNodes(Flags | DSGraph::IgnoreGlobals); // Delete dead nodes. Treat globals that are unreachable as dead also. - DSG.removeDeadNodes(DSGraph::RemoveUnreachableGlobals); + DSG->removeDeadNodes(DSGraph::RemoveUnreachableGlobals); // We are done with computing the current TD Graph! Finally, before we can // finish processing this function, we figure out which functions it calls and // records these call graph edges, so that we have them when we process the // callee graphs. - if (DSG.fc_begin() == DSG.fc_end()) return; + if (DSG->fc_begin() == DSG->fc_end()) return; // Loop over all the call sites and all the callees at each call site, and add // edges to the CallerEdges structure for each callee. - for (DSGraph::fc_iterator CI = DSG.fc_begin(), E = DSG.fc_end(); + for (DSGraph::fc_iterator CI = DSG->fc_begin(), E = DSG->fc_end(); CI != E; ++CI) { // Handle direct calls efficiently. if (CI->isDirectCall()) { if (!CI->getCalleeFunc()->isDeclaration() && - !DSG.getReturnNodes().count(CI->getCalleeFunc())) - CallerEdges[&getOrCreateGraph(CI->getCalleeFunc())] - .push_back(CallerCallEdge(&DSG, &*CI, CI->getCalleeFunc())); + !DSG->getReturnNodes().count(CI->getCalleeFunc())) + CallerEdges[getOrCreateGraph(CI->getCalleeFunc())] + .push_back(CallerCallEdge(DSG, &*CI, CI->getCalleeFunc())); continue; } @@ -280,7 +280,7 @@ callee_begin(CallI), IPE = callee_end(CallI); // Skip over all calls to this graph (SCC calls). - while (IPI != IPE && &getDSGraph(**IPI) == &DSG) + while (IPI != IPE && getDSGraph(**IPI) == DSG) ++IPI; // All SCC calls? @@ -290,15 +290,15 @@ ++IPI; // Skip over more SCC calls. - while (IPI != IPE && &getDSGraph(**IPI) == &DSG) + while (IPI != IPE && getDSGraph(**IPI) == DSG) ++IPI; // If there is exactly one callee from this call site, remember the edge in // CallerEdges. if (IPI == IPE) { if (!FirstCallee->isDeclaration()) - CallerEdges[&getOrCreateGraph(FirstCallee)] - .push_back(CallerCallEdge(&DSG, &*CI, FirstCallee)); + CallerEdges[getOrCreateGraph(FirstCallee)] + .push_back(CallerCallEdge(DSG, &*CI, FirstCallee)); continue; } @@ -326,7 +326,7 @@ IndCallGraph = IndCallRecI->second; } else { // Otherwise, create a new DSGraph to represent this. - IndCallGraph = new DSGraph(DSG.getGlobalECs(), DSG.getTargetData()); + IndCallGraph = new DSGraph(DSG->getGlobalECs(), DSG->getTargetData()); // Make a nullary dummy call site, which will eventually get some content // merged into it. The actual callee function doesn't matter here, so we // just pass it something to keep the ctor happy. @@ -342,16 +342,16 @@ // exactly once. DSCallSite *NCS = &IndCallGraph->getFunctionCalls().front(); for (unsigned i = 0, e = Callees.size(); i != e; ++i) { - DSGraph& CalleeGraph = getDSGraph(*Callees[i]); - if (&CalleeGraph != &DSG) - CallerEdges[&CalleeGraph].push_back(CallerCallEdge(IndCallGraph, NCS, - Callees[i])); + DSGraph* CalleeGraph = getDSGraph(*Callees[i]); + if (CalleeGraph != DSG) + CallerEdges[CalleeGraph].push_back(CallerCallEdge(IndCallGraph, NCS, + Callees[i])); } } // Now that we know which graph to use for this, merge the caller // information into the graph, based on information from the call site. - ReachabilityCloner RC(*IndCallGraph, DSG, 0); + ReachabilityCloner RC(IndCallGraph, DSG, 0); RC.mergeCallSite(IndCallGraph->getFunctionCalls().front(), *CI); } } Modified: poolalloc/trunk/lib/PoolAllocate/AccessTrace.cpp URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/PoolAllocate/AccessTrace.cpp?rev=57830&r1=57829&r2=57830&view=diff ============================================================================== --- poolalloc/trunk/lib/PoolAllocate/AccessTrace.cpp (original) +++ poolalloc/trunk/lib/PoolAllocate/AccessTrace.cpp Mon Oct 20 10:48:53 2008 @@ -38,7 +38,7 @@ void getAnalysisUsage(AnalysisUsage &AU) const; - const DSGraph &getGraphForFunc(PA::FuncInfo *FI) const { + const DSGraph* getGraphForFunc(PA::FuncInfo *FI) const { return G->getDSGraph(FI->F); } static char ID; @@ -46,7 +46,7 @@ private: void InitializeLibraryFunctions(Module &M); void InstrumentAccess(Instruction *I, Value *Ptr, - PA::FuncInfo *FI, DSGraph &DSG); + PA::FuncInfo *FI, DSGraph* DSG); }; char PoolAccessTrace::ID = 0; @@ -72,7 +72,7 @@ } void PoolAccessTrace::InstrumentAccess(Instruction *I, Value *Ptr, - PA::FuncInfo *FI, DSGraph &DSG) { + PA::FuncInfo *FI, DSGraph* DSG) { // Don't trace loads of globals or the stack. if (isa(Ptr) || isa(Ptr)) return; @@ -82,7 +82,7 @@ // Value didn't exist in the orig program (pool desc?). return; } - DSNode *Node = DSG.getNodeForValue(MappedPtr).getNode(); + DSNode *Node = DSG->getNodeForValue(MappedPtr).getNode(); if (Node == 0) return; Value *PD = FI->PoolDescriptors[Node]; @@ -124,7 +124,7 @@ continue; // Get the DSGraph for this function. - DSGraph &DSG = G->getDSGraph(FI->F); + DSGraph* DSG = G->getDSGraph(FI->F); for (Function::iterator BB = F->begin(), E = F->end(); BB != E; ++BB) for (BasicBlock::iterator I = BB->begin(), E = BB->end(); I != E; ++I) Modified: poolalloc/trunk/lib/PoolAllocate/Heuristic.cpp URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/PoolAllocate/Heuristic.cpp?rev=57830&r1=57829&r2=57830&view=diff ============================================================================== --- poolalloc/trunk/lib/PoolAllocate/Heuristic.cpp (original) +++ poolalloc/trunk/lib/PoolAllocate/Heuristic.cpp Mon Oct 20 10:48:53 2008 @@ -127,7 +127,7 @@ struct AllNodesHeuristic : public Heuristic { void AssignToPools(const std::vector &NodesToPA, - Function *F, DSGraph &G, + Function *F, DSGraph* G, std::vector &ResultPools) { for (unsigned i = 0, e = NodesToPA.size(); i != e; ++i) ResultPools.push_back(OnePool(NodesToPA[i])); @@ -145,13 +145,13 @@ struct AllButUnreachableFromMemoryHeuristic : public Heuristic { void AssignToPools(const std::vector &NodesToPA, - Function *F, DSGraph &G, + Function *F, DSGraph* G, std::vector &ResultPools) { // Build a set of all nodes that are reachable from another node in the // graph. Here we ignore scalar nodes that are only globals as they are // often global pointers to big arrays. std::set ReachableFromMemory; - for (DSGraph::node_iterator I = G.node_begin(), E = G.node_end(); + for (DSGraph::node_iterator I = G->node_begin(), E = G->node_end(); I != E; ++I) { DSNode *N = I; // Ignore nodes that are just globals and not arrays. @@ -183,7 +183,7 @@ struct CyclicNodesHeuristic : public Heuristic { void AssignToPools(const std::vector &NodesToPA, - Function *F, DSGraph &G, + Function *F, DSGraph* G, std::vector &ResultPools); }; @@ -196,7 +196,7 @@ void CyclicNodesHeuristic::AssignToPools(const std::vector &NodesToPA, - Function *F, DSGraph &G, + Function *F, DSGraph* G, std::vector &ResultPools) { for (unsigned i = 0, e = NodesToPA.size(); i != e; ++i) if (NodeExistsInCycle(NodesToPA[i])) @@ -212,7 +212,7 @@ struct SmartCoallesceNodesHeuristic : public Heuristic { void AssignToPools(const std::vector &NodesToPA, - Function *F, DSGraph &G, + Function *F, DSGraph* G, std::vector &ResultPools) { // For globals, do not pool allocate unless the node is cyclic and not an // array (unless it's collapsed). @@ -397,7 +397,7 @@ virtual bool IsRealHeuristic() { return false; } void AssignToPools(const std::vector &NodesToPA, - Function *F, DSGraph &G, + Function *F, DSGraph* G, std::vector &ResultPools) { if (TheGlobalPD == 0) TheGlobalPD = PA->CreateGlobalPool(0, 0); @@ -421,7 +421,7 @@ virtual bool IsRealHeuristic() { return false; } void AssignToPools(const std::vector &NodesToPA, - Function *F, DSGraph &G, + Function *F, DSGraph* G, std::vector &ResultPools) { // For this heuristic, we assign everything possible to its own pool. for (unsigned i = 0, e = NodesToPA.size(); i != e; ++i) @@ -485,7 +485,7 @@ virtual bool IsRealHeuristic() { return false; } void AssignToPools(const std::vector &NodesToPA, - Function *F, DSGraph &G, + Function *F, DSGraph* G, std::vector &ResultPools) { // Nothing to pool allocate here. } Modified: poolalloc/trunk/lib/PoolAllocate/Heuristic.h URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/PoolAllocate/Heuristic.h?rev=57830&r1=57829&r2=57830&view=diff ============================================================================== --- poolalloc/trunk/lib/PoolAllocate/Heuristic.h (original) +++ poolalloc/trunk/lib/PoolAllocate/Heuristic.h Mon Oct 20 10:48:53 2008 @@ -37,8 +37,8 @@ Heuristic() {} public: - void Initialize(Module &m, DSGraph &gg, PoolAllocate &pa) { - M = &m; GG = ≫ PA = &pa; + void Initialize(Module &m, DSGraph* gg, PoolAllocate &pa) { + M = &m; GG = gg; PA = &pa; } virtual ~Heuristic(); @@ -79,7 +79,7 @@ /// returning the result in ResultPools. If this is a function being pool /// allocated, F will not be null. virtual void AssignToPools(const std::vector &NodesToPA, - Function *F, DSGraph &G, + Function *F, DSGraph* G, std::vector &ResultPools) = 0; // Hacks for the OnlyOverhead heuristic. Modified: poolalloc/trunk/lib/PoolAllocate/PASimple.cpp URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/PoolAllocate/PASimple.cpp?rev=57830&r1=57829&r2=57830&view=diff ============================================================================== --- poolalloc/trunk/lib/PoolAllocate/PASimple.cpp (original) +++ poolalloc/trunk/lib/PoolAllocate/PASimple.cpp Mon Oct 20 10:48:53 2008 @@ -18,7 +18,6 @@ #include "dsa/DSGraph.h" #include "dsa/CallTargets.h" #include "poolalloc/PoolAllocate.h" -#include "Heuristic.h" #include "llvm/Constants.h" #include "llvm/DerivedTypes.h" #include "llvm/Instructions.h" @@ -121,7 +120,7 @@ // Merge all of the DSNodes in the DSGraphs. // GlobalECs = Graphs->getGlobalECs(); - CombinedDSGraph = new DSGraph (GlobalECs, TD, &(Graphs->getGlobalsGraph())); + CombinedDSGraph = new DSGraph (GlobalECs, TD, Graphs->getGlobalsGraph()); //CombinedDSGraph.cloneInto (getGlobalsGraph()); for (Module::iterator I = M.begin(), E = M.end(); I != E; ++I) { if (Graphs->hasDSGraph (*I)) @@ -161,13 +160,13 @@ // // Get the DSGraph for this function. // - DSGraph &ECG = Graphs->getDSGraph(F); + DSGraph* ECG = Graphs->getDSGraph(F); for (Function::iterator i = F.begin(), e = F.end(); i != e; ++i) for (BasicBlock::iterator ii = i->begin(), ee = i->end(); ii != ee; ++ii) { if (MallocInst * MI = dyn_cast(ii)) { // Associate the global pool decriptor with the DSNode - DSNode * Node = ECG.getNodeForValue(MI).getNode(); + DSNode * Node = ECG->getNodeForValue(MI).getNode(); FInfo.PoolDescriptors.insert(std::make_pair(Node,TheGlobalPool)); // Mark the malloc as an instruction to delete @@ -202,7 +201,7 @@ CF = cast(CE->getOperand(0)); if (CF && (CF->isDeclaration()) && (CF->getName() == "realloc")) { // Associate the global pool decriptor with the DSNode - DSNode * Node = ECG.getNodeForValue(CI).getNode(); + DSNode * Node = ECG->getNodeForValue(CI).getNode(); FInfo.PoolDescriptors.insert(std::make_pair(Node,TheGlobalPool)); // Mark the realloc as an instruction to delete @@ -243,7 +242,7 @@ CI->replaceAllUsesWith(Casted); } else if (CF && (CF->isDeclaration()) && (CF->getName() == "calloc")) { // Associate the global pool decriptor with the DSNode - DSNode * Node = ECG.getNodeForValue(CI).getNode(); + DSNode * Node = ECG->getNodeForValue(CI).getNode(); FInfo.PoolDescriptors.insert(std::make_pair(Node,TheGlobalPool)); // Mark the realloc as an instruction to delete @@ -285,7 +284,7 @@ CI->replaceAllUsesWith(Casted); } else if (CF && (CF->isDeclaration()) && (CF->getName() == "strdup")) { // Associate the global pool decriptor with the DSNode - DSNode * Node = ECG.getNodeForValue(CI).getNode(); + DSNode * Node = ECG->getNodeForValue(CI).getNode(); FInfo.PoolDescriptors.insert(std::make_pair(Node,TheGlobalPool)); // Mark the realloc as an instruction to delete Modified: poolalloc/trunk/lib/PoolAllocate/PointerCompress.cpp URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/PoolAllocate/PointerCompress.cpp?rev=57830&r1=57829&r2=57830&view=diff ============================================================================== --- poolalloc/trunk/lib/PoolAllocate/PointerCompress.cpp (original) +++ poolalloc/trunk/lib/PoolAllocate/PointerCompress.cpp Mon Oct 20 10:48:53 2008 @@ -134,7 +134,7 @@ PoolAllocate *getPoolAlloc() const { return PoolAlloc; } - const DSGraph &getGraphForFunc(PA::FuncInfo *FI) const { + const DSGraph* getGraphForFunc(PA::FuncInfo *FI) const { return ECG->getDSGraph(FI->F); } @@ -161,7 +161,7 @@ void FindPoolsToCompress(std::set &Pools, std::map &PreassignedPools, - Function &F, DSGraph &DSG, PA::FuncInfo *FI); + Function &F, DSGraph* DSG, PA::FuncInfo *FI); }; char PointerCompress::ID = 0; @@ -348,7 +348,7 @@ const TargetData &TD; - DSGraph &DSG; + DSGraph* DSG; /// PAFuncInfo - Information about the transformation the pool allocator did /// to the original function. @@ -362,9 +362,9 @@ PointerCompress &PtrComp; public: InstructionRewriter(const PointerCompress::PoolInfoMap &poolInfo, - DSGraph &dsg, PA::FuncInfo &pafi, + DSGraph* dsg, PA::FuncInfo &pafi, FunctionCloneRecord *fcr, PointerCompress &ptrcomp) - : PoolInfo(poolInfo), TD(dsg.getTargetData()), DSG(dsg), + : PoolInfo(poolInfo), TD(dsg->getTargetData()), DSG(dsg), PAFuncInfo(pafi), FCR(fcr), PtrComp(ptrcomp) { } @@ -425,7 +425,7 @@ // Value didn't exist in the orig program (pool desc?). return DSNodeHandle(); - return DSG.getNodeForValue(V); + return DSG->getNodeForValue(V); } /// getNodeIfCompressed - If the specified value is a pointer that will be @@ -479,7 +479,7 @@ } else { // Otherwise if this was in the original function, remove it from the // DSG scalar map if it is there. - DSG.getScalarMap().eraseIfExists(V); + DSG->getScalarMap().eraseIfExists(V); } } @@ -507,8 +507,8 @@ // Finally, if this occurred in a function that neither the pool // allocator nor the ptr compression implementation had to change, // update the DSGraph. - if (DSG.getScalarMap().count(&Old)) - DSG.getScalarMap().replaceScalar(&Old, New); + if (DSG->getScalarMap().count(&Old)) + DSG->getScalarMap().replaceScalar(&Old, New); } } @@ -946,7 +946,7 @@ Function *Callee = CI.getCalledFunction(); if (Callee) if ((FI = PtrComp.getPoolAlloc()->getFuncInfoOrClone(*Callee))) - CG = &PtrComp.getGraphForFunc(FI); + CG = PtrComp.getGraphForFunc(FI); if (!Callee) { // Indirect call: you CAN'T passed compress pointers in. Don't even think @@ -1183,7 +1183,7 @@ void PointerCompress::FindPoolsToCompress(std::set &Pools, std::map &PreassignedPools, - Function &F, DSGraph &DSG, + Function &F, DSGraph* DSG, PA::FuncInfo *FI) { DEBUG(std::cerr << "In function '" << F.getName() << "':\n"); for (unsigned i = 0, e = FI->NodesToPA.size(); i != e; ++i) { @@ -1212,11 +1212,11 @@ // Map all node reachable from this global to the corresponding nodes in the // globals graph. DSGraph::NodeMapTy GlobalsGraphNodeMapping; - DSG.computeGToGGMapping(GlobalsGraphNodeMapping); + DSG->computeGToGGMapping(GlobalsGraphNodeMapping); // See if there are nodes in this graph that correspond to nodes in the // globals graph, and if so, if it is compressed. - for (DSGraph::node_iterator I = DSG.node_begin(), E = DSG.node_end(); + for (DSGraph::node_iterator I = DSG->node_begin(), E = DSG->node_end(); I != E;++I) if (GlobalsGraphNodeMapping.count(I)) { // If it is a global pool, set up the pool descriptor appropriately. @@ -1262,7 +1262,7 @@ return false; // Get the DSGraph for this function. - DSGraph &DSG = ECG->getDSGraph(FI->F); + DSGraph* DSG = ECG->getDSGraph(FI->F); std::set PoolsToCompressSet; @@ -1301,7 +1301,7 @@ // Use these to compute the closure of compression information. In // particular, if one pool points to another, we need to know if the outgoing // pointer is compressed. - const TargetData &TD = DSG.getTargetData(); + const TargetData &TD = DSG->getTargetData(); std::cerr << "In function '" << F.getName() << "':\n"; for (std::map::iterator I = PoolsToCompress.begin(), E = PoolsToCompress.end(); I != E; ++I) { Modified: poolalloc/trunk/lib/PoolAllocate/PoolAllocate.cpp URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/PoolAllocate/PoolAllocate.cpp?rev=57830&r1=57829&r2=57830&view=diff ============================================================================== --- poolalloc/trunk/lib/PoolAllocate/PoolAllocate.cpp (original) +++ poolalloc/trunk/lib/PoolAllocate/PoolAllocate.cpp Mon Oct 20 10:48:53 2008 @@ -294,30 +294,30 @@ -static void GetNodesReachableFromGlobals(DSGraph &G, +static void GetNodesReachableFromGlobals(DSGraph* G, hash_set &NodesFromGlobals) { - for (DSScalarMap::global_iterator I = G.getScalarMap().global_begin(), - E = G.getScalarMap().global_end(); I != E; ++I) - G.getNodeForValue(*I).getNode()->markReachableNodes(NodesFromGlobals); + for (DSScalarMap::global_iterator I = G->getScalarMap().global_begin(), + E = G->getScalarMap().global_end(); I != E; ++I) + G->getNodeForValue(*I).getNode()->markReachableNodes(NodesFromGlobals); } static void MarkNodesWhichMustBePassedIn(hash_set &MarkedNodes, - Function &F, DSGraph &G, + Function &F, DSGraph* G, bool PassAllArguments) { // Mark globals and incomplete nodes as live... (this handles arguments) if (F.getName() != "main") { // All DSNodes reachable from arguments must be passed in. for (Function::arg_iterator I = F.arg_begin(), E = F.arg_end(); I != E; ++I) { - DSGraph::ScalarMapTy::iterator AI = G.getScalarMap().find(I); - if (AI != G.getScalarMap().end()) + DSGraph::ScalarMapTy::iterator AI = G->getScalarMap().find(I); + if (AI != G->getScalarMap().end()) if (DSNode *N = AI->second.getNode()) N->markReachableNodes(MarkedNodes); } } // Marked the returned node as needing to be passed in. - if (DSNode *RetNode = G.getReturnNodeFor(F).getNode()) + if (DSNode *RetNode = G->getReturnNodeFor(F).getNode()) RetNode->markReachableNodes(MarkedNodes); // Calculate which DSNodes are reachable from globals. If a node is reachable @@ -343,14 +343,14 @@ /// arguments will have to be added for each function, build the FunctionInfo /// map and recording this info in the ArgNodes set. void PoolAllocate::FindFunctionPoolArgs(Function &F) { - DSGraph &G = Graphs->getDSGraph(F); + DSGraph* G = Graphs->getDSGraph(F); // Create a new entry for F. FuncInfo &FI = FunctionInfo.insert(std::make_pair(&F, FuncInfo(F))).first->second; hash_set &MarkedNodes = FI.MarkedNodes; - if (G.node_begin() == G.node_end()) + if (G->node_begin() == G->node_end()) return; // No memory activity, nothing is required // Find DataStructure nodes which are allocated in pools non-local to the @@ -366,8 +366,8 @@ // necessary, and return it. If not, just return null. // Function *PoolAllocate::MakeFunctionClone(Function &F) { - DSGraph &G = Graphs->getDSGraph(F); - if (G.node_begin() == G.node_end()) return 0; + DSGraph* G = Graphs->getDSGraph(F); + if (G->node_begin() == G->node_end()) return 0; FuncInfo &FI = *getFuncInfo(F); if (FI.ArgNodes.empty()) @@ -471,7 +471,7 @@ // bool PoolAllocate::SetupGlobalPools(Module &M) { // Get the globals graph for the program. - DSGraph &GG = Graphs->getGlobalsGraph(); + DSGraph* GG = Graphs->getGlobalsGraph(); // Get all of the nodes reachable from globals. hash_set GlobalHeapNodes; @@ -557,7 +557,7 @@ CurModule); // Update the global DSGraph to include this. - DSNode *GNode = Graphs->getGlobalsGraph().addObjectToGraph(GV); + DSNode *GNode = Graphs->getGlobalsGraph()->addObjectToGraph(GV); GNode->setModifiedMarker()->setReadMarker(); Function *MainFunc = CurModule->getFunction("main"); @@ -584,7 +584,7 @@ // the DSNodes specified by the NodesToPA list. This adds an entry to the // PoolDescriptors map for each DSNode. // -void PoolAllocate::CreatePools(Function &F, DSGraph &DSG, +void PoolAllocate::CreatePools(Function &F, DSGraph* DSG, const std::vector &NodesToPA, std::map &PoolDescriptors) { @@ -592,7 +592,7 @@ TIME_REGION(X, "CreatePools"); std::vector ResultPools; - CurHeuristic->AssignToPools(NodesToPA, &F, *NodesToPA[0]->getParentGraph(), + CurHeuristic->AssignToPools(NodesToPA, &F, NodesToPA[0]->getParentGraph(), ResultPools); std::set UnallocatedNodes(NodesToPA.begin(), NodesToPA.end()); @@ -614,14 +614,14 @@ PoolDesc = new AllocaInst(PoolDescType, 0, "PD", InsertPoint); // Create a node in DSG to represent the new alloca. - DSNode *NewNode = DSG.addObjectToGraph(PoolDesc); + DSNode *NewNode = DSG->addObjectToGraph(PoolDesc); NewNode->setModifiedMarker()->setReadMarker(); // This is M/R } else { PoolDesc = CreateGlobalPool(Pool.PoolSize, Pool.PoolAlignment, InsertPoint); // Add the global node to main's graph. - DSNode *NewNode = DSG.addObjectToGraph(PoolDesc); + DSNode *NewNode = DSG->addObjectToGraph(PoolDesc); NewNode->setModifiedMarker()->setReadMarker(); // This is M/R if (Pool.NodesInPool.size() == 1 && @@ -647,9 +647,9 @@ // the specified function. // void PoolAllocate::ProcessFunctionBody(Function &F, Function &NewF) { - DSGraph &G = Graphs->getDSGraph(F); + DSGraph* G = Graphs->getDSGraph(F); - if (G.node_begin() == G.node_end()) return; // Quick exit if nothing to do. + if (G->node_begin() == G->node_end()) return; // Quick exit if nothing to do. FuncInfo &FI = *getFuncInfo(F); hash_set &MarkedNodes = FI.MarkedNodes; @@ -662,11 +662,11 @@ // Map all node reachable from this global to the corresponding nodes in // the globals graph. DSGraph::NodeMapTy GlobalsGraphNodeMapping; - G.computeGToGGMapping(GlobalsGraphNodeMapping); + G->computeGToGGMapping(GlobalsGraphNodeMapping); // Loop over all of the nodes which are non-escaping, adding pool-allocatable // ones to the NodesToPA vector. - for (DSGraph::node_iterator I = G.node_begin(), E = G.node_end(); I != E;++I){ + for (DSGraph::node_iterator I = G->node_begin(), E = G->node_end(); I != E;++I){ // We only need to make a pool if there is a heap object in it... DSNode *N = I; if ((N->isHeapNode()) || (BoundsChecksEnabled && (N->isArray()))) { Modified: poolalloc/trunk/lib/PoolAllocate/TransformFunctionBody.cpp URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/PoolAllocate/TransformFunctionBody.cpp?rev=57830&r1=57829&r2=57830&view=diff ============================================================================== --- poolalloc/trunk/lib/PoolAllocate/TransformFunctionBody.cpp (original) +++ poolalloc/trunk/lib/PoolAllocate/TransformFunctionBody.cpp Mon Oct 20 10:48:53 2008 @@ -34,7 +34,7 @@ /// allocated functions. struct FuncTransform : public InstVisitor { PoolAllocate &PAInfo; - DSGraph &G; // The Bottom-up DS Graph + DSGraph* G; // The Bottom-up DS Graph FuncInfo &FI; // PoolUses - For each pool (identified by the pool descriptor) keep track @@ -47,7 +47,7 @@ // inserted into the code. This is seperated out from PoolUses. std::multimap &PoolFrees; - FuncTransform(PoolAllocate &P, DSGraph &g, FuncInfo &fi, + FuncTransform(PoolAllocate &P, DSGraph* g, FuncInfo &fi, std::multimap &poolUses, std::multimap &poolFrees) : PAInfo(P), G(g), FI(fi), @@ -105,7 +105,7 @@ } DSNodeHandle& getDSNodeHFor(Value *V) { - return G.getScalarMap()[getOldValueIfAvailable(V)]; + return G->getScalarMap()[getOldValueIfAvailable(V)]; } Value *getPoolHandle(Value *V) { @@ -120,7 +120,7 @@ }; } -void PoolAllocate::TransformBody(DSGraph &g, PA::FuncInfo &fi, +void PoolAllocate::TransformBody(DSGraph* g, PA::FuncInfo &fi, std::multimap &poolUses, std::multimap &poolFrees, Function &F) { @@ -180,9 +180,9 @@ // If we are modifying the original function, update the DSGraph. if (!FI.Clone) { // V and Casted now point to whatever the original allocation did. - G.getScalarMap().replaceScalar(I, V); + G->getScalarMap().replaceScalar(I, V); if (V != Casted) - G.getScalarMap()[Casted] = G.getScalarMap()[V]; + G->getScalarMap()[Casted] = G->getScalarMap()[V]; } else { // Otherwise, update the NewToOldValueMap UpdateNewToOldValueMap(I, V, V != Casted ? Casted : 0); } @@ -296,7 +296,7 @@ if (Arg->getType() != PointerType::getUnqual(Type::Int8Ty)) { Casted = CastInst::CreatePointerCast(Arg, PointerType::getUnqual(Type::Int8Ty), Arg->getName()+".casted", Where); - G.getScalarMap()[Casted] = G.getScalarMap()[Arg]; + G->getScalarMap()[Casted] = G->getScalarMap()[Arg]; } Value* Opts[2] = {PH, Casted}; @@ -395,9 +395,9 @@ // If we are modifying the original function, update the DSGraph. if (!FI.Clone) { // V and Casted now point to whatever the original allocation did. - G.getScalarMap().replaceScalar(I, V); + G->getScalarMap().replaceScalar(I, V); if (V != Casted) - G.getScalarMap()[Casted] = G.getScalarMap()[V]; + G->getScalarMap()[Casted] = G->getScalarMap()[V]; } else { // Otherwise, update the NewToOldValueMap UpdateNewToOldValueMap(I, V, V != Casted ? Casted : 0); } @@ -466,9 +466,9 @@ // If we are modifying the original function, update the DSGraph. if (!FI.Clone) { // V and Casted now point to whatever the original allocation did. - G.getScalarMap().replaceScalar(I, V); + G->getScalarMap().replaceScalar(I, V); if (V != Casted) - G.getScalarMap()[Casted] = G.getScalarMap()[V]; + G->getScalarMap()[Casted] = G->getScalarMap()[V]; } else { // Otherwise, update the NewToOldValueMap UpdateNewToOldValueMap(I, V, V != Casted ? Casted : 0); } @@ -518,9 +518,9 @@ // If we are modifying the original function, update the DSGraph. if (!FI.Clone) { // V and Casted now point to whatever the original allocation did. - G.getScalarMap().replaceScalar(I, V); + G->getScalarMap().replaceScalar(I, V); if (V != Casted) - G.getScalarMap()[Casted] = G.getScalarMap()[V]; + G->getScalarMap()[Casted] = G->getScalarMap()[V]; } else { // Otherwise, update the NewToOldValueMap UpdateNewToOldValueMap(I, V, V != Casted ? Casted : 0); } @@ -602,7 +602,7 @@ ArgNodes = CFI->ArgNodes; assert ((Graphs.hasDSGraph (*CF)) && "Function has no ECGraph!\n"); - CalleeGraph = &Graphs.getDSGraph(*CF); + CalleeGraph = Graphs.getDSGraph(*CF); } else { DEBUG(std::cerr << " Handling indirect call: " << *TheCall); @@ -619,14 +619,14 @@ CF = *I; // Get the common graph for the set of functions this call may invoke. - CalleeGraph = &Graphs.getDSGraph(*CF); + CalleeGraph = Graphs.getDSGraph(*CF); #ifndef NDEBUG // Verify that all potential callees at call site have the same DS graph. DataStructures::callee_iterator E = Graphs.callee_end(OrigInst); for (; I != E; ++I) if (!(*I)->isDeclaration()) - assert(CalleeGraph == &Graphs.getDSGraph(**I) && + assert(CalleeGraph == Graphs.getDSGraph(**I) && "Callees at call site do not have a common graph!"); #endif @@ -750,7 +750,7 @@ if (TheCall->getType() != Type::VoidTy) { // If we are modifying the original function, update the DSGraph... - DSGraph::ScalarMapTy &SM = G.getScalarMap(); + DSGraph::ScalarMapTy &SM = G->getScalarMap(); DSGraph::ScalarMapTy::iterator CII = SM.find(TheCall); if (CII != SM.end()) { SM[NewCall] = CII->second; From gohman at apple.com Mon Oct 20 10:51:45 2008 From: gohman at apple.com (Dan Gohman) Date: Mon, 20 Oct 2008 08:51:45 -0700 (PDT) Subject: [llvm-commits] [llvm] r57786 - /llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp In-Reply-To: <200810192051.m9JKpExj003636@zion.cs.uiuc.edu> References: <200810192051.m9JKpExj003636@zion.cs.uiuc.edu> Message-ID: <56982.76.220.41.203.1224517905.squirrel@webmail.apple.com> On Sun, October 19, 2008 1:51 pm, Bill Wendling wrote: > Author: void > Date: Sun Oct 19 15:51:12 2008 > New Revision: 57786 > > URL: http://llvm.org/viewvc/llvm-project?rev=57786&view=rev > Log: > Set N->OperandList to 0 after deletion. Otherwise, it's possible that it > will > be either deleted or referenced afterwards. Hi Bill, Is this addressing an actual bug? Both of the changes are modifying fields of objects immediately before they are deallocated, so if there is code somewhere else that is using uninitialized SDNode fields, we should fix that code, regardless of this change. Thanks, Dan From baldrick at free.fr Mon Oct 20 10:56:33 2008 From: baldrick at free.fr (Duncan Sands) Date: Mon, 20 Oct 2008 15:56:33 -0000 Subject: [llvm-commits] [llvm] r57831 - /llvm/trunk/lib/Target/X86/X86ISelLowering.cpp Message-ID: <200810201556.m9KFuYHB022141@zion.cs.uiuc.edu> Author: baldrick Date: Mon Oct 20 10:56:33 2008 New Revision: 57831 URL: http://llvm.org/viewvc/llvm-project?rev=57831&view=rev Log: Have X86 custom lowering for LegalizeTypes use LowerOperation if it doesn't know what else to do. This methods should probably be factorized some, but this is good enough for the moment. Have LowerATOMIC_BINARY_64 use EXTRACT_ELEMENT rather than assuming the operand is a BUILD_PAIR (if it is then getNode will automagically simplify the EXTRACT_ELEMENT). This way LowerATOMIC_BINARY_64 usable from LegalizeTypes. Modified: llvm/trunk/lib/Target/X86/X86ISelLowering.cpp Modified: llvm/trunk/lib/Target/X86/X86ISelLowering.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86ISelLowering.cpp?rev=57831&r1=57830&r2=57831&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/X86ISelLowering.cpp (original) +++ llvm/trunk/lib/Target/X86/X86ISelLowering.cpp Mon Oct 20 10:56:33 2008 @@ -5980,7 +5980,7 @@ case MVT::i64: if (Subtarget->is64Bit()) { Reg = X86::RAX; size = 8; - } else //Should go away when LowerType stuff lands + } else //Should go away when LegalizeType stuff lands return SDValue(ExpandATOMIC_CMP_SWAP(Op.getNode(), DAG), 0); break; }; @@ -6044,9 +6044,10 @@ SDValue Chain = Node->getOperand(0); SDValue In1 = Node->getOperand(1); - assert(Node->getOperand(2).getNode()->getOpcode()==ISD::BUILD_PAIR); - SDValue In2L = Node->getOperand(2).getNode()->getOperand(0); - SDValue In2H = Node->getOperand(2).getNode()->getOperand(1); + SDValue In2L = DAG.getNode(ISD::EXTRACT_ELEMENT, MVT::i32, + Node->getOperand(2), DAG.getIntPtrConstant(0)); + SDValue In2H = DAG.getNode(ISD::EXTRACT_ELEMENT, MVT::i32, + Node->getOperand(2), DAG.getIntPtrConstant(1)); // This is a generalized SDNode, not an AtomicSDNode, so it doesn't // have a MemOperand. Pass the info through as a normal operand. SDValue LSI = DAG.getMemOperand(cast(Node)->getMemOperand()); @@ -6082,12 +6083,12 @@ SDValue X86TargetLowering::LowerOperation(SDValue Op, SelectionDAG &DAG) { switch (Op.getOpcode()) { default: assert(0 && "Should not custom lower this!"); - case ISD::ATOMIC_CMP_SWAP_8: - case ISD::ATOMIC_CMP_SWAP_16: - case ISD::ATOMIC_CMP_SWAP_32: + case ISD::ATOMIC_CMP_SWAP_8: + case ISD::ATOMIC_CMP_SWAP_16: + case ISD::ATOMIC_CMP_SWAP_32: case ISD::ATOMIC_CMP_SWAP_64: return LowerCMP_SWAP(Op,DAG); - case ISD::ATOMIC_LOAD_SUB_8: - case ISD::ATOMIC_LOAD_SUB_16: + case ISD::ATOMIC_LOAD_SUB_8: + case ISD::ATOMIC_LOAD_SUB_16: case ISD::ATOMIC_LOAD_SUB_32: return LowerLOAD_SUB(Op,DAG); case ISD::ATOMIC_LOAD_SUB_64: return (Subtarget->is64Bit()) ? LowerLOAD_SUB(Op,DAG) : @@ -6155,7 +6156,8 @@ /// with a new node built out of custom code. SDNode *X86TargetLowering::ReplaceNodeResults(SDNode *N, SelectionDAG &DAG) { switch (N->getOpcode()) { - default: assert(0 && "Should not custom lower this!"); + default: + return X86TargetLowering::LowerOperation(SDValue (N, 0), DAG).getNode(); case ISD::FP_TO_SINT: return ExpandFP_TO_SINT(N, DAG); case ISD::READCYCLECOUNTER: return ExpandREADCYCLECOUNTER(N, DAG); case ISD::ATOMIC_CMP_SWAP_64: return ExpandATOMIC_CMP_SWAP(N, DAG); From gohman at apple.com Mon Oct 20 10:58:02 2008 From: gohman at apple.com (Dan Gohman) Date: Mon, 20 Oct 2008 15:58:02 -0000 Subject: [llvm-commits] [llvm] r57832 - /llvm/trunk/include/llvm/Target/TargetInstrInfo.h Message-ID: <200810201558.m9KFw2CZ022207@zion.cs.uiuc.edu> Author: djg Date: Mon Oct 20 10:58:02 2008 New Revision: 57832 URL: http://llvm.org/viewvc/llvm-project?rev=57832&view=rev Log: Fix a typo in a comment. Modified: llvm/trunk/include/llvm/Target/TargetInstrInfo.h Modified: llvm/trunk/include/llvm/Target/TargetInstrInfo.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/TargetInstrInfo.h?rev=57832&r1=57831&r2=57832&view=diff ============================================================================== --- llvm/trunk/include/llvm/Target/TargetInstrInfo.h (original) +++ llvm/trunk/include/llvm/Target/TargetInstrInfo.h Mon Oct 20 10:58:02 2008 @@ -200,7 +200,7 @@ } /// RemoveBranch - Remove the branching code at the end of the specific MBB. - /// this is only invoked in cases where AnalyzeBranch returns success. It + /// This is only invoked in cases where AnalyzeBranch returns success. It /// returns the number of instructions that were removed. virtual unsigned RemoveBranch(MachineBasicBlock &MBB) const { assert(0 && "Target didn't implement TargetInstrInfo::RemoveBranch!"); From baldrick at free.fr Mon Oct 20 11:04:57 2008 From: baldrick at free.fr (Duncan Sands) Date: Mon, 20 Oct 2008 16:04:57 -0000 Subject: [llvm-commits] [llvm] r57833 - /llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp Message-ID: <200810201604.m9KG4vs3022547@zion.cs.uiuc.edu> Author: baldrick Date: Mon Oct 20 11:04:57 2008 New Revision: 57833 URL: http://llvm.org/viewvc/llvm-project?rev=57833&view=rev Log: Don't use a random type for the select condition, use an MVT::i1 and simplify the code while there. Modified: llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp Modified: llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp?rev=57833&r1=57832&r2=57833&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp Mon Oct 20 11:04:57 2008 @@ -272,8 +272,7 @@ if (TLI.isBigEndian()) std::swap(Lo, Hi); - SDValue Odd = DAG.getNode(ISD::AND, OldIdx.getValueType(), OldIdx, - DAG.getConstant(1, TLI.getShiftAmountTy())); + SDValue Odd = DAG.getNode(ISD::TRUNCATE, MVT::i1, OldIdx); return DAG.getNode(ISD::SELECT, NewVT, Odd, Hi, Lo); } From baldrick at free.fr Mon Oct 20 11:06:47 2008 From: baldrick at free.fr (Duncan Sands) Date: Mon, 20 Oct 2008 16:06:47 -0000 Subject: [llvm-commits] [llvm] r57834 - in /llvm/trunk/lib/CodeGen/SelectionDAG: LegalizeIntegerTypes.cpp LegalizeTypes.h Message-ID: <200810201606.m9KG6lxc022620@zion.cs.uiuc.edu> Author: baldrick Date: Mon Oct 20 11:06:47 2008 New Revision: 57834 URL: http://llvm.org/viewvc/llvm-project?rev=57834&view=rev Log: Formatting - no functional change. Modified: llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeTypes.h Modified: llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp?rev=57834&r1=57833&r2=57834&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp Mon Oct 20 11:06:47 2008 @@ -1198,7 +1198,7 @@ MVT NVT = Lo.getValueType(); SDValue HiNotZero = DAG.getSetCC(TLI.getSetCCResultType(Hi), Hi, - DAG.getConstant(0, NVT), ISD::SETNE); + DAG.getConstant(0, NVT), ISD::SETNE); SDValue LoLZ = DAG.getNode(ISD::CTLZ, NVT, Lo); SDValue HiLZ = DAG.getNode(ISD::CTLZ, NVT, Hi); @@ -1226,7 +1226,7 @@ MVT NVT = Lo.getValueType(); SDValue LoNotZero = DAG.getSetCC(TLI.getSetCCResultType(Lo), Lo, - DAG.getConstant(0, NVT), ISD::SETNE); + DAG.getConstant(0, NVT), ISD::SETNE); SDValue LoLZ = DAG.getNode(ISD::CTTZ, NVT, Lo); SDValue HiLZ = DAG.getNode(ISD::CTTZ, NVT, Hi); @@ -2032,8 +2032,8 @@ SDValue Lo, Hi; GetExpandedInteger(Op, Lo, Hi); SDValue SignSet = DAG.getSetCC(TLI.getSetCCResultType(Hi), Hi, - DAG.getConstant(0, Hi.getValueType()), - ISD::SETLT); + DAG.getConstant(0, Hi.getValueType()), + ISD::SETLT); // Build a 64 bit pair (0, FF) in the constant pool, with FF in the lo bits. SDValue FudgePtr = DAG.getConstantPool(ConstantInt::get(FF.zext(64)), @@ -2044,7 +2044,7 @@ SDValue Four = DAG.getIntPtrConstant(4); if (TLI.isBigEndian()) std::swap(Zero, Four); SDValue Offset = DAG.getNode(ISD::SELECT, Zero.getValueType(), SignSet, - Zero, Four); + Zero, Four); unsigned Alignment = 1 << cast(FudgePtr)->getAlignment(); FudgePtr = DAG.getNode(ISD::ADD, TLI.getPointerTy(), FudgePtr, Offset); Modified: llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeTypes.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeTypes.h?rev=57834&r1=57833&r2=57834&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeTypes.h (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeTypes.h Mon Oct 20 11:06:47 2008 @@ -188,8 +188,7 @@ void SplitInteger(SDValue Op, MVT LoVT, MVT HiVT, SDValue &Lo, SDValue &Hi); - SDValue GetVectorElementPointer(SDValue VecPtr, MVT EltVT, - SDValue Index); + SDValue GetVectorElementPointer(SDValue VecPtr, MVT EltVT, SDValue Index); //===--------------------------------------------------------------------===// // Integer Promotion Support: LegalizeIntegerTypes.cpp From baldrick at free.fr Mon Oct 20 11:13:05 2008 From: baldrick at free.fr (Duncan Sands) Date: Mon, 20 Oct 2008 16:13:05 -0000 Subject: [llvm-commits] [llvm] r57836 - /llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp Message-ID: <200810201613.m9KGD5ed022840@zion.cs.uiuc.edu> Author: baldrick Date: Mon Oct 20 11:13:04 2008 New Revision: 57836 URL: http://llvm.org/viewvc/llvm-project?rev=57836&view=rev Log: Always use either MVT::i1 or getSetCCResultType for the condition of a SELECT node. Make sure that the correct extension type (any-, sign- or zero-extend) is used. Modified: llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp Modified: llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp?rev=57836&r1=57835&r2=57836&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp Mon Oct 20 11:13:04 2008 @@ -364,14 +364,18 @@ } SDValue DAGTypeLegalizer::PromoteIntRes_SETCC(SDNode *N) { - MVT NVT = TLI.getTypeToTransformTo(N->getValueType(0)); MVT SVT = TLI.getSetCCResultType(N->getOperand(0)); - assert(isTypeLegal(SVT) && "SetCC type not legal??"); + assert(isTypeLegal(SVT) && "Illegal SetCC type!"); + + // Get the SETCC result using the canonical SETCC type. + SDValue SetCC = DAG.getNode(ISD::SETCC, SVT, N->getOperand(0), + N->getOperand(1), N->getOperand(2)); + + // Convert to the expected type. + MVT NVT = TLI.getTypeToTransformTo(N->getValueType(0)); assert(NVT.getSizeInBits() <= SVT.getSizeInBits() && "Integer type overpromoted?"); - return DAG.getNode(ISD::TRUNCATE, NVT, - DAG.getNode(ISD::SETCC, SVT, N->getOperand(0), - N->getOperand(1), N->getOperand(2))); + return DAG.getNode(ISD::TRUNCATE, NVT, SetCC); } SDValue DAGTypeLegalizer::PromoteIntRes_SHL(SDNode *N) { @@ -731,18 +735,50 @@ SDValue DAGTypeLegalizer::PromoteIntOp_SELECT(SDNode *N, unsigned OpNo) { assert(OpNo == 0 && "Only know how to promote condition"); - SDValue Cond = GetPromotedInteger(N->getOperand(0)); // Promote condition. + assert(N->getOperand(0).getValueType() == MVT::i1 && + "SetCC type is not legal??"); + SDValue Cond = GetPromotedInteger(N->getOperand(0)); + + // Promote all the way up to SVT, the canonical SetCC type. + MVT SVT = TLI.getSetCCResultType(Cond); + assert(isTypeLegal(SVT) && "Illegal SetCC type!"); + assert(Cond.getValueSizeInBits() <= SVT.getSizeInBits() && + "Integer type overpromoted?"); - // The top bits of the promoted condition are not necessarily zero, ensure - // that the value is properly zero extended. - unsigned BitWidth = Cond.getValueSizeInBits(); - if (!DAG.MaskedValueIsZero(Cond, - APInt::getHighBitsSet(BitWidth, BitWidth-1))) - Cond = DAG.getZeroExtendInReg(Cond, MVT::i1); + // Make sure the extra bits conform to getSetCCResultContents. There are + // two sets of extra bits: those in Cond, which come from type promotion, + // and those we need to add to have the final type be SVT (for most targets + // this last set of bits is empty). + unsigned CondBits = Cond.getValueSizeInBits(); + ISD::NodeType ExtendCode; + switch (TLI.getSetCCResultContents()) { + default: + assert(false && "Unknown SetCCResultValue!"); + case TargetLowering::UndefinedSetCCResult: + // Extend to SVT by adding rubbish. + ExtendCode = ISD::ANY_EXTEND; + break; + case TargetLowering::ZeroOrOneSetCCResult: + ExtendCode = ISD::ZERO_EXTEND; + if (!DAG.MaskedValueIsZero(Cond,APInt::getHighBitsSet(CondBits,CondBits-1))) + // All extra bits need to be cleared. Do this by zero extending the + // original MVT::i1 condition value all the way to SVT. + Cond = N->getOperand(0); + break; + case TargetLowering::ZeroOrNegativeOneSetCCResult: { + ExtendCode = ISD::SIGN_EXTEND; + unsigned SignBits = DAG.ComputeNumSignBits(Cond); + if (SignBits != CondBits) + // All extra bits need to be sign extended. Do this by sign extending the + // original MVT::i1 condition value all the way to SVT. + Cond = N->getOperand(0); + break; + } + } + Cond = DAG.getNode(ExtendCode, SVT, Cond); - // The chain (Op#0) and basic block destination (Op#2) are always legal types. - return DAG.UpdateNodeOperands(SDValue(N, 0), Cond, N->getOperand(1), - N->getOperand(2)); + return DAG.UpdateNodeOperands(SDValue(N, 0), Cond, + N->getOperand(1), N->getOperand(2)); } SDValue DAGTypeLegalizer::PromoteIntOp_SELECT_CC(SDNode *N, unsigned OpNo) { From baldrick at free.fr Mon Oct 20 11:14:43 2008 From: baldrick at free.fr (Duncan Sands) Date: Mon, 20 Oct 2008 16:14:43 -0000 Subject: [llvm-commits] [llvm] r57837 - in /llvm/trunk/lib/CodeGen/SelectionDAG: LegalizeFloatTypes.cpp LegalizeIntegerTypes.cpp Message-ID: <200810201614.m9KGEhFD022891@zion.cs.uiuc.edu> Author: baldrick Date: Mon Oct 20 11:14:43 2008 New Revision: 57837 URL: http://llvm.org/viewvc/llvm-project?rev=57837&view=rev Log: Use DAG.getIntPtrConstant rather than DAG.getConstant with TLI.getPointerTy for a small simplification. Modified: llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeFloatTypes.cpp llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp Modified: llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeFloatTypes.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeFloatTypes.cpp?rev=57837&r1=57836&r2=57837&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeFloatTypes.cpp (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeFloatTypes.cpp Mon Oct 20 11:14:43 2008 @@ -767,10 +767,8 @@ MVT::ppcf128)); Lo = DAG.getNode(ISD::SELECT_CC, VT, Src, DAG.getConstant(0, SrcVT), Lo, Hi, DAG.getCondCode(ISD::SETLT)); - Hi = DAG.getNode(ISD::EXTRACT_ELEMENT, NVT, Lo, - DAG.getConstant(1, TLI.getPointerTy())); - Lo = DAG.getNode(ISD::EXTRACT_ELEMENT, NVT, Lo, - DAG.getConstant(0, TLI.getPointerTy())); + Hi = DAG.getNode(ISD::EXTRACT_ELEMENT, NVT, Lo, DAG.getIntPtrConstant(1)); + Lo = DAG.getNode(ISD::EXTRACT_ELEMENT, NVT, Lo, DAG.getIntPtrConstant(0)); } Modified: llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp?rev=57837&r1=57836&r2=57837&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp Mon Oct 20 11:14:43 2008 @@ -469,7 +469,7 @@ // of zero here!). unsigned Increment = VT.getSizeInBits() / 8; SDValue Tmp = DAG.getNode(ISD::ADD, TLI.getPointerTy(), VAList, - DAG.getConstant(Increment, TLI.getPointerTy())); + DAG.getIntPtrConstant(Increment)); // Store the incremented VAList to the pointer. Tmp = DAG.getStore(VAList.getValue(1), Tmp, Ptr, V, 0); @@ -2073,7 +2073,7 @@ // Build a 64 bit pair (0, FF) in the constant pool, with FF in the lo bits. SDValue FudgePtr = DAG.getConstantPool(ConstantInt::get(FF.zext(64)), - TLI.getPointerTy()); + TLI.getPointerTy()); // Get a pointer to FF if the sign bit was set, or to 0 otherwise. SDValue Zero = DAG.getIntPtrConstant(0); From baldrick at free.fr Mon Oct 20 11:17:42 2008 From: baldrick at free.fr (Duncan Sands) Date: Mon, 20 Oct 2008 16:17:42 -0000 Subject: [llvm-commits] [llvm] r57838 - in /llvm/trunk/lib/CodeGen/SelectionDAG: LegalizeIntegerTypes.cpp LegalizeTypes.h Message-ID: <200810201617.m9KGHhrg023010@zion.cs.uiuc.edu> Author: baldrick Date: Mon Oct 20 11:17:42 2008 New Revision: 57838 URL: http://llvm.org/viewvc/llvm-project?rev=57838&view=rev Log: LegalizeTypes support for atomic operation promotion. Modified: llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeTypes.h Modified: llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp?rev=57838&r1=57837&r2=57838&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp Mon Oct 20 11:17:42 2008 @@ -89,13 +89,65 @@ case ISD::XOR: case ISD::ADD: case ISD::SUB: - case ISD::MUL: Result = PromoteIntRes_SimpleIntBinOp(N); break; + case ISD::MUL: Result = PromoteIntRes_SimpleIntBinOp(N); break; case ISD::SDIV: - case ISD::SREM: Result = PromoteIntRes_SDIV(N); break; + case ISD::SREM: Result = PromoteIntRes_SDIV(N); break; case ISD::UDIV: - case ISD::UREM: Result = PromoteIntRes_UDIV(N); break; + case ISD::UREM: Result = PromoteIntRes_UDIV(N); break; + + case ISD::ATOMIC_LOAD_ADD_8: + case ISD::ATOMIC_LOAD_SUB_8: + case ISD::ATOMIC_LOAD_AND_8: + case ISD::ATOMIC_LOAD_OR_8: + case ISD::ATOMIC_LOAD_XOR_8: + case ISD::ATOMIC_LOAD_NAND_8: + case ISD::ATOMIC_LOAD_MIN_8: + case ISD::ATOMIC_LOAD_MAX_8: + case ISD::ATOMIC_LOAD_UMIN_8: + case ISD::ATOMIC_LOAD_UMAX_8: + case ISD::ATOMIC_SWAP_8: + case ISD::ATOMIC_LOAD_ADD_16: + case ISD::ATOMIC_LOAD_SUB_16: + case ISD::ATOMIC_LOAD_AND_16: + case ISD::ATOMIC_LOAD_OR_16: + case ISD::ATOMIC_LOAD_XOR_16: + case ISD::ATOMIC_LOAD_NAND_16: + case ISD::ATOMIC_LOAD_MIN_16: + case ISD::ATOMIC_LOAD_MAX_16: + case ISD::ATOMIC_LOAD_UMIN_16: + case ISD::ATOMIC_LOAD_UMAX_16: + case ISD::ATOMIC_SWAP_16: + case ISD::ATOMIC_LOAD_ADD_32: + case ISD::ATOMIC_LOAD_SUB_32: + case ISD::ATOMIC_LOAD_AND_32: + case ISD::ATOMIC_LOAD_OR_32: + case ISD::ATOMIC_LOAD_XOR_32: + case ISD::ATOMIC_LOAD_NAND_32: + case ISD::ATOMIC_LOAD_MIN_32: + case ISD::ATOMIC_LOAD_MAX_32: + case ISD::ATOMIC_LOAD_UMIN_32: + case ISD::ATOMIC_LOAD_UMAX_32: + case ISD::ATOMIC_SWAP_32: + case ISD::ATOMIC_LOAD_ADD_64: + case ISD::ATOMIC_LOAD_SUB_64: + case ISD::ATOMIC_LOAD_AND_64: + case ISD::ATOMIC_LOAD_OR_64: + case ISD::ATOMIC_LOAD_XOR_64: + case ISD::ATOMIC_LOAD_NAND_64: + case ISD::ATOMIC_LOAD_MIN_64: + case ISD::ATOMIC_LOAD_MAX_64: + case ISD::ATOMIC_LOAD_UMIN_64: + case ISD::ATOMIC_LOAD_UMAX_64: + case ISD::ATOMIC_SWAP_64: + Result = PromoteIntRes_Atomic1(cast(N)); break; + + case ISD::ATOMIC_CMP_SWAP_8: + case ISD::ATOMIC_CMP_SWAP_16: + case ISD::ATOMIC_CMP_SWAP_32: + case ISD::ATOMIC_CMP_SWAP_64: + Result = PromoteIntRes_Atomic2(cast(N)); break; } // If Result is null, the sub-method took care of registering the result. @@ -120,6 +172,27 @@ DAG.getZeroExtendInReg(Op, OldVT), N->getOperand(1)); } +SDValue DAGTypeLegalizer::PromoteIntRes_Atomic1(AtomicSDNode *N) { + SDValue Op2 = GetPromotedInteger(N->getOperand(2)); + SDValue Res = DAG.getAtomic(N->getOpcode(), N->getChain(), N->getBasePtr(), + Op2, N->getSrcValue(), N->getAlignment()); + // Legalized the chain result - switch anything that used the old chain to + // use the new one. + ReplaceValueWith(SDValue(N, 1), Res.getValue(1)); + return Res; +} + +SDValue DAGTypeLegalizer::PromoteIntRes_Atomic2(AtomicSDNode *N) { + SDValue Op2 = GetPromotedInteger(N->getOperand(2)); + SDValue Op3 = GetPromotedInteger(N->getOperand(3)); + SDValue Res = DAG.getAtomic(N->getOpcode(), N->getChain(), N->getBasePtr(), + Op2, Op3, N->getSrcValue(), N->getAlignment()); + // Legalized the chain result - switch anything that used the old chain to + // use the new one. + ReplaceValueWith(SDValue(N, 1), Res.getValue(1)); + return Res; +} + SDValue DAGTypeLegalizer::PromoteIntRes_BIT_CONVERT(SDNode *N) { SDValue InOp = N->getOperand(0); MVT InVT = InOp.getValueType(); Modified: llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeTypes.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeTypes.h?rev=57838&r1=57837&r2=57838&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeTypes.h (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeTypes.h Mon Oct 20 11:17:42 2008 @@ -214,6 +214,8 @@ void PromoteIntegerResult(SDNode *N, unsigned ResNo); SDValue PromoteIntRes_AssertSext(SDNode *N); SDValue PromoteIntRes_AssertZext(SDNode *N); + SDValue PromoteIntRes_Atomic1(AtomicSDNode *N); + SDValue PromoteIntRes_Atomic2(AtomicSDNode *N); SDValue PromoteIntRes_BIT_CONVERT(SDNode *N); SDValue PromoteIntRes_BSWAP(SDNode *N); SDValue PromoteIntRes_BUILD_PAIR(SDNode *N); From baldrick at free.fr Mon Oct 20 11:24:25 2008 From: baldrick at free.fr (Duncan Sands) Date: Mon, 20 Oct 2008 16:24:25 -0000 Subject: [llvm-commits] [llvm] r57839 - /llvm/trunk/include/llvm/Target/TargetLowering.h Message-ID: <200810201624.m9KGOPeW023206@zion.cs.uiuc.edu> Author: baldrick Date: Mon Oct 20 11:24:25 2008 New Revision: 57839 URL: http://llvm.org/viewvc/llvm-project?rev=57839&view=rev Log: Teach getTypeToTransformTo to return something sensible for vectors being scalarized. Note that this method can't return anything very sensible when splitting non-power-of-two vectors. Modified: llvm/trunk/include/llvm/Target/TargetLowering.h Modified: llvm/trunk/include/llvm/Target/TargetLowering.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/TargetLowering.h?rev=57839&r1=57838&r2=57839&view=diff ============================================================================== --- llvm/trunk/include/llvm/Target/TargetLowering.h (original) +++ llvm/trunk/include/llvm/Target/TargetLowering.h Mon Oct 20 11:24:25 2008 @@ -209,10 +209,11 @@ return NVT; } - if (VT.isVector()) - return MVT::getVectorVT(VT.getVectorElementType(), - VT.getVectorNumElements() / 2); - if (VT.isInteger()) { + if (VT.isVector()) { + unsigned NumElts = VT.getVectorNumElements(); + MVT EltVT = VT.getVectorElementType(); + return (NumElts == 1) ? EltVT : MVT::getVectorVT(EltVT, NumElts / 2); + } else if (VT.isInteger()) { MVT NVT = VT.getRoundIntegerType(); if (NVT == VT) // Size is a power of two - expand to half the size. From baldrick at free.fr Mon Oct 20 11:31:21 2008 From: baldrick at free.fr (Duncan Sands) Date: Mon, 20 Oct 2008 16:31:21 -0000 Subject: [llvm-commits] [llvm] r57840 - in /llvm/trunk/lib/CodeGen/SelectionDAG: LegalizeTypes.h LegalizeVectorTypes.cpp Message-ID: <200810201631.m9KGVLY8023456@zion.cs.uiuc.edu> Author: baldrick Date: Mon Oct 20 11:31:21 2008 New Revision: 57840 URL: http://llvm.org/viewvc/llvm-project?rev=57840&view=rev Log: Support operations like fp_to_uint with a vector result type when the result type is legal but not the operand type. Add additional support for EXTRACT_SUBVECTOR and CONCAT_VECTORS, needed to handle such cases. Modified: llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeTypes.h llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp Modified: llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeTypes.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeTypes.h?rev=57840&r1=57839&r2=57840&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeTypes.h (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeTypes.h Mon Oct 20 11:31:21 2008 @@ -416,6 +416,7 @@ SDValue ScalarizeVecRes_UnaryOp(SDNode *N); SDValue ScalarizeVecRes_BIT_CONVERT(SDNode *N); + SDValue ScalarizeVecRes_EXTRACT_SUBVECTOR(SDNode *N); SDValue ScalarizeVecRes_FPOWI(SDNode *N); SDValue ScalarizeVecRes_INSERT_VECTOR_ELT(SDNode *N); SDValue ScalarizeVecRes_LOAD(LoadSDNode *N); @@ -427,6 +428,7 @@ // Vector Operand Scalarization: <1 x ty> -> ty. bool ScalarizeVectorOperand(SDNode *N, unsigned OpNo); SDValue ScalarizeVecOp_BIT_CONVERT(SDNode *N); + SDValue ScalarizeVecOp_CONCAT_VECTORS(SDNode *N); SDValue ScalarizeVecOp_EXTRACT_VECTOR_ELT(SDNode *N); SDValue ScalarizeVecOp_STORE(StoreSDNode *N, unsigned OpNo); @@ -455,6 +457,7 @@ // Vector Operand Splitting: <128 x ty> -> 2 x <64 x ty>. bool SplitVectorOperand(SDNode *N, unsigned OpNo); + SDValue SplitVecOp_UnaryOp(SDNode *N); SDValue SplitVecOp_BIT_CONVERT(SDNode *N); SDValue SplitVecOp_EXTRACT_SUBVECTOR(SDNode *N); Modified: llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp?rev=57840&r1=57839&r2=57840&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp Mon Oct 20 11:31:21 2008 @@ -43,6 +43,7 @@ case ISD::BIT_CONVERT: R = ScalarizeVecRes_BIT_CONVERT(N); break; case ISD::BUILD_VECTOR: R = N->getOperand(0); break; + case ISD::EXTRACT_SUBVECTOR: R = ScalarizeVecRes_EXTRACT_SUBVECTOR(N); break; case ISD::FPOWI: R = ScalarizeVecRes_FPOWI(N); break; case ISD::INSERT_VECTOR_ELT: R = ScalarizeVecRes_INSERT_VECTOR_ELT(N); break; case ISD::LOAD: R = ScalarizeVecRes_LOAD(cast(N));break; @@ -67,6 +68,7 @@ case ISD::FRINT: case ISD::FNEARBYINT: case ISD::SINT_TO_FP: + case ISD::TRUNCATE: case ISD::UINT_TO_FP: R = ScalarizeVecRes_UnaryOp(N); break; case ISD::ADD: @@ -103,6 +105,12 @@ return DAG.getNode(ISD::BIT_CONVERT, NewVT, N->getOperand(0)); } +SDValue DAGTypeLegalizer::ScalarizeVecRes_EXTRACT_SUBVECTOR(SDNode *N) { + return DAG.getNode(ISD::EXTRACT_VECTOR_ELT, + N->getValueType(0).getVectorElementType(), + N->getOperand(0), N->getOperand(1)); +} + SDValue DAGTypeLegalizer::ScalarizeVecRes_FPOWI(SDNode *N) { SDValue Op = GetScalarizedVector(N->getOperand(0)); return DAG.getNode(ISD::FPOWI, Op.getValueType(), Op, N->getOperand(1)); @@ -139,7 +147,7 @@ SDValue DAGTypeLegalizer::ScalarizeVecRes_UnaryOp(SDNode *N) { // Get the dest type - it doesn't always match the input type, e.g. int_to_fp. - MVT DestVT = TLI.getTypeToTransformTo(N->getValueType(0)); + MVT DestVT = N->getValueType(0).getVectorElementType(); SDValue Op = GetScalarizedVector(N->getOperand(0)); return DAG.getNode(N->getOpcode(), DestVT, Op); } @@ -199,6 +207,9 @@ case ISD::BIT_CONVERT: Res = ScalarizeVecOp_BIT_CONVERT(N); break; + case ISD::CONCAT_VECTORS: + Res = ScalarizeVecOp_CONCAT_VECTORS(N); break; + case ISD::EXTRACT_VECTOR_ELT: Res = ScalarizeVecOp_EXTRACT_VECTOR_ELT(N); break; @@ -234,6 +245,16 @@ return DAG.getNode(ISD::BIT_CONVERT, N->getValueType(0), Elt); } +/// ScalarizeVecOp_CONCAT_VECTORS - The vectors to concatenate have length one - +/// use a BUILD_VECTOR instead. +SDValue DAGTypeLegalizer::ScalarizeVecOp_CONCAT_VECTORS(SDNode *N) { + SmallVector Ops(N->getNumOperands()); + for (unsigned i = 0, e = N->getNumOperands(); i < e; ++i) + Ops[i] = GetScalarizedVector(N->getOperand(i)); + return DAG.getNode(ISD::BUILD_VECTOR, N->getValueType(0), + &Ops[0], Ops.size()); +} + /// ScalarizeVecOp_EXTRACT_VECTOR_ELT - If the input is a vector that needs to /// be scalarized, it must be <1 x ty>, so just return the element, ignoring the /// index. @@ -313,6 +334,7 @@ case ISD::FP_TO_SINT: case ISD::FP_TO_UINT: case ISD::SINT_TO_FP: + case ISD::TRUNCATE: case ISD::UINT_TO_FP: SplitVecRes_UnaryOp(N, Lo, Hi); break; case ISD::ADD: @@ -636,6 +658,15 @@ case ISD::STORE: Res = SplitVecOp_STORE(cast(N), OpNo); break; case ISD::VECTOR_SHUFFLE: Res = SplitVecOp_VECTOR_SHUFFLE(N, OpNo);break; + + case ISD::CTTZ: + case ISD::CTLZ: + case ISD::CTPOP: + case ISD::FP_TO_SINT: + case ISD::FP_TO_UINT: + case ISD::SINT_TO_FP: + case ISD::TRUNCATE: + case ISD::UINT_TO_FP: Res = SplitVecOp_UnaryOp(N); break; } } @@ -659,6 +690,24 @@ return false; } +SDValue DAGTypeLegalizer::SplitVecOp_UnaryOp(SDNode *N) { + // The result has a legal vector type, but the input needs splitting. + MVT ResVT = N->getValueType(0); + SDValue Lo, Hi; + GetSplitVector(N->getOperand(0), Lo, Hi); + assert(Lo.getValueType() == Hi.getValueType() && + "Returns legal non-power-of-two vector type?"); + MVT InVT = Lo.getValueType(); + + MVT OutVT = MVT::getVectorVT(ResVT.getVectorElementType(), + InVT.getVectorNumElements()); + + Lo = DAG.getNode(N->getOpcode(), OutVT, Lo); + Hi = DAG.getNode(N->getOpcode(), OutVT, Hi); + + return DAG.getNode(ISD::CONCAT_VECTORS, ResVT, Lo, Hi); +} + SDValue DAGTypeLegalizer::SplitVecOp_BIT_CONVERT(SDNode *N) { // For example, i64 = BIT_CONVERT v4i16 on alpha. Typically the vector will // end up being split all the way down to individual components. Convert the From clattner at apple.com Mon Oct 20 11:40:15 2008 From: clattner at apple.com (Chris Lattner) Date: Mon, 20 Oct 2008 09:40:15 -0700 Subject: [llvm-commits] [llvm] r57765 - /llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp In-Reply-To: <0D069F7F-5FC0-4F3D-B293-A342A47B4D05@apple.com> References: <200810180518.m9I5Iujh007695@zion.cs.uiuc.edu> <60B7C920-BCC7-4CCD-AE6B-DD09FA25760D@apple.com> <0D069F7F-5FC0-4F3D-B293-A342A47B4D05@apple.com> Message-ID: <35A72553-F89D-4C9A-831E-9BBFA9628BFC@apple.com> On Oct 18, 2008, at 1:12 PM, Evan Cheng wrote: > It shouldn't. Owen had fixed that problem. Ok, thanks! -Chris From isanbard at gmail.com Mon Oct 20 12:01:40 2008 From: isanbard at gmail.com (Bill Wendling) Date: Mon, 20 Oct 2008 10:01:40 -0700 Subject: [llvm-commits] [llvm] r57786 - /llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp In-Reply-To: <56982.76.220.41.203.1224517905.squirrel@webmail.apple.com> References: <200810192051.m9JKpExj003636@zion.cs.uiuc.edu> <56982.76.220.41.203.1224517905.squirrel@webmail.apple.com> Message-ID: <16e5fdf90810201001w223e5905uaf9d650818cae66b@mail.gmail.com> On Mon, Oct 20, 2008 at 8:51 AM, Dan Gohman wrote: > On Sun, October 19, 2008 1:51 pm, Bill Wendling wrote: >> Author: void >> Date: Sun Oct 19 15:51:12 2008 >> New Revision: 57786 >> >> URL: http://llvm.org/viewvc/llvm-project?rev=57786&view=rev >> Log: >> Set N->OperandList to 0 after deletion. Otherwise, it's possible that it >> will >> be either deleted or referenced afterwards. > > Hi Bill, > > Is this addressing an actual bug? Both of the changes are > modifying fields of objects immediately before they are > deallocated, so if there is code somewhere else that is using > uninitialized SDNode fields, we should fix that code, > regardless of this change. > Hi Dan, It's not a bug that showed up in code. I noticed it while looking at the selection DAG stuff. It's just a sanity check, basically. I'm hoping that if anything (later on) does use these fields then a segfault will occur. -bw From lattner at apple.com Mon Oct 20 12:38:59 2008 From: lattner at apple.com (Tanya Lattner) Date: Mon, 20 Oct 2008 10:38:59 -0700 Subject: [llvm-commits] [test-suite] r57768 - /test-suite/trunk/MultiSource/Applications/lua/Makefile In-Reply-To: <200810181821.m9IILX4H011913@zion.cs.uiuc.edu> References: <200810181821.m9IILX4H011913@zion.cs.uiuc.edu> Message-ID: Ok for 2.4? -Tanya On Oct 18, 2008, at 11:21 AM, Chris Lattner wrote: > Author: lattner > Date: Sat Oct 18 13:21:31 2008 > New Revision: 57768 > > URL: http://llvm.org/viewvc/llvm-project?rev=57768&view=rev > Log: > make this program work when srcdir != objdir, patch by > Julien Lerouge! > Fixes PR2912 > > Modified: > test-suite/trunk/MultiSource/Applications/lua/Makefile > > Modified: test-suite/trunk/MultiSource/Applications/lua/Makefile > URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/lua/Makefile?rev=57768&r1=57767&r2=57768&view=diff > > = > = > = > = > = > = > = > = > ====================================================================== > --- test-suite/trunk/MultiSource/Applications/lua/Makefile (original) > +++ test-suite/trunk/MultiSource/Applications/lua/Makefile Sat Oct > 18 13:21:31 2008 > @@ -9,7 +9,7 @@ > CPPFLAGS += -DLUA_USE_POSIX > > PROG = lua > -RUN_OPTIONS = alltests.lua +RUN_OPTIONS = alltests.lua "\ > include $(LEVEL)/Makefile.config > > @@ -17,7 +17,14 @@ > DIFFPROG := $(PROGDIR)/DiffOutput.sh "diff " > > # generate input files > -lua.c: .input_generated > +$(PROJ_SRC_DIR)/lua.c: .input_generated > > .input_generated: > + if [ ! -f ./generate_inputs.sh ]; \ > + then \ > + cp -f $(PROJ_SRC_DIR)/generate_inputs.sh . ; \ > + cp -f -r $(PROJ_SRC_DIR)/{test,bench,input} . ; \ > + cp -f $(PROJ_SRC_DIR)/*.lua . ; \ > + fi > ./generate_inputs.sh > + > > > _______________________________________________ > llvm-commits mailing list > llvm-commits at cs.uiuc.edu > http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20081020/21177407/attachment.html From lattner at apple.com Mon Oct 20 12:38:57 2008 From: lattner at apple.com (Tanya Lattner) Date: Mon, 20 Oct 2008 10:38:57 -0700 Subject: [llvm-commits] [test-suite] r57071 [1/7] - in /test-suite/trunk/MultiSource/Applications/lua: ./ bench/ input/ test/ In-Reply-To: <4354d3270810181022n6fe9f75doe42f5a92f3d7862f@mail.gmail.com> References: <200810042058.m94KwJxP005655@zion.cs.uiuc.edu> <570225F6-8E8C-4CC5-8D58-014A59AAE2D7@apple.com> <4354d3270810181022n6fe9f75doe42f5a92f3d7862f@mail.gmail.com> Message-ID: On Oct 18, 2008, at 10:22 AM, T?r?k Edvin wrote: > On Fri, Oct 17, 2008 at 21:17, Tanya Lattner > wrote: >> Adding a new test program to llvm-test just 2 days before the >> branch is >> probably not a good idea in the future. We experienced issues with >> the >> gen_input script on darwin and I've gotten a report that it doesn't >> work >> with srcDir != objDir. I'm investigating this now. > > Is there a PR open for this? I can help. > Yes (PR2912), and a fix has been checked in. I think it will go into 2.4. Thanks, Tanya -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20081020/c6e205ce/attachment.html From wangmp at apple.com Mon Oct 20 12:46:48 2008 From: wangmp at apple.com (Mon Ping Wang) Date: Mon, 20 Oct 2008 10:46:48 -0700 Subject: [llvm-commits] vector widening patch In-Reply-To: <5101CC65-BB18-4133-8A1A-1D852CD8EECA@rapidmind.com> References: <5101CC65-BB18-4133-8A1A-1D852CD8EECA@rapidmind.com> Message-ID: <332607FD-6A93-4662-9038-F3210C4E1DFB@apple.com> Hi Stefanus, No numbers to back that choice up. The thinking was that instead of worrying about packing and unpacking a two element vector that it might be cheaper to treat it as two scalar computation as a general rule. For x86 with SSE2+, I have no problem saying that we should always widen. With MMX, it is less clear. Do you think that in general, it always make sense to widen? -- Mon Ping On Oct 20, 2008, at 8:18 AM, Stefanus Du Toit wrote: > Hi Mon Ping, > >> + // If it a vector of two, we will assume it doesn't make sense >> to widen >> + if (NElts == 2) >> + return MVT::Other; > > What's the reasoning behind this? In our experience this makes a lot > of sense, at least on x86 SSE2+ (assuming MMX is disabled). > > Stefanus > > On 18-Oct-08, at 12:12 AM, Mon Ping Wang wrote: >> Hi, >> >> Here is a patch for vector widen. In certain cases, it is more >> profitable to widen a vector from an illegal type to a legal type >> (e.g., v7i8 to v8i8) instead of scalarzing the vector. This patch >> implements that. The default implementation is to widen if there >> is a >> legal type that is wider than the illegal type and the vector has >> more >> elements. Any target can override the default logic and implement it >> own policy. Please let me know if you have any comments or concerns. >> >> Thanks, >> -- Mon Ping >> > > -- > Stefanus Du Toit > RapidMind Inc. > phone: +1 519 885 5455 x116 -- fax: +1 519 885 1463 > > > From stefanus.dutoit at rapidmind.com Mon Oct 20 13:26:44 2008 From: stefanus.dutoit at rapidmind.com (Stefanus Du Toit) Date: Mon, 20 Oct 2008 14:26:44 -0400 Subject: [llvm-commits] vector widening patch In-Reply-To: <332607FD-6A93-4662-9038-F3210C4E1DFB@apple.com> References: <5101CC65-BB18-4133-8A1A-1D852CD8EECA@rapidmind.com> <332607FD-6A93-4662-9038-F3210C4E1DFB@apple.com> Message-ID: Hi Mon Ping, On 20-Oct-08, at 1:46 PM, Mon Ping Wang wrote: > No numbers to back that choice up. The thinking was that instead of > worrying about packing and unpacking a two element vector that it > might be cheaper to treat it as two scalar computation as a general > rule. For x86 with SSE2+, I have no problem saying that we should > always widen. With MMX, it is less clear. Do you think that in > general, it always make sense to widen? It probably depends on your architecture. In our experience, using MMX when you have SSE2 is not productive, and so we actually just turn off anything that legalizes MMX operations and types. The one microarchitecture where you might benefit from MMX is pre-Barcelona Opteron, which supports SSE2 but performs and SSE operation as two 64 bit operations. But in this case, 2-vectors would be legal anyways. I would think that for most ISAs, if a 2-vector is not legal, it probably makes sense to widen. Chances are the two scalars are already sitting in a vector register, and thus scalarizing will actually involve more packing and unpacking. A client could always scalarize in the frontend (which is much easier than widening in the frontend!) if they really want to -- if they're using 2-vectors, that's probably a good indication they want their data in vector registers (I know that's the case for us). [*] But others might have different experiences. Please speak up! -- Stefanus Du Toit RapidMind Inc. phone: +1 519 885 5455 x116 -- fax: +1 519 885 1463 [*] We have seen cases where scalarizing is a benefit, but in those cases the values where typically being packed in the IR (rather than loaded as a vector), and usually related to induction variables in loops, where scalarizing can enable other optimizations. I would be interested in an optimization pass that recognized such cases and scalarized them, but this would have to happen at the IR level. From alenhar2 at cs.uiuc.edu Mon Oct 20 14:37:55 2008 From: alenhar2 at cs.uiuc.edu (Andrew Lenharth) Date: Mon, 20 Oct 2008 19:37:55 -0000 Subject: [llvm-commits] [poolalloc] r57842 - in /poolalloc/trunk: include/dsa/DSNode.h lib/DSA/BottomUpClosure.cpp lib/DSA/DataStructure.cpp lib/DSA/Printer.cpp Message-ID: <200810201937.m9KJbtIP031993@zion.cs.uiuc.edu> Author: alenhar2 Date: Mon Oct 20 14:37:54 2008 New Revision: 57842 URL: http://llvm.org/viewvc/llvm-project?rev=57842&view=rev Log: remove direct access to Globals List Modified: poolalloc/trunk/include/dsa/DSNode.h poolalloc/trunk/lib/DSA/BottomUpClosure.cpp poolalloc/trunk/lib/DSA/DataStructure.cpp poolalloc/trunk/lib/DSA/Printer.cpp Modified: poolalloc/trunk/include/dsa/DSNode.h URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/include/dsa/DSNode.h?rev=57842&r1=57841&r2=57842&view=diff ============================================================================== --- poolalloc/trunk/include/dsa/DSNode.h (original) +++ poolalloc/trunk/include/dsa/DSNode.h Mon Oct 20 14:37:54 2008 @@ -297,13 +297,11 @@ /// globals list. void removeGlobal(const GlobalValue *GV); - void mergeGlobals(const std::vector &RHS); + void mergeGlobals(const DSNode& RHS); void clearGlobals() { Globals.clear(); } - /// getGlobalsList - Return the set of global leaders that are represented by - /// this node. Note that globals that are in this equivalence class but are - /// not leaders are not returned: for that, use addFullGlobalsList(). - const std::vector &getGlobalsList() const { return Globals; } + bool isEmptyGlobals() const { return Globals.empty(); } + unsigned numGlobals() const { return Globals.size(); } /// addFullGlobalsList - Compute the full set of global values that are /// represented by this node. Unlike getGlobalsList(), this requires fair Modified: poolalloc/trunk/lib/DSA/BottomUpClosure.cpp URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/DSA/BottomUpClosure.cpp?rev=57842&r1=57841&r2=57842&view=diff ============================================================================== --- poolalloc/trunk/lib/DSA/BottomUpClosure.cpp (original) +++ poolalloc/trunk/lib/DSA/BottomUpClosure.cpp Mon Oct 20 14:37:54 2008 @@ -372,6 +372,8 @@ } void BUDataStructures::calculateGraph(DSGraph* Graph) { + DEBUG(Graph->AssertGraphOK(); Graph->getGlobalsGraph()->AssertGraphOK()); + // If this graph contains the main function, clone the globals graph into this // graph before we inline callees and other fun stuff. bool ContainsMain = false; @@ -408,7 +410,6 @@ } } - // Move our call site list into TempFCs so that inline call sites go into the // new call site list and doesn't invalidate our iterators! std::list TempFCs; @@ -417,6 +418,8 @@ std::vector CalledFuncs; while (!TempFCs.empty()) { + DEBUG(Graph->AssertGraphOK(); Graph->getGlobalsGraph()->AssertGraphOK()); + DSCallSite &CS = *TempFCs.begin(); Instruction *TheCall = CS.getCallSite().getInstruction(); @@ -449,6 +452,7 @@ // Get the data structure graph for the called function. GI = getDSGraph(*Callee); // Graph to inline + DEBUG(GI->AssertGraphOK(); GI->getGlobalsGraph()->AssertGraphOK()); DOUT << " Inlining graph for " << Callee->getName() << "[" << GI->getGraphSize() << "+" << GI->getAuxFunctionCalls().size() << "] into '" @@ -539,6 +543,7 @@ ++NumInlines; } } + DEBUG(Graph->AssertGraphOK(); Graph->getGlobalsGraph()->AssertGraphOK()); if (!isComplete) AuxCallsList.push_front(CS); TempFCs.erase(TempFCs.begin()); Modified: poolalloc/trunk/lib/DSA/DataStructure.cpp URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/DSA/DataStructure.cpp?rev=57842&r1=57841&r2=57842&view=diff ============================================================================== --- poolalloc/trunk/lib/DSA/DataStructure.cpp (original) +++ poolalloc/trunk/lib/DSA/DataStructure.cpp Mon Oct 20 14:37:54 2008 @@ -802,11 +802,11 @@ } -void DSNode::mergeGlobals(const std::vector &RHS) { +void DSNode::mergeGlobals(const DSNode &RHS) { std::vector Temp; std::back_insert_iterator< std::vector > back_it (Temp); std::set_union(Globals.begin(), Globals.end(), - RHS.begin(), RHS.end(), + RHS.Globals.begin(), RHS.Globals.end(), back_it); Globals.swap(Temp); } @@ -961,7 +961,7 @@ // Merge the globals list... if (!N->Globals.empty()) { - CurNodeH.getNode()->mergeGlobals(N->Globals); + CurNodeH.getNode()->mergeGlobals(*N); // Delete the globals from the old node... N->Globals.clear(); @@ -1106,7 +1106,7 @@ Dest->getNodeForValue(GV).mergeWith(DSNodeHandle(DestGNH.getNode(), DestGNH.getOffset()+SrcGNH.getOffset())); } - NH.getNode()->mergeGlobals(SN->getGlobalsList()); + NH.getNode()->mergeGlobals(*SN); return DSNodeHandle(NH.getNode(), NH.getOffset()+SrcNH.getOffset()); } @@ -1182,7 +1182,7 @@ // scalar map with the correct offset. if (SN->globals_begin() != SN->globals_end()) { // Update the globals in the destination node itself. - DN->mergeGlobals(SN->getGlobalsList()); + DN->mergeGlobals(*SN); // Update the scalar map for the graph we are merging the source node // into. @@ -1195,7 +1195,7 @@ Dest->getNodeForValue(GV).mergeWith(DSNodeHandle(DestGNH.getNode(), DestGNH.getOffset()+SrcGNH.getOffset())); } - NH.getNode()->mergeGlobals(SN->getGlobalsList()); + NH.getNode()->mergeGlobals(*SN); } } else { // We cannot handle this case without allocating a temporary node. Fall @@ -2030,7 +2030,7 @@ // If the Callee is a useless edge, this must be an unreachable call site, // eliminate it. if (Callee->getNumReferrers() == 1 && Callee->isCompleteNode() && - Callee->getGlobalsList().empty()) { // No useful info? + Callee->isEmptyGlobals()) { // No useful info? DOUT << "WARNING: Useless call site found.\n"; Calls.erase(OldIt); ++NumDeleted; @@ -2214,20 +2214,21 @@ // have all of these properties and still have incoming edges, due to the // scalar map, so we check those now. // - if (Node.getNumReferrers() == Node.getGlobalsList().size()) { - const std::vector &Globals = Node.getGlobalsList(); + if (Node.getNumReferrers() == Node.numGlobals()) { // Loop through and make sure all of the globals are referring directly // to the node... - for (unsigned j = 0, e = Globals.size(); j != e; ++j) { - DSNode *N = getNodeForValue(Globals[j]).getNode(); + for (DSNode::globals_iterator j = Node.globals_begin(), e = Node.globals_end(); + j != e; ++j) { + DSNode *N = getNodeForValue(*j).getNode(); assert(N == &Node && "ScalarMap doesn't match globals list!"); } // Make sure NumReferrers still agrees, if so, the node is truly dead. - if (Node.getNumReferrers() == Globals.size()) { - for (unsigned j = 0, e = Globals.size(); j != e; ++j) - ScalarMap.erase(Globals[j]); + if (Node.getNumReferrers() == Node.numGlobals()) { + for (DSNode::globals_iterator j = Node.globals_begin(), e = Node.globals_end(); + j != e; ++j) + ScalarMap.erase(*j); Node.makeNodeDead(); ++NumTrivialGlobalDNE; } @@ -2779,7 +2780,7 @@ for (DSGraph::node_iterator I = GlobalsGraph->node_begin(), E = GlobalsGraph->node_end(); I != E; ++I) { - if (I->getGlobalsList().size() <= 1) continue; + if (I->numGlobals() <= 1) continue; // First, build up the equivalence set for this block of globals. DSNode::globals_iterator i = I->globals_begin(); Modified: poolalloc/trunk/lib/DSA/Printer.cpp URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/DSA/Printer.cpp?rev=57842&r1=57841&r2=57842&view=diff ============================================================================== --- poolalloc/trunk/lib/DSA/Printer.cpp (original) +++ poolalloc/trunk/lib/DSA/Printer.cpp Mon Oct 20 14:37:54 2008 @@ -87,13 +87,14 @@ EquivalenceClasses *GlobalECs = 0; if (G) GlobalECs = &G->getGlobalECs(); - for (unsigned i = 0, e = N->getGlobalsList().size(); i != e; ++i) { - WriteAsOperand(OS, N->getGlobalsList()[i], false, M); + for (DSNode::globals_iterator i = N->globals_begin(), e = N->globals_end(); + i != e; ++i) { + WriteAsOperand(OS, *i, false, M); // Figure out how many globals are equivalent to this one. if (GlobalECs) { EquivalenceClasses::iterator I = - GlobalECs->findValue(N->getGlobalsList()[i]); + GlobalECs->findValue(*i); if (I != GlobalECs->end()) { unsigned NumMembers = std::distance(GlobalECs->member_begin(I), GlobalECs->member_end()); From evan.cheng at apple.com Mon Oct 20 15:02:17 2008 From: evan.cheng at apple.com (Evan Cheng) Date: Mon, 20 Oct 2008 20:02:17 -0000 Subject: [llvm-commits] [llvm] r57843 - /llvm/trunk/include/llvm/Target/TargetRegisterInfo.h Message-ID: <200810202002.m9KK2IPW000409@zion.cs.uiuc.edu> Author: evancheng Date: Mon Oct 20 15:02:17 2008 New Revision: 57843 URL: http://llvm.org/viewvc/llvm-project?rev=57843&view=rev Log: This forward declaration is unnecessary. Modified: llvm/trunk/include/llvm/Target/TargetRegisterInfo.h Modified: llvm/trunk/include/llvm/Target/TargetRegisterInfo.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/TargetRegisterInfo.h?rev=57843&r1=57842&r2=57843&view=diff ============================================================================== --- llvm/trunk/include/llvm/Target/TargetRegisterInfo.h (original) +++ llvm/trunk/include/llvm/Target/TargetRegisterInfo.h Mon Oct 20 15:02:17 2008 @@ -31,7 +31,6 @@ class RegScavenger; class SDNode; class SelectionDAG; -class TargetRegisterClass; class Type; /// TargetRegisterDesc - This record contains all of the information known about From evan.cheng at apple.com Mon Oct 20 15:03:30 2008 From: evan.cheng at apple.com (Evan Cheng) Date: Mon, 20 Oct 2008 20:03:30 -0000 Subject: [llvm-commits] [llvm] r57844 - in /llvm/trunk: include/llvm/CodeGen/MachineRegisterInfo.h lib/CodeGen/MachineRegisterInfo.cpp Message-ID: <200810202003.m9KK3U5f000470@zion.cs.uiuc.edu> Author: evancheng Date: Mon Oct 20 15:03:28 2008 New Revision: 57844 URL: http://llvm.org/viewvc/llvm-project?rev=57844&view=rev Log: Add a register class -> virtual registers map. Modified: llvm/trunk/include/llvm/CodeGen/MachineRegisterInfo.h llvm/trunk/lib/CodeGen/MachineRegisterInfo.cpp Modified: llvm/trunk/include/llvm/CodeGen/MachineRegisterInfo.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/MachineRegisterInfo.h?rev=57844&r1=57843&r2=57844&view=diff ============================================================================== --- llvm/trunk/include/llvm/CodeGen/MachineRegisterInfo.h (original) +++ llvm/trunk/include/llvm/CodeGen/MachineRegisterInfo.h Mon Oct 20 15:03:28 2008 @@ -32,6 +32,11 @@ /// Each element in this list contains the register class of the vreg and the /// start of the use/def list for the register. std::vector > VRegInfo; + + /// RegClassVRegMap - This vector acts as a map from TargetRegisterClass to + /// virtual registers. For each target register class, it keeps a list of + /// virtual registers belonging to the class. + std::vector > RegClass2VRegMap; /// PhysRegUseDefLists - This is an array of the head of the use/def list for /// physical registers. @@ -130,6 +135,7 @@ //===--------------------------------------------------------------------===// /// getRegClass - Return the register class of the specified virtual register. + /// const TargetRegisterClass *getRegClass(unsigned Reg) const { Reg -= TargetRegisterInfo::FirstVirtualRegister; assert(Reg < VRegInfo.size() && "Invalid vreg!"); @@ -137,10 +143,22 @@ } /// setRegClass - Set the register class of the specified virtual register. + /// void setRegClass(unsigned Reg, const TargetRegisterClass *RC) { + unsigned VR = Reg; Reg -= TargetRegisterInfo::FirstVirtualRegister; assert(Reg < VRegInfo.size() && "Invalid vreg!"); + const TargetRegisterClass *OldRC = VRegInfo[Reg].first; VRegInfo[Reg].first = RC; + + // Remove from old register class's vregs list. This may be slow but + // fortunately this operation is rarely needed. + std::vector &VRegs = RegClass2VRegMap[OldRC->getID()]; + std::vector::iterator I=std::find(VRegs.begin(), VRegs.end(), VR); + VRegs.erase(I); + + // Add to new register class's vregs list. + RegClass2VRegMap[RC->getID()].push_back(VR); } /// createVirtualRegister - Create and return a new virtual register in the @@ -151,13 +169,13 @@ // Add a reg, but keep track of whether the vector reallocated or not. void *ArrayBase = VRegInfo.empty() ? 0 : &VRegInfo[0]; VRegInfo.push_back(std::make_pair(RegClass, (MachineOperand*)0)); - - if (&VRegInfo[0] == ArrayBase || VRegInfo.size() == 1) - return getLastVirtReg(); - // Otherwise, the vector reallocated, handle this now. - HandleVRegListReallocation(); - return getLastVirtReg(); + if (!((&VRegInfo[0] == ArrayBase || VRegInfo.size() == 1))) + // The vector reallocated, handle this now. + HandleVRegListReallocation(); + unsigned VR = getLastVirtReg(); + RegClass2VRegMap[RegClass->getID()].push_back(VR); + return VR; } /// getLastVirtReg - Return the highest currently assigned virtual register. @@ -165,7 +183,12 @@ unsigned getLastVirtReg() const { return (unsigned)VRegInfo.size()+TargetRegisterInfo::FirstVirtualRegister-1; } - + + /// getRegClassVirtRegs - Return the list of virtual registers of the given + /// target register class. + std::vector &getRegClassVirtRegs(const TargetRegisterClass *RC) { + return RegClass2VRegMap[RC->getID()]; + } //===--------------------------------------------------------------------===// // Physical Register Use Info Modified: llvm/trunk/lib/CodeGen/MachineRegisterInfo.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/MachineRegisterInfo.cpp?rev=57844&r1=57843&r2=57844&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/MachineRegisterInfo.cpp (original) +++ llvm/trunk/lib/CodeGen/MachineRegisterInfo.cpp Mon Oct 20 15:03:28 2008 @@ -16,6 +16,7 @@ MachineRegisterInfo::MachineRegisterInfo(const TargetRegisterInfo &TRI) { VRegInfo.reserve(256); + RegClass2VRegMap.resize(TRI.getNumRegClasses()+1); // RC ID starts at 1. UsedPhysRegs.resize(TRI.getNumRegs()); // Create the physreg use/def lists. From clattner at apple.com Mon Oct 20 16:15:24 2008 From: clattner at apple.com (Chris Lattner) Date: Mon, 20 Oct 2008 14:15:24 -0700 Subject: [llvm-commits] [test-suite] r57768 - /test-suite/trunk/MultiSource/Applications/lua/Makefile In-Reply-To: References: <200810181821.m9IILX4H011913@zion.cs.uiuc.edu> Message-ID: <661B7D79-2097-4197-BD7B-3BE5788DC69E@apple.com> On Oct 20, 2008, at 10:38 AM, Tanya Lattner wrote: > Ok for 2.4? Yes. I'd also be fine with removing lua for 2.4 if you prefer that, -Chris From gohman at apple.com Mon Oct 20 16:30:14 2008 From: gohman at apple.com (Dan Gohman) Date: Mon, 20 Oct 2008 21:30:14 -0000 Subject: [llvm-commits] [llvm] r57845 - /llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp Message-ID: <200810202130.m9KLUEnk003845@zion.cs.uiuc.edu> Author: djg Date: Mon Oct 20 16:30:12 2008 New Revision: 57845 URL: http://llvm.org/viewvc/llvm-project?rev=57845&view=rev Log: Fast-isel no longer an experiment. Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp?rev=57845&r1=57844&r2=57845&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp Mon Oct 20 16:30:12 2008 @@ -57,7 +57,7 @@ EnableLegalizeTypes("enable-legalize-types", cl::Hidden); static cl::opt EnableFastISelVerbose("fast-isel-verbose", cl::Hidden, - cl::desc("Enable verbose messages in the experimental \"fast\" " + cl::desc("Enable verbose messages in the \"fast\" " "instruction selector")); static cl::opt EnableFastISelAbort("fast-isel-abort", cl::Hidden, From grosbach at apple.com Mon Oct 20 16:39:24 2008 From: grosbach at apple.com (Jim Grosbach) Date: Mon, 20 Oct 2008 21:39:24 -0000 Subject: [llvm-commits] [llvm] r57846 - in /llvm/trunk: include/llvm/System/Memory.h lib/System/Unix/Memory.inc lib/System/Win32/Memory.inc lib/Target/ARM/ARMJITInfo.cpp Message-ID: <200810202139.m9KLdOJK004141@zion.cs.uiuc.edu> Author: grosbach Date: Mon Oct 20 16:39:23 2008 New Revision: 57846 URL: http://llvm.org/viewvc/llvm-project?rev=57846&view=rev Log: Update the stub and callback code to handle lazy compilation. The stub is re-written by the callback to branch directly to the compiled code in future invocations. Added back in range-based memory permission functions for the updating of the stub on Darwin. Modified: llvm/trunk/include/llvm/System/Memory.h llvm/trunk/lib/System/Unix/Memory.inc llvm/trunk/lib/System/Win32/Memory.inc llvm/trunk/lib/Target/ARM/ARMJITInfo.cpp Modified: llvm/trunk/include/llvm/System/Memory.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/System/Memory.h?rev=57846&r1=57845&r2=57846&view=diff ============================================================================== --- llvm/trunk/include/llvm/System/Memory.h (original) +++ llvm/trunk/include/llvm/System/Memory.h Mon Oct 20 16:39:23 2008 @@ -79,6 +79,14 @@ /// to mark a block of code as RW since the protections are on page /// boundaries, and the JIT internal allocations are not page aligned. static bool setWritable (MemoryBlock &M, std::string *ErrMsg = 0); + + /// setRangeExecutable - Mark the page containing a range of addresses + /// as executable. + static bool setRangeExecutable(const void *Addr, size_t Size); + + /// setRangeWritable - Mark the page containing a range of addresses + /// as writable. + static bool setRangeWritable(const void *Addr, size_t Size); }; } } Modified: llvm/trunk/lib/System/Unix/Memory.inc URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/System/Unix/Memory.inc?rev=57846&r1=57845&r2=57846&view=diff ============================================================================== --- llvm/trunk/lib/System/Unix/Memory.inc (original) +++ llvm/trunk/lib/System/Unix/Memory.inc Mon Oct 20 16:39:23 2008 @@ -127,3 +127,24 @@ #endif } +bool llvm::sys::Memory::setRangeWritable(const void *Addr, size_t Size) { +#if defined(__APPLE__) && defined(__arm__) + kern_return_t kr = vm_protect(mach_task_self(), (vm_address_t)Addr, + (vm_size_t)Size, 0, + VM_PROT_READ | VM_PROT_WRITE); + return KERN_SUCCESS == kr; +#else + return true; +#endif +} + +bool llvm::sys::Memory::setRangeExecutable(const void *Addr, size_t Size) { +#if defined(__APPLE__) && defined(__arm__) + kern_return_t kr = vm_protect(mach_task_self(), (vm_address_t)Addr, + (vm_size_t)Size, 0, + VM_PROT_READ | VM_PROT_EXECUTE | VM_PROT_COPY); + return KERN_SUCCESS == kr; +#else + return true; +#endif +} Modified: llvm/trunk/lib/System/Win32/Memory.inc URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/System/Win32/Memory.inc?rev=57846&r1=57845&r2=57846&view=diff ============================================================================== --- llvm/trunk/lib/System/Win32/Memory.inc (original) +++ llvm/trunk/lib/System/Win32/Memory.inc Mon Oct 20 16:39:23 2008 @@ -53,13 +53,20 @@ return false; } -bool Memory::setWritable (MemoryBlock &M, std::string *ErrMsg) { +bool Memory::setWritable(MemoryBlock &M, std::string *ErrMsg) { return true; } -bool Memory::setExecutable (MemoryBlock &M, std::string *ErrMsg) { +bool Memory::setExecutable(MemoryBlock &M, std::string *ErrMsg) { return false; } +bool Memory::setRangeWritable(const void *Addr, size_t Size) { + return true; } +bool Memory::setRangeExecutable(const void *Addr, size_t Size) { + return false; +} + +} Modified: llvm/trunk/lib/Target/ARM/ARMJITInfo.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMJITInfo.cpp?rev=57846&r1=57845&r2=57846&view=diff ============================================================================== --- llvm/trunk/lib/Target/ARM/ARMJITInfo.cpp (original) +++ llvm/trunk/lib/Target/ARM/ARMJITInfo.cpp Mon Oct 20 16:39:23 2008 @@ -18,6 +18,8 @@ #include "llvm/Function.h" #include "llvm/CodeGen/MachineCodeEmitter.h" #include "llvm/Config/alloca.h" +#include "llvm/Support/Streams.h" +#include "llvm/System/Memory.h" #include using namespace llvm; @@ -38,9 +40,10 @@ #define ASMPREFIX GETASMPREFIX(__USER_LABEL_PREFIX__) // CompilationCallback stub - We can't use a C function with inline assembly in -// it, because we the prolog/epilog inserted by GCC won't work for us. Instead, -// write our own wrapper, which does things our way, so we have complete control -// over register saving and restoring. +// it, because we the prolog/epilog inserted by GCC won't work for us (we need +// to preserve more context and manipulate the stack directly). Instead, +// write our own wrapper, which does things our way, so we have complete +// control over register saving and restoring. extern "C" { #if defined(__arm__) void ARMCompilationCallback(void); @@ -49,33 +52,42 @@ ".align 2\n" ".globl " ASMPREFIX "ARMCompilationCallback\n" ASMPREFIX "ARMCompilationCallback:\n" - // save main registers -#if defined(__APPLE__) - "stmfd sp!, {r4, r5, r6, r7, lr}\n" - "mov r0, r7\n" // stub's frame - "stmfd sp!, {r8, r10, r11}\n" -#else - "mov ip, sp\n" - "stmfd sp!, {fp, ip, lr, pc}\n" - "sub fp, ip, #4\n" -#endif // __APPLE__ - // arguments to Compilation Callback - // r0 - our lr (address of the call instruction in stub plus 4) - // r1 - stub's lr (address of instruction that called the stub plus 4) -#if defined(__APPLE__) - "mov r0, r7\n" // stub's frame -#else - "mov r0, fp\n" // stub's frame -#endif // __APPLE__ - "mov r1, lr\n" // stub's lr - "bl " ASMPREFIX "ARMCompilationCallbackC\n" - // restore main registers -#if defined(__APPLE__) - "ldmfd sp!, {r8, r10, r11}\n" - "ldmfd sp!, {r4, r5, r6, r7, pc}\n" -#else - "ldmfd sp, {fp, sp, pc}\n" -#endif // __APPLE__ + // Save caller saved registers since they may contain stuff + // for the real target function right now. We have to act as if this + // whole compilation callback doesn't exist as far as the caller is + // concerned, so we can't just preserve the callee saved regs. + "push {r0, r1, r2, r3, lr}\n" + // The LR contains the address of the stub function on entry. + // pass it as the argument to the C part of the callback + "mov r0, lr\n" + "sub sp, sp, #4\n" + // Call the C portion of the callback + "bl " ASMPREFIX "ARMCompilationCallbackC\n" + "add sp, sp, #4\n" + // Restoring the LR to the return address of the function that invoked + // the stub and de-allocating the stack space for it requires us to + // swap the two saved LR values on the stack, as they're backwards + // for what we need since the pop instruction has a pre-determined + // order for the registers. + // +--------+ + // 0 | LR | Original return address + // +--------+ + // 1 | LR | Stub address (start of stub) + // 2-5 | R3..R0 | Saved registers (we need to preserve all regs) + // +--------+ + // + // We need to exchange the values in slots 0 and 1 so we can + // return to the address in slot 1 with the address in slot 0 + // restored to the LR. + "ldr r0, [sp,#20]\n" + "ldr r1, [sp,#16]\n" + "str r1, [sp,#20]\n" + "str r0, [sp,#16]\n" + // Return to the (newly modified) stub to invoke the real function. + // The above twiddling of the saved return addresses allows us to + // deallocate everything, including the LR the stub saved, all in one + // pop instruction. + "pop {r0, r1, r2, r3, lr, pc}\n" ); #else // Not an ARM host void ARMCompilationCallback() { @@ -85,31 +97,37 @@ #endif } -/// ARMCompilationCallbackC - This is the target-specific function invoked by the -/// function stub when we did not know the real target of a call. This function -/// must locate the start of the stub or call site and pass it into the JIT -/// compiler function. -extern "C" void ARMCompilationCallbackC(intptr_t *StackPtr, intptr_t RetAddr) { - intptr_t *RetAddrLoc = &StackPtr[-1]; - - assert(*RetAddrLoc == RetAddr && - "Could not find return address on the stack!"); -#if 0 - DOUT << "In callback! Addr=" << (void*)RetAddr - << " FP=" << (void*)StackPtr - << ": Resolving call to function: " - << TheVM->getFunctionReferencedName((void*)RetAddr) << "\n"; -#endif - intptr_t Addr = RetAddr - 4; - - intptr_t NewVal = (intptr_t)JITCompilerFunction((void*)Addr); +/// ARMCompilationCallbackC - This is the target-specific function invoked +/// by the function stub when we did not know the real target of a call. +/// This function must locate the start of the stub or call site and pass +/// it into the JIT compiler function. +extern "C" void ARMCompilationCallbackC(intptr_t StubAddr) { + // Get the address of the compiled code for this function. + intptr_t NewVal = (intptr_t)JITCompilerFunction((void*)StubAddr); // Rewrite the call target... so that we don't end up here every time we - // execute the call. - *(intptr_t *)Addr = NewVal; - - // Change the return address to reexecute the branch and link instruction... - *RetAddrLoc -= 12; + // execute the call. We're replacing the first two instructions of the + // stub with: + // ldr pc, [pc,#-4] + // +#if defined(__APPLE__) + bool ok = sys::Memory::setRangeWritable ((void*)StubAddr, 8); + if (!ok) + { + cerr << "ERROR: Unable to mark stub writable\n"; + abort(); + } +#endif + *(intptr_t *)StubAddr = 0xe51ff004; + *(intptr_t *)(StubAddr+4) = NewVal; +#if defined(__APPLE__) + ok = sys::Memory::setRangeExecutable ((void*)StubAddr, 8); + if (!ok) + { + cerr << "ERROR: Unable to mark stub executable\n"; + abort(); + } +#endif } TargetJITInfo::LazyResolverFn @@ -127,17 +145,27 @@ // branch to the corresponding function addr // the stub is 8-byte size and 4-aligned MCE.startFunctionStub(F, 8, 4); - MCE.emitWordLE(0xE51FF004); // LDR PC, [PC,#-4] + MCE.emitWordLE(0xe51ff004); // LDR PC, [PC,#-4] MCE.emitWordLE(addr); // addr of function } else { - // branch and link to the corresponding function addr - // the stub is 20-byte size and 4-aligned - MCE.startFunctionStub(F, 20, 4); - MCE.emitWordLE(0xE92D4800); // STMFD SP!, [R11, LR] - MCE.emitWordLE(0xE28FE004); // ADD LR, PC, #4 - MCE.emitWordLE(0xE51FF004); // LDR PC, [PC,#-4] - MCE.emitWordLE(addr); // addr of function - MCE.emitWordLE(0xE8BD8800); // LDMFD SP!, [R11, PC] + // The compilation callback will overwrite the first two words of this + // stub with indirect branch instructions targeting the compiled code. + // This stub sets the return address to restart the stub, so that + // the new branch will be invoked when we come back. + // + // branch and link to the compilation callback. + // the stub is 16-byte size and 4-byte aligned. + MCE.startFunctionStub(F, 16, 4); + // Save LR so the callback can determine which stub called it. + // The compilation callback is responsible for popping this prior + // to returning. + MCE.emitWordLE(0xe92d4000); // PUSH {lr} + // Set the return address to go back to the start of this stub + MCE.emitWordLE(0xe24fe00c); // SUB LR, PC, #12 + // Invoke the compilation callback + MCE.emitWordLE(0xe51ff004); // LDR PC, [PC,#-4] + // The address of the compilation callback + MCE.emitWordLE((intptr_t)ARMCompilationCallback); } return MCE.finishFunctionStub(F); From evan.cheng at apple.com Mon Oct 20 16:44:59 2008 From: evan.cheng at apple.com (Evan Cheng) Date: Mon, 20 Oct 2008 21:44:59 -0000 Subject: [llvm-commits] [llvm] r57847 - in /llvm/trunk: include/llvm/CodeGen/Passes.h lib/CodeGen/PreAllocSplitting.cpp Message-ID: <200810202144.m9KLixuI004320@zion.cs.uiuc.edu> Author: evancheng Date: Mon Oct 20 16:44:59 2008 New Revision: 57847 URL: http://llvm.org/viewvc/llvm-project?rev=57847&view=rev Log: Add skeleton for the pre-register allocation live interval splitting pass. Added: llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp Modified: llvm/trunk/include/llvm/CodeGen/Passes.h Modified: llvm/trunk/include/llvm/CodeGen/Passes.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/Passes.h?rev=57847&r1=57846&r2=57847&view=diff ============================================================================== --- llvm/trunk/include/llvm/CodeGen/Passes.h (original) +++ llvm/trunk/include/llvm/CodeGen/Passes.h Mon Oct 20 16:44:59 2008 @@ -61,6 +61,8 @@ /// This pass is still in development extern const PassInfo *const StrongPHIEliminationID; + extern const PassInfo *const PreAllocSplittingID; + /// SimpleRegisterCoalescing pass. Aggressively coalesces every register /// copy it can. /// Added: llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp?rev=57847&view=auto ============================================================================== --- llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp (added) +++ llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp Mon Oct 20 16:44:59 2008 @@ -0,0 +1,81 @@ +//===-- PreAllocSplitting.cpp - Pre-allocation Interval Spltting Pass. ----===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// +// +// This file implements the machine instruction level pre-register allocation +// live interval splitting pass. It finds live interval barriers, i.e. +// instructions which will kill all physical registers in certain register +// classes, and split all live intervals which cross the barrier. +// +//===----------------------------------------------------------------------===// + +#define DEBUG_TYPE "pre-alloc-split" +#include "llvm/CodeGen/LiveIntervalAnalysis.h" +#include "llvm/CodeGen/MachineFunctionPass.h" +#include "llvm/CodeGen/MachineLoopInfo.h" +#include "llvm/CodeGen/MachineRegisterInfo.h" +#include "llvm/CodeGen/Passes.h" +#include "llvm/CodeGen/RegisterCoalescer.h" +#include "llvm/Target/TargetMachine.h" +#include "llvm/Target/TargetOptions.h" +#include "llvm/Target/TargetRegisterInfo.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/PostOrderIterator.h" +#include "llvm/ADT/SmallPtrSet.h" +using namespace llvm; + +namespace { + class VISIBILITY_HIDDEN PreAllocSplitting : public MachineFunctionPass { + // ProcessedBarriers - Register live interval barriers that have already + // been processed. + SmallPtrSet ProcessedBarriers; + + // ActiveBarriers - Register live interval barriers that are currently + // being processed. + SmallSet ActiveBarriers; + public: + static char ID; + PreAllocSplitting() : MachineFunctionPass(&ID) {} + + virtual bool runOnMachineFunction(MachineFunction &MF); + + virtual void getAnalysisUsage(AnalysisUsage &AU) const { + AU.addRequired(); + AU.addPreserved(); + AU.addPreserved(); + AU.addPreserved(); + if (StrongPHIElim) + AU.addPreservedID(StrongPHIEliminationID); + else + AU.addPreservedID(PHIEliminationID); + AU.addPreservedID(TwoAddressInstructionPassID); + MachineFunctionPass::getAnalysisUsage(AU); + } + + virtual void releaseMemory() { + ProcessedBarriers.clear(); + ActiveBarriers.clear(); + } + + virtual const char *getPassName() const { + return "Pre-Register Allocaton Live Interval Splitting"; + } + }; +} // end anonymous namespace + +char PreAllocSplitting::ID = 0; + +static RegisterPass +X("pre-alloc-splitting", "Pre-Register Allocation Live Interval Splitting"); + +const PassInfo *const llvm::PreAllocSplittingID = &X; + +bool PreAllocSplitting::runOnMachineFunction(MachineFunction &MF) { + return false; +} From alenhar2 at cs.uiuc.edu Mon Oct 20 17:40:33 2008 From: alenhar2 at cs.uiuc.edu (Andrew Lenharth) Date: Mon, 20 Oct 2008 22:40:33 -0000 Subject: [llvm-commits] [poolalloc] r57848 - in /poolalloc/trunk/lib/DSA: BottomUpClosure.cpp CompleteBottomUp.cpp DataStructure.cpp Local.cpp Message-ID: <200810202240.m9KMeYeM006700@zion.cs.uiuc.edu> Author: alenhar2 Date: Mon Oct 20 17:40:32 2008 New Revision: 57848 URL: http://llvm.org/viewvc/llvm-project?rev=57848&view=rev Log: Make simpler and more correct Modified: poolalloc/trunk/lib/DSA/BottomUpClosure.cpp poolalloc/trunk/lib/DSA/CompleteBottomUp.cpp poolalloc/trunk/lib/DSA/DataStructure.cpp poolalloc/trunk/lib/DSA/Local.cpp Modified: poolalloc/trunk/lib/DSA/BottomUpClosure.cpp URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/DSA/BottomUpClosure.cpp?rev=57848&r1=57847&r2=57848&view=diff ============================================================================== --- poolalloc/trunk/lib/DSA/BottomUpClosure.cpp (original) +++ poolalloc/trunk/lib/DSA/BottomUpClosure.cpp Mon Oct 20 17:40:32 2008 @@ -462,6 +462,7 @@ DSGraph::StripAllocaBit|DSGraph::DontCloneCallNodes| (isComplete?0:DSGraph::DontCloneAuxCallNodes)); ++NumInlines; + DEBUG(Graph->AssertGraphOK();); } else if (CalledFuncs.size() > 1) { DEBUG(std::cerr << "In Fns: " << Graph->getFunctionNames() << "\n"); DEBUG(std::cerr << " calls " << CalledFuncs.size() @@ -543,7 +544,8 @@ ++NumInlines; } } - DEBUG(Graph->AssertGraphOK(); Graph->getGlobalsGraph()->AssertGraphOK()); + DEBUG(Graph->AssertGraphOK();); + DEBUG(Graph->getGlobalsGraph()->AssertGraphOK()); if (!isComplete) AuxCallsList.push_front(CS); TempFCs.erase(TempFCs.begin()); Modified: poolalloc/trunk/lib/DSA/CompleteBottomUp.cpp URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/DSA/CompleteBottomUp.cpp?rev=57848&r1=57847&r2=57848&view=diff ============================================================================== --- poolalloc/trunk/lib/DSA/CompleteBottomUp.cpp (original) +++ poolalloc/trunk/lib/DSA/CompleteBottomUp.cpp Mon Oct 20 17:40:32 2008 @@ -35,6 +35,7 @@ init(&getAnalysis(), false, true, false, true); buildIndirectFunctionSets(M); + formGlobalECs(); return runOnModuleInternal(M); } @@ -50,12 +51,13 @@ for (std::vector::iterator ii = keys.begin(), ee = keys.end(); ii != ee; ++ii) { if (*ii) { - callee_iterator base = callee_begin(*ii); - - for (callee_iterator csi = callee_begin(*ii), cse = callee_end(*ii); - csi != cse; ++csi) { - GlobalECs.unionSets(*base, *csi); - GlobalsGraph->getNodeForValue(*base).mergeWith(GlobalsGraph->getNodeForValue(*csi)); + callee_iterator csi = callee_begin(*ii), cse = callee_end(*ii); + if (csi != cse) ++csi; + DSGraph* G = getOrCreateGraph((*ii)->getParent()->getParent()); + for ( ; csi != cse; ++csi) { + G->getNodeForValue(*csi).mergeWith(G->getNodeForValue((*ii)->getOperand(0))); + G->getNodeForValue((*ii)->getOperand(0)).getNode()->setGlobalMarker(); + G->getNodeForValue((*ii)->getOperand(0)).getNode()->addGlobal(*csi); } } } Modified: poolalloc/trunk/lib/DSA/DataStructure.cpp URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/DSA/DataStructure.cpp?rev=57848&r1=57847&r2=57848&view=diff ============================================================================== --- poolalloc/trunk/lib/DSA/DataStructure.cpp (original) +++ poolalloc/trunk/lib/DSA/DataStructure.cpp Mon Oct 20 17:40:32 2008 @@ -146,7 +146,6 @@ if (T) mergeTypeInfo(T, 0); if (G) G->addNode(this); ++NumNodeAllocated; - // DOUT << "LLVA: Creating (1) DSNode " << this << "\n"; } // DSNode copy constructor... do not copy over the referrers list! @@ -159,7 +158,6 @@ Links.resize(N.Links.size()); // Create the appropriate number of null links G->addNode(this); ++NumNodeAllocated; - // DOUT << "LLVA: Creating (2) DSNode " << this << "\n"; } DSNode::~DSNode() { @@ -193,6 +191,7 @@ assert(ParentGraph && "Node has no parent?"); const DSScalarMap &SM = ParentGraph->getScalarMap(); for (unsigned i = 0, e = Globals.size(); i != e; ++i) { + Globals[i]->dump(); assert(SM.global_count(Globals[i])); assert(SM.find(Globals[i])->second.getNode() == this); } @@ -808,6 +807,11 @@ std::set_union(Globals.begin(), Globals.end(), RHS.Globals.begin(), RHS.Globals.end(), back_it); + DEBUG( + for (std::vector::iterator ii = Temp.begin(), + ee = Temp.end(); ii != ee; ++ii) + assert(isa(*ii) && "Non global merged"); + ); Globals.swap(Temp); } Modified: poolalloc/trunk/lib/DSA/Local.cpp URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/DSA/Local.cpp?rev=57848&r1=57847&r2=57848&view=diff ============================================================================== --- poolalloc/trunk/lib/DSA/Local.cpp (original) +++ poolalloc/trunk/lib/DSA/Local.cpp Mon Oct 20 17:40:32 2008 @@ -641,6 +641,11 @@ if (isa(I->getType())) RetVal = getValueDest(*I); + if (!isa(Callee)) + if (ConstantExpr* EX = dyn_cast(Callee)) + if (EX->isCast() && isa(EX->getOperand(0))) + Callee = cast(EX->getOperand(0)); + DSNode *CalleeNode = 0; if (!isa(Callee)) { CalleeNode = getValueDest(*Callee).getNode(); From alenhar2 at cs.uiuc.edu Mon Oct 20 17:41:19 2008 From: alenhar2 at cs.uiuc.edu (Andrew Lenharth) Date: Mon, 20 Oct 2008 22:41:19 -0000 Subject: [llvm-commits] [poolalloc] r57849 - /poolalloc/trunk/lib/DSA/DataStructure.cpp Message-ID: <200810202241.m9KMfJF6006731@zion.cs.uiuc.edu> Author: alenhar2 Date: Mon Oct 20 17:41:18 2008 New Revision: 57849 URL: http://llvm.org/viewvc/llvm-project?rev=57849&view=rev Log: silence debugging output Modified: poolalloc/trunk/lib/DSA/DataStructure.cpp Modified: poolalloc/trunk/lib/DSA/DataStructure.cpp URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/DSA/DataStructure.cpp?rev=57849&r1=57848&r2=57849&view=diff ============================================================================== --- poolalloc/trunk/lib/DSA/DataStructure.cpp (original) +++ poolalloc/trunk/lib/DSA/DataStructure.cpp Mon Oct 20 17:41:18 2008 @@ -191,7 +191,6 @@ assert(ParentGraph && "Node has no parent?"); const DSScalarMap &SM = ParentGraph->getScalarMap(); for (unsigned i = 0, e = Globals.size(); i != e; ++i) { - Globals[i]->dump(); assert(SM.global_count(Globals[i])); assert(SM.find(Globals[i])->second.getNode() == this); } From echristo at apple.com Mon Oct 20 17:59:47 2008 From: echristo at apple.com (Eric Christopher) Date: Mon, 20 Oct 2008 15:59:47 -0700 Subject: [llvm-commits] {PATCH] fix 'make check' on Solaris10 In-Reply-To: References: <4354d3270810181030l6c93a546gd800642e7d9b93ea@mail.gmail.com> Message-ID: On Oct 18, 2008, at 11:25 AM, Chris Lattner wrote: > This looks good to me, but I'm not autoconf wizard :). Eric, can > you take a look? Yep. It should be good. -eric From kremenek at apple.com Mon Oct 20 18:15:01 2008 From: kremenek at apple.com (Ted Kremenek) Date: Mon, 20 Oct 2008 23:15:01 -0000 Subject: [llvm-commits] [llvm] r57853 - /llvm/tags/checker/checker-113/ Message-ID: <200810202315.m9KNF1aD007654@zion.cs.uiuc.edu> Author: kremenek Date: Mon Oct 20 18:15:01 2008 New Revision: 57853 URL: http://llvm.org/viewvc/llvm-project?rev=57853&view=rev Log: Tagging checker-113. Added: llvm/tags/checker/checker-113/ - copied from r57852, llvm/trunk/ From kremenek at apple.com Mon Oct 20 18:40:49 2008 From: kremenek at apple.com (Ted Kremenek) Date: Mon, 20 Oct 2008 23:40:49 -0000 Subject: [llvm-commits] [llvm] r57856 - /llvm/tags/checker/checker-113/ Message-ID: <200810202340.m9KNena4008406@zion.cs.uiuc.edu> Author: kremenek Date: Mon Oct 20 18:40:49 2008 New Revision: 57856 URL: http://llvm.org/viewvc/llvm-project?rev=57856&view=rev Log: Removing checker-113. Removed: llvm/tags/checker/checker-113/ From kremenek at apple.com Mon Oct 20 18:41:13 2008 From: kremenek at apple.com (Ted Kremenek) Date: Mon, 20 Oct 2008 23:41:13 -0000 Subject: [llvm-commits] [llvm] r57858 - /llvm/tags/checker/checker-113/ Message-ID: <200810202341.m9KNfDG0008436@zion.cs.uiuc.edu> Author: kremenek Date: Mon Oct 20 18:41:13 2008 New Revision: 57858 URL: http://llvm.org/viewvc/llvm-project?rev=57858&view=rev Log: Tagging checker-113. Added: llvm/tags/checker/checker-113/ - copied from r57857, llvm/trunk/ From gohman at apple.com Mon Oct 20 18:43:13 2008 From: gohman at apple.com (Dan Gohman) Date: Mon, 20 Oct 2008 23:43:13 -0000 Subject: [llvm-commits] [llvm-gcc-4.2] r57860 - in /llvm-gcc-4.2/trunk/gcc: llvm-backend.cpp llvm.h toplev.c Message-ID: <200810202343.m9KNhD5P008508@zion.cs.uiuc.edu> Author: djg Date: Mon Oct 20 18:43:13 2008 New Revision: 57860 URL: http://llvm.org/viewvc/llvm-project?rev=57860&view=rev Log: Don't call llvm_shutdown() in llvm_asm_file_end(), because PCH uses llvm_asm_file_end() in a special way, such that it's too early to destroy all of LLVM's global state. Instead, wait until the end of compile_file() to call llvm_shutdown(). Modified: llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp llvm-gcc-4.2/trunk/gcc/llvm.h llvm-gcc-4.2/trunk/gcc/toplev.c Modified: llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp?rev=57860&r1=57859&r2=57860&view=diff ============================================================================== --- llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp (original) +++ llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp Mon Oct 20 18:43:13 2008 @@ -574,7 +574,6 @@ // llvm_asm_file_end - Finish the .s file. void llvm_asm_file_end(void) { timevar_push(TV_LLVM_PERFILE); - llvm_shutdown_obj X; // Call llvm_shutdown() on exit. performLateBackendInitialization(); createOptimizationPasses(); @@ -692,6 +691,11 @@ timevar_pop(TV_LLVM_PERFILE); } +// llvm_call_llvm_shutdown - Release LLVM global state. +void llvm_call_llvm_shutdown(void) { + llvm_shutdown(); +} + // llvm_emit_code_for_current_function - Top level interface for emitting a // function to the .s file. void llvm_emit_code_for_current_function(tree fndecl) { Modified: llvm-gcc-4.2/trunk/gcc/llvm.h URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm.h?rev=57860&r1=57859&r2=57860&view=diff ============================================================================== --- llvm-gcc-4.2/trunk/gcc/llvm.h (original) +++ llvm-gcc-4.2/trunk/gcc/llvm.h Mon Oct 20 18:43:13 2008 @@ -109,6 +109,9 @@ /* llvm_asm_file_end - Finish the .s file. */ void llvm_asm_file_end(void); +/* llvm_call_llvm_shutdown - Release LLVM global state. */ +void llvm_call_llvm_shutdown(void); + /* refine_type_to - Cause all users of the opaque type old_type to switch * to the more concrete type new_type. */ Modified: llvm-gcc-4.2/trunk/gcc/toplev.c URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/toplev.c?rev=57860&r1=57859&r2=57860&view=diff ============================================================================== --- llvm-gcc-4.2/trunk/gcc/toplev.c (original) +++ llvm-gcc-4.2/trunk/gcc/toplev.c Mon Oct 20 18:43:13 2008 @@ -1184,6 +1184,8 @@ #else if (!flag_pch_file) llvm_asm_file_end(); + /* Release LLVM global state. */ + llvm_call_llvm_shutdown(); #endif /* LLVM LOCAL end */ } From gohman at apple.com Mon Oct 20 18:45:28 2008 From: gohman at apple.com (Dan Gohman) Date: Mon, 20 Oct 2008 23:45:28 -0000 Subject: [llvm-commits] [llvm-gcc-4.2] r57861 - /llvm-gcc-4.2/trunk/gcc/except.c Message-ID: <200810202345.m9KNjS4F008577@zion.cs.uiuc.edu> Author: djg Date: Mon Oct 20 18:45:28 2008 New Revision: 57861 URL: http://llvm.org/viewvc/llvm-project?rev=57861&view=rev Log: Re-apply r57527, with some cleanups from Duncan, now that r57860 is in, which fixed the PCH problem that r57527 uncovered. Modified: llvm-gcc-4.2/trunk/gcc/except.c Modified: llvm-gcc-4.2/trunk/gcc/except.c URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/except.c?rev=57861&r1=57860&r2=57861&view=diff ============================================================================== --- llvm-gcc-4.2/trunk/gcc/except.c (original) +++ llvm-gcc-4.2/trunk/gcc/except.c Mon Oct 20 18:45:28 2008 @@ -4079,13 +4079,24 @@ /* The default c++ routines aren't actually c++ specific, so use those. */ /* LLVM LOCAL begin */ #ifdef ENABLE_LLVM - llvm_unwind_resume_libfunc = llvm_init_one_libfunc ( USING_SJLJ_EXCEPTIONS ? - "_Unwind_SjLj_Resume" + /* Create the decl with build_decl instead of using llvm_init_one_libfunc + so that we can specify an argument type instead of just using '...'. + '...' is functionally correct, but more work for codegen to handle, + and even requires additional instructions on some targets. */ + const char *name = USING_SJLJ_EXCEPTIONS ? + "_Unwind_SjLj_Resume" #ifdef LLVM_STACKSENSITIVE_UNWIND_RESUME - : "_Unwind_Resume_or_Rethrow"); + : "_Unwind_Resume_or_Rethrow"; #else - : "_Unwind_Resume"); + : "_Unwind_Resume"; #endif + tree decl = build_decl (FUNCTION_DECL, get_identifier (name), + build_function_type_list (void_type_node, + ptr_type_node, NULL_TREE)); + DECL_ARTIFICIAL (decl) = 1; + DECL_EXTERNAL (decl) = 1; + TREE_PUBLIC (decl) = 1; + llvm_unwind_resume_libfunc = decl; #else unwind_resume_libfunc = init_one_libfunc ( USING_SJLJ_EXCEPTIONS ? "_Unwind_SjLj_Resume" From sabre at nondot.org Mon Oct 20 19:45:37 2008 From: sabre at nondot.org (Chris Lattner) Date: Tue, 21 Oct 2008 00:45:37 -0000 Subject: [llvm-commits] [llvm] r57862 - in /llvm/trunk: lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp test/CodeGen/X86/2008-10-20-AsmDoubleInI32.ll Message-ID: <200810210045.m9L0jcK3010493@zion.cs.uiuc.edu> Author: lattner Date: Mon Oct 20 19:45:36 2008 New Revision: 57862 URL: http://llvm.org/viewvc/llvm-project?rev=57862&view=rev Log: Fix gcc.c-torture/compile/920520-1.c by inserting bitconverts for strange asm conditions earlier. In this case, we have a double being passed in an integer reg class. Convert to like sized integer register so that we allocate the right number for the class (two i32's for the f64 in this case). Added: llvm/trunk/test/CodeGen/X86/2008-10-20-AsmDoubleInI32.ll Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp?rev=57862&r1=57861&r2=57862&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp Mon Oct 20 19:45:36 2008 @@ -512,11 +512,8 @@ /// getCopyToParts - Create a series of nodes that contain the specified value /// split into legal parts. If the parts contain more bits than Val, then, for /// integers, ExtendKind can be used to specify how to generate the extra bits. -static void getCopyToParts(SelectionDAG &DAG, - SDValue Val, - SDValue *Parts, - unsigned NumParts, - MVT PartVT, +static void getCopyToParts(SelectionDAG &DAG, SDValue Val, + SDValue *Parts, unsigned NumParts, MVT PartVT, ISD::NodeType ExtendKind = ISD::ANY_EXTEND) { TargetLowering &TLI = DAG.getTargetLoweringInfo(); MVT PtrVT = TLI.getPointerTy(); @@ -4497,11 +4494,37 @@ OpInfo.ConstraintVT); unsigned NumRegs = 1; - if (OpInfo.ConstraintVT != MVT::Other) + if (OpInfo.ConstraintVT != MVT::Other) { + // If this is a FP input in an integer register (or visa versa) insert a bit + // cast of the input value. More generally, handle any case where the input + // value disagrees with the register class we plan to stick this in. + if (OpInfo.Type == InlineAsm::isInput && + PhysReg.second && !PhysReg.second->hasType(OpInfo.ConstraintVT)) { + // Try to convert to the first MVT that the reg class contains. If the + // types are identical size, use a bitcast to convert (e.g. two differing + // vector types). + MVT RegVT = *PhysReg.second->vt_begin(); + if (RegVT.getSizeInBits() == OpInfo.ConstraintVT.getSizeInBits()) { + OpInfo.CallOperand = DAG.getNode(ISD::BIT_CONVERT, RegVT, + OpInfo.CallOperand); + OpInfo.ConstraintVT = RegVT; + } else if (RegVT.isInteger() && OpInfo.ConstraintVT.isFloatingPoint()) { + // If the input is a FP value and we want it in FP registers, do a + // bitcast to the corresponding integer type. This turns an f64 value + // into i64, which can be passed with two i32 values on a 32-bit + // machine. + RegVT = MVT::getIntegerVT(OpInfo.ConstraintVT.getSizeInBits()); + OpInfo.CallOperand = DAG.getNode(ISD::BIT_CONVERT, RegVT, + OpInfo.CallOperand); + OpInfo.ConstraintVT = RegVT; + } + } + NumRegs = TLI.getNumRegisters(OpInfo.ConstraintVT); + } + MVT RegVT; MVT ValueVT = OpInfo.ConstraintVT; - // If this is a constraint for a specific physical register, like {r17}, // assign it now. Added: llvm/trunk/test/CodeGen/X86/2008-10-20-AsmDoubleInI32.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2008-10-20-AsmDoubleInI32.ll?rev=57862&view=auto ============================================================================== --- llvm/trunk/test/CodeGen/X86/2008-10-20-AsmDoubleInI32.ll (added) +++ llvm/trunk/test/CodeGen/X86/2008-10-20-AsmDoubleInI32.ll Mon Oct 20 19:45:36 2008 @@ -0,0 +1,11 @@ +; RUN: llvm-as < %s | llc -march=x86 +; RUN: llvm-as < %s | llc -march=x86-64 + +; from gcc.c-torture/compile/920520-1.c + +define i32 @g() nounwind { +entry: + call void asm sideeffect "$0", "r"(double 1.500000e+00) nounwind + ret i32 0 +} + From gohman at apple.com Mon Oct 20 20:08:08 2008 From: gohman at apple.com (Dan Gohman) Date: Tue, 21 Oct 2008 01:08:08 -0000 Subject: [llvm-commits] [llvm] r57864 - /llvm/trunk/lib/Transforms/IPO/ExtractGV.cpp Message-ID: <200810210108.m9L188O4011201@zion.cs.uiuc.edu> Author: djg Date: Mon Oct 20 20:08:07 2008 New Revision: 57864 URL: http://llvm.org/viewvc/llvm-project?rev=57864&view=rev Log: Fix a bug that prevented llvm-extract -delete from working. Modified: llvm/trunk/lib/Transforms/IPO/ExtractGV.cpp Modified: llvm/trunk/lib/Transforms/IPO/ExtractGV.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/ExtractGV.cpp?rev=57864&r1=57863&r2=57864&view=diff ============================================================================== --- llvm/trunk/lib/Transforms/IPO/ExtractGV.cpp (original) +++ llvm/trunk/lib/Transforms/IPO/ExtractGV.cpp Mon Oct 20 20:08:07 2008 @@ -52,7 +52,7 @@ bool deleteGV() { for (std::vector::iterator GI = Named.begin(), GE = Named.end(); GI != GE; ++GI) { - if (Function* NamedFunc = dyn_cast(&*GI)) { + if (Function* NamedFunc = dyn_cast(*GI)) { // If we're in relinking mode, set linkage of all internal callees to // external. This will allow us extract function, and then - link // everything together From kremenek at apple.com Mon Oct 20 21:36:36 2008 From: kremenek at apple.com (Ted Kremenek) Date: Tue, 21 Oct 2008 02:36:36 -0000 Subject: [llvm-commits] [llvm] r57865 - /llvm/tags/checker/checker-113/ Message-ID: <200810210236.m9L2abh4013789@zion.cs.uiuc.edu> Author: kremenek Date: Mon Oct 20 21:36:36 2008 New Revision: 57865 URL: http://llvm.org/viewvc/llvm-project?rev=57865&view=rev Log: Removing checker-113. Removed: llvm/tags/checker/checker-113/ From kremenek at apple.com Mon Oct 20 21:37:14 2008 From: kremenek at apple.com (Ted Kremenek) Date: Tue, 21 Oct 2008 02:37:14 -0000 Subject: [llvm-commits] [llvm] r57867 - /llvm/tags/checker/checker-113/ Message-ID: <200810210237.m9L2bE2n013830@zion.cs.uiuc.edu> Author: kremenek Date: Mon Oct 20 21:37:14 2008 New Revision: 57867 URL: http://llvm.org/viewvc/llvm-project?rev=57867&view=rev Log: Tagging checker-113. Added: llvm/tags/checker/checker-113/ - copied from r57866, llvm/trunk/ From ofv at wanadoo.es Mon Oct 20 21:37:50 2008 From: ofv at wanadoo.es (Oscar Fuentes) Date: Tue, 21 Oct 2008 02:37:50 -0000 Subject: [llvm-commits] [llvm] r57869 - /llvm/trunk/lib/CodeGen/CMakeLists.txt Message-ID: <200810210237.m9L2boIe013872@zion.cs.uiuc.edu> Author: ofv Date: Mon Oct 20 21:37:50 2008 New Revision: 57869 URL: http://llvm.org/viewvc/llvm-project?rev=57869&view=rev Log: CMake: updated lib/CodeGen/CMakeLists.txt Modified: llvm/trunk/lib/CodeGen/CMakeLists.txt Modified: llvm/trunk/lib/CodeGen/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/CMakeLists.txt?rev=57869&r1=57868&r2=57869&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/CMakeLists.txt (original) +++ llvm/trunk/lib/CodeGen/CMakeLists.txt Mon Oct 20 21:37:50 2008 @@ -30,6 +30,7 @@ PHIElimination.cpp Passes.cpp PostRASchedulerList.cpp + PreAllocSplitting.cpp PrologEpilogInserter.cpp PseudoSourceValue.cpp RegAllocBigBlock.cpp From gohman at apple.com Mon Oct 20 22:10:30 2008 From: gohman at apple.com (Dan Gohman) Date: Tue, 21 Oct 2008 03:10:30 -0000 Subject: [llvm-commits] [llvm] r57870 - /llvm/trunk/lib/Transforms/Instrumentation/BlockProfiling.cpp Message-ID: <200810210310.m9L3AVJe014762@zion.cs.uiuc.edu> Author: djg Date: Mon Oct 20 22:10:28 2008 New Revision: 57870 URL: http://llvm.org/viewvc/llvm-project?rev=57870&view=rev Log: Use Function::getEntryBlock() instead of Function::front(), for clarity. Modified: llvm/trunk/lib/Transforms/Instrumentation/BlockProfiling.cpp Modified: llvm/trunk/lib/Transforms/Instrumentation/BlockProfiling.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Instrumentation/BlockProfiling.cpp?rev=57870&r1=57869&r2=57870&view=diff ============================================================================== --- llvm/trunk/lib/Transforms/Instrumentation/BlockProfiling.cpp (original) +++ llvm/trunk/lib/Transforms/Instrumentation/BlockProfiling.cpp Mon Oct 20 22:10:28 2008 @@ -72,7 +72,7 @@ for (Module::iterator I = M.begin(), E = M.end(); I != E; ++I) if (!I->isDeclaration()) // Insert counter at the start of the function - IncrementCounterInBlock(I->begin(), i++, Counters); + IncrementCounterInBlock(&I->getEntryBlock(), i++, Counters); // Add the initialization call to main. InsertProfilingInitCall(Main, "llvm_start_func_profiling", Counters); From gohman at apple.com Mon Oct 20 22:12:54 2008 From: gohman at apple.com (Dan Gohman) Date: Tue, 21 Oct 2008 03:12:54 -0000 Subject: [llvm-commits] [llvm] r57871 - /llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp Message-ID: <200810210312.m9L3CsIg014869@zion.cs.uiuc.edu> Author: djg Date: Mon Oct 20 22:12:54 2008 New Revision: 57871 URL: http://llvm.org/viewvc/llvm-project?rev=57871&view=rev Log: Make the NaN test come second, heuristically assuming that NaNs are less common. Modified: llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp Modified: llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp?rev=57871&r1=57870&r2=57871&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp Mon Oct 20 22:12:54 2008 @@ -4901,18 +4901,18 @@ unsigned Opc = 0; switch (CCCode) { default: assert(0 && "Don't know how to expand this condition!"); abort(); - case ISD::SETOEQ: CC1 = ISD::SETO; CC2 = ISD::SETEQ; Opc = ISD::AND; break; - case ISD::SETOGT: CC1 = ISD::SETO; CC2 = ISD::SETGT; Opc = ISD::AND; break; - case ISD::SETOGE: CC1 = ISD::SETO; CC2 = ISD::SETGE; Opc = ISD::AND; break; - case ISD::SETOLT: CC1 = ISD::SETO; CC2 = ISD::SETLT; Opc = ISD::AND; break; - case ISD::SETOLE: CC1 = ISD::SETO; CC2 = ISD::SETLE; Opc = ISD::AND; break; - case ISD::SETONE: CC1 = ISD::SETO; CC2 = ISD::SETNE; Opc = ISD::AND; break; - case ISD::SETUEQ: CC1 = ISD::SETUO; CC2 = ISD::SETEQ; Opc = ISD::OR; break; - case ISD::SETUGT: CC1 = ISD::SETUO; CC2 = ISD::SETGT; Opc = ISD::OR; break; - case ISD::SETUGE: CC1 = ISD::SETUO; CC2 = ISD::SETGE; Opc = ISD::OR; break; - case ISD::SETULT: CC1 = ISD::SETUO; CC2 = ISD::SETLT; Opc = ISD::OR; break; - case ISD::SETULE: CC1 = ISD::SETUO; CC2 = ISD::SETLE; Opc = ISD::OR; break; - case ISD::SETUNE: CC1 = ISD::SETUO; CC2 = ISD::SETNE; Opc = ISD::OR; break; + case ISD::SETOEQ: CC1 = ISD::SETEQ; CC2 = ISD::SETO; Opc = ISD::AND; break; + case ISD::SETOGT: CC1 = ISD::SETGT; CC2 = ISD::SETO; Opc = ISD::AND; break; + case ISD::SETOGE: CC1 = ISD::SETGE; CC2 = ISD::SETO; Opc = ISD::AND; break; + case ISD::SETOLT: CC1 = ISD::SETLT; CC2 = ISD::SETO; Opc = ISD::AND; break; + case ISD::SETOLE: CC1 = ISD::SETLE; CC2 = ISD::SETO; Opc = ISD::AND; break; + case ISD::SETONE: CC1 = ISD::SETNE; CC2 = ISD::SETO; Opc = ISD::AND; break; + case ISD::SETUEQ: CC1 = ISD::SETEQ; CC2 = ISD::SETUO; Opc = ISD::OR; break; + case ISD::SETUGT: CC1 = ISD::SETGT; CC2 = ISD::SETUO; Opc = ISD::OR; break; + case ISD::SETUGE: CC1 = ISD::SETGE; CC2 = ISD::SETUO; Opc = ISD::OR; break; + case ISD::SETULT: CC1 = ISD::SETLT; CC2 = ISD::SETUO; Opc = ISD::OR; break; + case ISD::SETULE: CC1 = ISD::SETLE; CC2 = ISD::SETUO; Opc = ISD::OR; break; + case ISD::SETUNE: CC1 = ISD::SETNE; CC2 = ISD::SETUO; Opc = ISD::OR; break; // FIXME: Implement more expansions. } From gohman at apple.com Mon Oct 20 22:24:39 2008 From: gohman at apple.com (Dan Gohman) Date: Tue, 21 Oct 2008 03:24:39 -0000 Subject: [llvm-commits] [llvm] r57872 - in /llvm/trunk: lib/CodeGen/SimpleRegisterCoalescing.cpp lib/Target/X86/X86InstrInfo.cpp test/CodeGen/X86/ret-i64-0.ll Message-ID: <200810210324.m9L3Odmc015190@zion.cs.uiuc.edu> Author: djg Date: Mon Oct 20 22:24:31 2008 New Revision: 57872 URL: http://llvm.org/viewvc/llvm-project?rev=57872&view=rev Log: When the coalescer is doing rematerializing, have it remove the copy instruction from the instruction list before asking the target to create the new instruction. This gets the old instruction out of the way so that it doesn't interfere with the target's rematerialization code. In the case of x86, this helps it find more cases where EFLAGS is not live. Also, in the X86InstrInfo.cpp, teach isSafeToClobberEFLAGS to check to see if it reached the end of the block after scanning each instruction, instead of just before. This lets it notice when the end of the block is only two instructions away, without doing any additional scanning. These changes allow rematerialization to clobber EFLAGS in more cases, for example using xor instead of mov to set the return value to zero in the included testcase. Added: llvm/trunk/test/CodeGen/X86/ret-i64-0.ll Modified: llvm/trunk/lib/CodeGen/SimpleRegisterCoalescing.cpp llvm/trunk/lib/Target/X86/X86InstrInfo.cpp Modified: llvm/trunk/lib/CodeGen/SimpleRegisterCoalescing.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SimpleRegisterCoalescing.cpp?rev=57872&r1=57871&r2=57872&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SimpleRegisterCoalescing.cpp (original) +++ llvm/trunk/lib/CodeGen/SimpleRegisterCoalescing.cpp Mon Oct 20 22:24:31 2008 @@ -471,8 +471,9 @@ } } - MachineBasicBlock::iterator MII = CopyMI; MachineBasicBlock *MBB = CopyMI->getParent(); + MachineBasicBlock::iterator MII = next(MachineBasicBlock::iterator(CopyMI)); + CopyMI->removeFromParent(); tii_->reMaterialize(*MBB, MII, DstReg, DefMI); MachineInstr *NewMI = prior(MII); // CopyMI may have implicit operands, transfer them over to the newly @@ -491,7 +492,7 @@ } li_->ReplaceMachineInstrInMaps(CopyMI, NewMI); - CopyMI->eraseFromParent(); + MBB->getParent()->DeleteMachineInstr(CopyMI); ReMatCopies.insert(CopyMI); ReMatDefs.insert(DefMI); ++NumReMats; Modified: llvm/trunk/lib/Target/X86/X86InstrInfo.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86InstrInfo.cpp?rev=57872&r1=57871&r2=57872&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/X86InstrInfo.cpp (original) +++ llvm/trunk/lib/Target/X86/X86InstrInfo.cpp Mon Oct 20 22:24:31 2008 @@ -848,12 +848,13 @@ /// two instructions it assumes it's not safe. static bool isSafeToClobberEFLAGS(MachineBasicBlock &MBB, MachineBasicBlock::iterator I) { + // It's always safe to clobber EFLAGS at the end of a block. + if (I == MBB.end()) + return true; + // For compile time consideration, if we are not able to determine the // safety after visiting 2 instructions, we will assume it's not safe. for (unsigned i = 0; i < 2; ++i) { - if (I == MBB.end()) - // Reached end of block, it's safe. - return true; bool SeenDef = false; for (unsigned j = 0, e = I->getNumOperands(); j != e; ++j) { MachineOperand &MO = I->getOperand(j); @@ -870,6 +871,10 @@ // This instruction defines EFLAGS, no need to look any further. return true; ++I; + + // If we make it to the end of the block, it's safe to clobber EFLAGS. + if (I == MBB.end()) + return true; } // Conservative answer. Added: llvm/trunk/test/CodeGen/X86/ret-i64-0.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/ret-i64-0.ll?rev=57872&view=auto ============================================================================== --- llvm/trunk/test/CodeGen/X86/ret-i64-0.ll (added) +++ llvm/trunk/test/CodeGen/X86/ret-i64-0.ll Mon Oct 20 22:24:31 2008 @@ -0,0 +1,5 @@ +; RUN: llvm-as < %s | llc -march=x86 | grep xor | count 2 + +define i64 @foo() { + ret i64 0 +} From gohman at apple.com Mon Oct 20 22:29:32 2008 From: gohman at apple.com (Dan Gohman) Date: Tue, 21 Oct 2008 03:29:32 -0000 Subject: [llvm-commits] [llvm] r57873 - in /llvm/trunk: lib/CodeGen/IfConversion.cpp lib/Target/X86/X86ISelLowering.cpp lib/Target/X86/X86InstrInfo.cpp lib/Target/X86/X86InstrInfo.h test/CodeGen/X86/isint.ll Message-ID: <200810210329.m9L3TXbd015336@zion.cs.uiuc.edu> Author: djg Date: Mon Oct 20 22:29:32 2008 New Revision: 57873 URL: http://llvm.org/viewvc/llvm-project?rev=57873&view=rev Log: Optimized FCMP_OEQ and FCMP_UNE for x86. Where previously LLVM might emit code like this: ucomisd %xmm1, %xmm0 setne %al setp %cl orb %al, %cl jne .LBB4_2 it now emits this: ucomisd %xmm1, %xmm0 jne .LBB4_2 jp .LBB4_2 It has fewer instructions and uses fewer registers, but it does have more branches. And in the case that this code is followed by a non-fallthrough edge, it may be followed by a jmp instruction, resulting in three branch instructions in sequence. Some effort is made to avoid this situation. To achieve this, X86ISelLowering.cpp now recognizes FCMP_OEQ and FCMP_UNE in lowered form, and replace them with code that emits two branches, except in the case where it would require converting a fall-through edge to an explicit branch. Also, X86InstrInfo.cpp's branch analysis and transform code now knows now to handle blocks with multiple conditional branches. It uses loops instead of having fixed checks for up to two instructions. It can now analyze and transform code generated from FCMP_OEQ and FCMP_UNE. Added: llvm/trunk/test/CodeGen/X86/isint.ll Modified: llvm/trunk/lib/CodeGen/IfConversion.cpp llvm/trunk/lib/Target/X86/X86ISelLowering.cpp llvm/trunk/lib/Target/X86/X86InstrInfo.cpp llvm/trunk/lib/Target/X86/X86InstrInfo.h Modified: llvm/trunk/lib/CodeGen/IfConversion.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/IfConversion.cpp?rev=57873&r1=57872&r2=57873&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/IfConversion.cpp (original) +++ llvm/trunk/lib/CodeGen/IfConversion.cpp Mon Oct 20 22:29:32 2008 @@ -849,7 +849,8 @@ } if (Kind == ICSimpleFalse) - TII->ReverseBranchCondition(Cond); + if (TII->ReverseBranchCondition(Cond)) + assert(false && "Unable to reverse branch condition!"); if (CvtBBI->BB->pred_size() > 1) { BBI.NonPredSize -= TII->RemoveBranch(*BBI.BB); @@ -914,21 +915,23 @@ } if (Kind == ICTriangleFalse || Kind == ICTriangleFRev) - TII->ReverseBranchCondition(Cond); + if (TII->ReverseBranchCondition(Cond)) + assert(false && "Unable to reverse branch condition!"); if (Kind == ICTriangleRev || Kind == ICTriangleFRev) { - ReverseBranchCondition(*CvtBBI); - // BB has been changed, modify its predecessors (except for this - // one) so they don't get ifcvt'ed based on bad intel. - for (MachineBasicBlock::pred_iterator PI = CvtBBI->BB->pred_begin(), - E = CvtBBI->BB->pred_end(); PI != E; ++PI) { - MachineBasicBlock *PBB = *PI; - if (PBB == BBI.BB) - continue; - BBInfo &PBBI = BBAnalysis[PBB->getNumber()]; - if (PBBI.IsEnqueued) { - PBBI.IsAnalyzed = false; - PBBI.IsEnqueued = false; + if (ReverseBranchCondition(*CvtBBI)) { + // BB has been changed, modify its predecessors (except for this + // one) so they don't get ifcvt'ed based on bad intel. + for (MachineBasicBlock::pred_iterator PI = CvtBBI->BB->pred_begin(), + E = CvtBBI->BB->pred_end(); PI != E; ++PI) { + MachineBasicBlock *PBB = *PI; + if (PBB == BBI.BB) + continue; + BBInfo &PBBI = BBAnalysis[PBB->getNumber()]; + if (PBBI.IsEnqueued) { + PBBI.IsAnalyzed = false; + PBBI.IsEnqueued = false; + } } } } @@ -1028,7 +1031,8 @@ BBInfo *BBI1 = &TrueBBI; BBInfo *BBI2 = &FalseBBI; SmallVector RevCond(BBI.BrCond.begin(), BBI.BrCond.end()); - TII->ReverseBranchCondition(RevCond); + if (TII->ReverseBranchCondition(RevCond)) + assert(false && "Unable to reverse branch condition!"); SmallVector *Cond1 = &BBI.BrCond; SmallVector *Cond2 = &RevCond; Modified: llvm/trunk/lib/Target/X86/X86ISelLowering.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86ISelLowering.cpp?rev=57873&r1=57872&r2=57873&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/X86ISelLowering.cpp (original) +++ llvm/trunk/lib/Target/X86/X86ISelLowering.cpp Mon Oct 20 22:29:32 2008 @@ -5100,6 +5100,71 @@ Cond = Cmp; addTest = false; } + // Also, recognize the pattern generated by an FCMP_UNE. We can emit + // two branches instead of an explicit OR instruction with a + // separate test. + } else if (Cond.getOpcode() == ISD::OR && + Cond.hasOneUse() && + Cond.getOperand(0).getOpcode() == X86ISD::SETCC && + Cond.getOperand(0).hasOneUse() && + Cond.getOperand(1).getOpcode() == X86ISD::SETCC && + Cond.getOperand(1).hasOneUse()) { + SDValue Cmp = Cond.getOperand(0).getOperand(1); + unsigned Opc = Cmp.getOpcode(); + if (Cmp == Cond.getOperand(1).getOperand(1) && + (Opc == X86ISD::CMP || + Opc == X86ISD::COMI || + Opc == X86ISD::UCOMI)) { + CC = Cond.getOperand(0).getOperand(0); + Chain = DAG.getNode(X86ISD::BRCOND, Op.getValueType(), + Chain, Dest, CC, Cmp); + CC = Cond.getOperand(1).getOperand(0); + Cond = Cmp; + addTest = false; + } + // Also, recognize the pattern generated by an FCMP_OEQ. We can emit + // two branches instead of an explicit AND instruction with a + // separate test. However, we only do this if this block doesn't + // have a fall-through edge, because this requires an explicit + // jmp when the condition is false. + } else if (Cond.getOpcode() == ISD::AND && + Cond.hasOneUse() && + Cond.getOperand(0).getOpcode() == X86ISD::SETCC && + Cond.getOperand(0).hasOneUse() && + Cond.getOperand(1).getOpcode() == X86ISD::SETCC && + Cond.getOperand(1).hasOneUse()) { + SDValue Cmp = Cond.getOperand(0).getOperand(1); + unsigned Opc = Cmp.getOpcode(); + if (Cmp == Cond.getOperand(1).getOperand(1) && + (Opc == X86ISD::CMP || + Opc == X86ISD::COMI || + Opc == X86ISD::UCOMI) && + Op.getNode()->hasOneUse()) { + X86::CondCode CCode = + (X86::CondCode)Cond.getOperand(0).getConstantOperandVal(0); + CCode = X86::GetOppositeBranchCondition(CCode); + CC = DAG.getConstant(CCode, MVT::i8); + SDValue User = SDValue(*Op.getNode()->use_begin(), 0); + // Look for an unconditional branch following this conditional branch. + // We need this because we need to reverse the successors in order + // to implement FCMP_OEQ. + if (User.getOpcode() == ISD::BR) { + SDValue FalseBB = User.getOperand(1); + SDValue NewBR = + DAG.UpdateNodeOperands(User, User.getOperand(0), Dest); + assert(NewBR == User); + Dest = FalseBB; + + Chain = DAG.getNode(X86ISD::BRCOND, Op.getValueType(), + Chain, Dest, CC, Cmp); + X86::CondCode CCode = + (X86::CondCode)Cond.getOperand(1).getConstantOperandVal(0); + CCode = X86::GetOppositeBranchCondition(CCode); + CC = DAG.getConstant(CCode, MVT::i8); + Cond = Cmp; + addTest = false; + } + } } if (addTest) { @@ -5107,7 +5172,7 @@ Cond= DAG.getNode(X86ISD::CMP, MVT::i32, Cond, DAG.getConstant(0, MVT::i8)); } return DAG.getNode(X86ISD::BRCOND, Op.getValueType(), - Chain, Op.getOperand(2), CC, Cond); + Chain, Dest, CC, Cond); } Modified: llvm/trunk/lib/Target/X86/X86InstrInfo.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86InstrInfo.cpp?rev=57873&r1=57872&r2=57873&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/X86InstrInfo.cpp (original) +++ llvm/trunk/lib/Target/X86/X86InstrInfo.cpp Mon Oct 20 22:29:32 2008 @@ -1455,88 +1455,101 @@ MachineBasicBlock *&TBB, MachineBasicBlock *&FBB, SmallVectorImpl &Cond) const { - // If the block has no terminators, it just falls into the block after it. + // Start from the bottom of the block and work up, examining the + // terminator instructions. MachineBasicBlock::iterator I = MBB.end(); - if (I == MBB.begin() || !isBrAnalysisUnpredicatedTerminator(--I, *this)) - return false; - - // Get the last instruction in the block. - MachineInstr *LastInst = I; - - // If there is only one terminator instruction, process it. - if (I == MBB.begin() || !isBrAnalysisUnpredicatedTerminator(--I, *this)) { - if (!LastInst->getDesc().isBranch()) + while (I != MBB.begin()) { + --I; + // Working from the bottom, when we see a non-terminator + // instruction, we're done. + if (!isBrAnalysisUnpredicatedTerminator(I, *this)) + break; + // A terminator that isn't a branch can't easily be handled + // by this analysis. + if (!I->getDesc().isBranch()) return true; - - // If the block ends with a branch there are 3 possibilities: - // it's an unconditional, conditional, or indirect branch. - - if (LastInst->getOpcode() == X86::JMP) { - TBB = LastInst->getOperand(0).getMBB(); - return false; + // Handle unconditional branches. + if (I->getOpcode() == X86::JMP) { + // If the block has any instructions after a JMP, delete them. + while (next(I) != MBB.end()) + next(I)->eraseFromParent(); + Cond.clear(); + FBB = 0; + // Delete the JMP if it's equivalent to a fall-through. + if (MBB.isLayoutSuccessor(I->getOperand(0).getMBB())) { + TBB = 0; + I->eraseFromParent(); + I = MBB.end(); + continue; + } + // TBB is used to indicate the unconditinal destination. + TBB = I->getOperand(0).getMBB(); + continue; } - X86::CondCode BranchCode = GetCondFromBranchOpc(LastInst->getOpcode()); + // Handle conditional branches. + X86::CondCode BranchCode = GetCondFromBranchOpc(I->getOpcode()); if (BranchCode == X86::COND_INVALID) return true; // Can't handle indirect branch. - - // Otherwise, block ends with fall-through condbranch. - TBB = LastInst->getOperand(0).getMBB(); - Cond.push_back(MachineOperand::CreateImm(BranchCode)); - return false; - } - - // Get the instruction before it if it's a terminator. - MachineInstr *SecondLastInst = I; - - // If there are three terminators, we don't know what sort of block this is. - if (SecondLastInst && I != MBB.begin() && - isBrAnalysisUnpredicatedTerminator(--I, *this)) - return true; - - // If the block ends with X86::JMP and a conditional branch, handle it. - X86::CondCode BranchCode = GetCondFromBranchOpc(SecondLastInst->getOpcode()); - if (BranchCode != X86::COND_INVALID && LastInst->getOpcode() == X86::JMP) { - TBB = SecondLastInst->getOperand(0).getMBB(); - Cond.push_back(MachineOperand::CreateImm(BranchCode)); - FBB = LastInst->getOperand(0).getMBB(); - return false; - } - - // If the block ends with two X86::JMPs, handle it. The second one is not - // executed, so remove it. - if (SecondLastInst->getOpcode() == X86::JMP && - LastInst->getOpcode() == X86::JMP) { - TBB = SecondLastInst->getOperand(0).getMBB(); - I = LastInst; - I->eraseFromParent(); - return false; + // Working from the bottom, handle the first conditional branch. + if (Cond.empty()) { + FBB = TBB; + TBB = I->getOperand(0).getMBB(); + Cond.push_back(MachineOperand::CreateImm(BranchCode)); + continue; + } + // Handle subsequent conditional branches. Only handle the case + // where all conditional branches branch to the same destination + // and their condition opcodes fit one of the special + // multi-branch idioms. + assert(Cond.size() == 1); + assert(TBB); + // Only handle the case where all conditional branches branch to + // the same destination. + if (TBB != I->getOperand(0).getMBB()) + return true; + X86::CondCode OldBranchCode = (X86::CondCode)Cond[0].getImm(); + // If the conditions are the same, we can leave them alone. + if (OldBranchCode == BranchCode) + continue; + // If they differ, see if they fit one of the known patterns. + // Theoretically we could handle more patterns here, but + // we shouldn't expect to see them if instruction selection + // has done a reasonable job. + if ((OldBranchCode == X86::COND_NP && + BranchCode == X86::COND_E) || + (OldBranchCode == X86::COND_E && + BranchCode == X86::COND_NP)) + BranchCode = X86::COND_NP_OR_E; + else if ((OldBranchCode == X86::COND_P && + BranchCode == X86::COND_NE) || + (OldBranchCode == X86::COND_NE && + BranchCode == X86::COND_P)) + BranchCode = X86::COND_NE_OR_P; + else + return true; + // Update the MachineOperand. + Cond[0].setImm(BranchCode); } - // Otherwise, can't handle this. - return true; + return false; } unsigned X86InstrInfo::RemoveBranch(MachineBasicBlock &MBB) const { MachineBasicBlock::iterator I = MBB.end(); - if (I == MBB.begin()) return 0; - --I; - if (I->getOpcode() != X86::JMP && - GetCondFromBranchOpc(I->getOpcode()) == X86::COND_INVALID) - return 0; - - // Remove the branch. - I->eraseFromParent(); - - I = MBB.end(); - - if (I == MBB.begin()) return 1; - --I; - if (GetCondFromBranchOpc(I->getOpcode()) == X86::COND_INVALID) - return 1; + unsigned Count = 0; + + while (I != MBB.begin()) { + --I; + if (I->getOpcode() != X86::JMP && + GetCondFromBranchOpc(I->getOpcode()) == X86::COND_INVALID) + break; + // Remove the branch. + I->eraseFromParent(); + I = MBB.end(); + ++Count; + } - // Remove the branch. - I->eraseFromParent(); - return 2; + return Count; } static const MachineInstrBuilder &X86InstrAddOperand(MachineInstrBuilder &MIB, @@ -1571,23 +1584,43 @@ assert((Cond.size() == 1 || Cond.size() == 0) && "X86 branch conditions have one component!"); - if (FBB == 0) { // One way branch. - if (Cond.empty()) { - // Unconditional branch? - BuildMI(&MBB, get(X86::JMP)).addMBB(TBB); - } else { - // Conditional branch. - unsigned Opc = GetCondBranchFromCond((X86::CondCode)Cond[0].getImm()); - BuildMI(&MBB, get(Opc)).addMBB(TBB); - } + if (Cond.empty()) { + // Unconditional branch? + assert(!FBB && "Unconditional branch with multiple successors!"); + BuildMI(&MBB, get(X86::JMP)).addMBB(TBB); return 1; } - - // Two-way Conditional branch. - unsigned Opc = GetCondBranchFromCond((X86::CondCode)Cond[0].getImm()); - BuildMI(&MBB, get(Opc)).addMBB(TBB); - BuildMI(&MBB, get(X86::JMP)).addMBB(FBB); - return 2; + + // Conditional branch. + unsigned Count = 0; + X86::CondCode CC = (X86::CondCode)Cond[0].getImm(); + switch (CC) { + case X86::COND_NP_OR_E: + // Synthesize NP_OR_E with two branches. + BuildMI(&MBB, get(X86::JNP)).addMBB(TBB); + ++Count; + BuildMI(&MBB, get(X86::JE)).addMBB(TBB); + ++Count; + break; + case X86::COND_NE_OR_P: + // Synthesize NE_OR_P with two branches. + BuildMI(&MBB, get(X86::JNE)).addMBB(TBB); + ++Count; + BuildMI(&MBB, get(X86::JP)).addMBB(TBB); + ++Count; + break; + default: { + unsigned Opc = GetCondBranchFromCond(CC); + BuildMI(&MBB, get(Opc)).addMBB(TBB); + ++Count; + } + } + if (FBB) { + // Two-way Conditional branch. Insert the second branch. + BuildMI(&MBB, get(X86::JMP)).addMBB(FBB); + ++Count; + } + return Count; } bool X86InstrInfo::copyRegToReg(MachineBasicBlock &MBB, @@ -2372,6 +2405,8 @@ ReverseBranchCondition(SmallVectorImpl &Cond) const { assert(Cond.size() == 1 && "Invalid X86 branch condition!"); X86::CondCode CC = static_cast(Cond[0].getImm()); + if (CC == X86::COND_NE_OR_P || CC == X86::COND_NP_OR_E) + return true; Cond[0].setImm(GetOppositeBranchCondition(CC)); return false; } Modified: llvm/trunk/lib/Target/X86/X86InstrInfo.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86InstrInfo.h?rev=57873&r1=57872&r2=57873&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/X86InstrInfo.h (original) +++ llvm/trunk/lib/Target/X86/X86InstrInfo.h Mon Oct 20 22:29:32 2008 @@ -44,6 +44,15 @@ COND_O = 13, COND_P = 14, COND_S = 15, + + // Artificial condition codes. These are used by AnalyzeBranch + // to indicate a block terminated with two conditional branches to + // the same location. This occurs in code using FCMP_OEQ or FCMP_UNE, + // which can't be represented on x86 with a single condition. These + // are never used in MachineInstrs. + COND_NE_OR_P, + COND_NP_OR_E, + COND_INVALID }; Added: llvm/trunk/test/CodeGen/X86/isint.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/isint.ll?rev=57873&view=auto ============================================================================== --- llvm/trunk/test/CodeGen/X86/isint.ll (added) +++ llvm/trunk/test/CodeGen/X86/isint.ll Mon Oct 20 22:29:32 2008 @@ -0,0 +1,31 @@ +; llvm-as < %s | llc -march=x86 > %t +; not grep cmp %t +; not grep xor %t +; grep jne %t | count 1 +; grep jp %t | count 1 +; grep setnp %t | count 1 +; grep sete %t | count 1 +; grep and %t | count 1 +; grep cvt %t | count 4 + +define i32 @isint_return(double %d) nounwind { + %i = fptosi double %d to i32 + %e = sitofp i32 %i to double + %c = fcmp oeq double %d, %e + %z = zext i1 %c to i32 + ret i32 %z +} + +declare void @foo() + +define void @isint_branch(double %d) nounwind { + %i = fptosi double %d to i32 + %e = sitofp i32 %i to double + %c = fcmp oeq double %d, %e + br i1 %c, label %true, label %false +true: + call void @foo() + ret void +false: + ret void +} From kremenek at apple.com Mon Oct 20 22:31:12 2008 From: kremenek at apple.com (Ted Kremenek) Date: Tue, 21 Oct 2008 03:31:12 -0000 Subject: [llvm-commits] [llvm] r57874 - /llvm/tags/checker/checker-113/ Message-ID: <200810210331.m9L3VCcT015423@zion.cs.uiuc.edu> Author: kremenek Date: Mon Oct 20 22:31:12 2008 New Revision: 57874 URL: http://llvm.org/viewvc/llvm-project?rev=57874&view=rev Log: Removing checker-113. Removed: llvm/tags/checker/checker-113/ From kremenek at apple.com Mon Oct 20 22:33:18 2008 From: kremenek at apple.com (Ted Kremenek) Date: Tue, 21 Oct 2008 03:33:18 -0000 Subject: [llvm-commits] [llvm] r57879 - /llvm/tags/checker/checker-113/ Message-ID: <200810210333.m9L3XIUd015639@zion.cs.uiuc.edu> Author: kremenek Date: Mon Oct 20 22:33:18 2008 New Revision: 57879 URL: http://llvm.org/viewvc/llvm-project?rev=57879&view=rev Log: Tagging checker-113. Added: llvm/tags/checker/checker-113/ - copied from r57878, llvm/trunk/ From kremenek at apple.com Mon Oct 20 22:35:19 2008 From: kremenek at apple.com (Ted Kremenek) Date: Tue, 21 Oct 2008 03:35:19 -0000 Subject: [llvm-commits] [llvm] r57881 - /llvm/tags/checker/checker-113/ Message-ID: <200810210335.m9L3ZJbX015714@zion.cs.uiuc.edu> Author: kremenek Date: Mon Oct 20 22:35:19 2008 New Revision: 57881 URL: http://llvm.org/viewvc/llvm-project?rev=57881&view=rev Log: Removing checker-113. Removed: llvm/tags/checker/checker-113/ From kremenek at apple.com Mon Oct 20 22:35:36 2008 From: kremenek at apple.com (Ted Kremenek) Date: Tue, 21 Oct 2008 03:35:36 -0000 Subject: [llvm-commits] [llvm] r57883 - /llvm/tags/checker/checker-113/ Message-ID: <200810210335.m9L3ZasH015743@zion.cs.uiuc.edu> Author: kremenek Date: Mon Oct 20 22:35:36 2008 New Revision: 57883 URL: http://llvm.org/viewvc/llvm-project?rev=57883&view=rev Log: Tagging checker-113. Added: llvm/tags/checker/checker-113/ - copied from r57882, llvm/trunk/ From gohman at apple.com Mon Oct 20 22:38:43 2008 From: gohman at apple.com (Dan Gohman) Date: Tue, 21 Oct 2008 03:38:43 -0000 Subject: [llvm-commits] [llvm] r57885 - in /llvm/trunk: lib/CodeGen/SelectionDAG/SelectionDAG.cpp lib/Target/X86/X86ISelLowering.cpp test/CodeGen/X86/x86-64-disp.ll Message-ID: <200810210338.m9L3chcj015852@zion.cs.uiuc.edu> Author: djg Date: Mon Oct 20 22:38:42 2008 New Revision: 57885 URL: http://llvm.org/viewvc/llvm-project?rev=57885&view=rev Log: Don't create TargetGlobalAddress nodes with offsets that don't fit in the 32-bit signed offset field of addresses. Even though this may be intended, some linkers refuse to relocate code where the relocated address computation overflows. Also, fix the sign-extension of constant offsets to use the actual pointer size, rather than the size of the GlobalAddress node, which may be different, for example on x86-64 where MVT::i32 is used when the address is being fit into the 32-bit displacement field. Added: llvm/trunk/test/CodeGen/X86/x86-64-disp.ll Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp llvm/trunk/lib/Target/X86/X86ISelLowering.cpp Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp?rev=57885&r1=57884&r2=57885&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp Mon Oct 20 22:38:42 2008 @@ -974,7 +974,7 @@ unsigned Opc; // Truncate (with sign-extension) the offset value to the pointer size. - unsigned BitWidth = VT.getSizeInBits(); + unsigned BitWidth = TLI.getPointerTy().getSizeInBits(); if (BitWidth < 64) Offset = (Offset << (64 - BitWidth) >> (64 - BitWidth)); Modified: llvm/trunk/lib/Target/X86/X86ISelLowering.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86ISelLowering.cpp?rev=57885&r1=57884&r2=57885&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/X86ISelLowering.cpp (original) +++ llvm/trunk/lib/Target/X86/X86ISelLowering.cpp Mon Oct 20 22:38:42 2008 @@ -4400,7 +4400,7 @@ // Create the TargetGlobalAddress node, folding in the constant // offset if it is legal. SDValue Result; - if (!IsPic && !ExtraLoadRequired) { + if (!IsPic && !ExtraLoadRequired && isInt32(Offset)) { Result = DAG.getTargetGlobalAddress(GV, getPointerTy(), Offset); Offset = 0; } else Added: llvm/trunk/test/CodeGen/X86/x86-64-disp.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/x86-64-disp.ll?rev=57885&view=auto ============================================================================== --- llvm/trunk/test/CodeGen/X86/x86-64-disp.ll (added) +++ llvm/trunk/test/CodeGen/X86/x86-64-disp.ll Mon Oct 20 22:38:42 2008 @@ -0,0 +1,14 @@ +; RUN: llvm-as < %s | llc -march=x86-64 | grep mov | count 2 + +; Fold an offset into an address even if it's not a 32-bit +; signed integer. + +target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128" +target triple = "x86_64-unknown-linux-gnu" + at call_used_regs = external global [53 x i8], align 32 + +define fastcc void @foo() nounwind { + %t = getelementptr [53 x i8]* @call_used_regs, i64 0, i64 4294967295 + store i8 1, i8* %t, align 1 + ret void +} From gohman at apple.com Mon Oct 20 22:41:47 2008 From: gohman at apple.com (Dan Gohman) Date: Tue, 21 Oct 2008 03:41:47 -0000 Subject: [llvm-commits] [llvm] r57886 - in /llvm/trunk/lib/Target/PowerPC: PPCISelLowering.cpp PPCISelLowering.h Message-ID: <200810210341.m9L3flAB015942@zion.cs.uiuc.edu> Author: djg Date: Mon Oct 20 22:41:46 2008 New Revision: 57886 URL: http://llvm.org/viewvc/llvm-project?rev=57886&view=rev Log: Disable constant-offset folding for PowerPC, as the PowerPC target isn't yet prepared for it. Modified: llvm/trunk/lib/Target/PowerPC/PPCISelLowering.cpp llvm/trunk/lib/Target/PowerPC/PPCISelLowering.h Modified: llvm/trunk/lib/Target/PowerPC/PPCISelLowering.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/PPCISelLowering.cpp?rev=57886&r1=57885&r2=57886&view=diff ============================================================================== --- llvm/trunk/lib/Target/PowerPC/PPCISelLowering.cpp (original) +++ llvm/trunk/lib/Target/PowerPC/PPCISelLowering.cpp Mon Oct 20 22:41:46 2008 @@ -4912,3 +4912,9 @@ return DAG.getCopyFromReg(DAG.getEntryNode(), is31 ? PPC::R31 : PPC::R1, MVT::i32); } + +bool +PPCTargetLowering::isOffsetFoldingLegal(const GlobalAddressSDNode *GA) const { + // The PowerPC target isn't yet aware of offsets. + return false; +} Modified: llvm/trunk/lib/Target/PowerPC/PPCISelLowering.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/PPCISelLowering.h?rev=57886&r1=57885&r2=57886&view=diff ============================================================================== --- llvm/trunk/lib/Target/PowerPC/PPCISelLowering.h (original) +++ llvm/trunk/lib/Target/PowerPC/PPCISelLowering.h Mon Oct 20 22:41:46 2008 @@ -329,6 +329,8 @@ SDValue Ret, SelectionDAG &DAG) const; + virtual bool isOffsetFoldingLegal(const GlobalAddressSDNode *GA) const; + private: SDValue getFramePointerFrameIndex(SelectionDAG & DAG) const; SDValue getReturnAddrFrameIndex(SelectionDAG & DAG) const; From sabre at nondot.org Mon Oct 20 22:49:20 2008 From: sabre at nondot.org (Chris Lattner) Date: Tue, 21 Oct 2008 03:49:20 -0000 Subject: [llvm-commits] [llvm] r57887 - /llvm/trunk/test/CodeGen/X86/ret-i64-0.ll Message-ID: <200810210349.m9L3nKBT016163@zion.cs.uiuc.edu> Author: lattner Date: Mon Oct 20 22:49:19 2008 New Revision: 57887 URL: http://llvm.org/viewvc/llvm-project?rev=57887&view=rev Log: remove some unneeded eh generation Modified: llvm/trunk/test/CodeGen/X86/ret-i64-0.ll Modified: llvm/trunk/test/CodeGen/X86/ret-i64-0.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/ret-i64-0.ll?rev=57887&r1=57886&r2=57887&view=diff ============================================================================== --- llvm/trunk/test/CodeGen/X86/ret-i64-0.ll (original) +++ llvm/trunk/test/CodeGen/X86/ret-i64-0.ll Mon Oct 20 22:49:19 2008 @@ -1,5 +1,5 @@ ; RUN: llvm-as < %s | llc -march=x86 | grep xor | count 2 -define i64 @foo() { +define i64 @foo() nounwind { ret i64 0 } From sabre at nondot.org Mon Oct 20 22:54:49 2008 From: sabre at nondot.org (Chris Lattner) Date: Tue, 21 Oct 2008 03:54:49 -0000 Subject: [llvm-commits] [llvm] r57888 - /llvm/trunk/test/CodeGen/X86/isint.ll Message-ID: <200810210354.m9L3snDX016313@zion.cs.uiuc.edu> Author: lattner Date: Mon Oct 20 22:54:49 2008 New Revision: 57888 URL: http://llvm.org/viewvc/llvm-project?rev=57888&view=rev Log: fix run line Modified: llvm/trunk/test/CodeGen/X86/isint.ll Modified: llvm/trunk/test/CodeGen/X86/isint.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/isint.ll?rev=57888&r1=57887&r2=57888&view=diff ============================================================================== --- llvm/trunk/test/CodeGen/X86/isint.ll (original) +++ llvm/trunk/test/CodeGen/X86/isint.ll Mon Oct 20 22:54:49 2008 @@ -1,4 +1,4 @@ -; llvm-as < %s | llc -march=x86 > %t +; RUN: llvm-as < %s | llc -march=x86 > %t ; not grep cmp %t ; not grep xor %t ; grep jne %t | count 1 From sabre at nondot.org Mon Oct 20 22:55:19 2008 From: sabre at nondot.org (Chris Lattner) Date: Tue, 21 Oct 2008 03:55:19 -0000 Subject: [llvm-commits] [llvm] r57889 - /llvm/trunk/test/CodeGen/X86/isint.ll Message-ID: <200810210355.m9L3tJJs016335@zion.cs.uiuc.edu> Author: lattner Date: Mon Oct 20 22:55:19 2008 New Revision: 57889 URL: http://llvm.org/viewvc/llvm-project?rev=57889&view=rev Log: really fix run line Modified: llvm/trunk/test/CodeGen/X86/isint.ll Modified: llvm/trunk/test/CodeGen/X86/isint.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/isint.ll?rev=57889&r1=57888&r2=57889&view=diff ============================================================================== --- llvm/trunk/test/CodeGen/X86/isint.ll (original) +++ llvm/trunk/test/CodeGen/X86/isint.ll Mon Oct 20 22:55:19 2008 @@ -1,12 +1,12 @@ ; RUN: llvm-as < %s | llc -march=x86 > %t -; not grep cmp %t -; not grep xor %t -; grep jne %t | count 1 -; grep jp %t | count 1 -; grep setnp %t | count 1 -; grep sete %t | count 1 -; grep and %t | count 1 -; grep cvt %t | count 4 +; RUN: not grep cmp %t +; RUN: not grep xor %t +; RUN: grep jne %t | count 1 +; RUN: grep jp %t | count 1 +; RUN: grep setnp %t | count 1 +; RUN: grep sete %t | count 1 +; RUN: grep and %t | count 1 +; RUN: grep cvt %t | count 4 define i32 @isint_return(double %d) nounwind { %i = fptosi double %d to i32 From evan.cheng at apple.com Tue Oct 21 00:42:46 2008 From: evan.cheng at apple.com (Evan Cheng) Date: Mon, 20 Oct 2008 22:42:46 -0700 Subject: [llvm-commits] [llvm] r57846 - in /llvm/trunk: include/llvm/System/Memory.h lib/System/Unix/Memory.inc lib/System/Win32/Memory.inc lib/Target/ARM/ARMJITInfo.cpp In-Reply-To: <200810202139.m9KLdOJK004141@zion.cs.uiuc.edu> References: <200810202139.m9KLdOJK004141@zion.cs.uiuc.edu> Message-ID: <5E3E66A9-D54A-43CA-8CB4-E9BC1A42FCCC@apple.com> On Oct 20, 2008, at 2:39 PM, Jim Grosbach wrote: Thanks Jim. Good job getting this working. It's a big step. > > + // Save caller saved registers since they may contain stuff > + // for the real target function right now. We have to act as if > this > + // whole compilation callback doesn't exist as far as the > caller is > + // concerned, so we can't just preserve the callee saved regs. > + "push {r0, r1, r2, r3, lr}\n" Is this code Mac OS X specific? Is "push" accepted by all the assemblers? > > + // The LR contains the address of the stub function on entry. > + // pass it as the argument to the C part of the callback > + "mov r0, lr\n" > + "sub sp, sp, #4\n" > + // Call the C portion of the callback > + "bl " ASMPREFIX "ARMCompilationCallbackC\n" > + "add sp, sp, #4\n" > + // Restoring the LR to the return address of the function that > invoked > + // the stub and de-allocating the stack space for it requires > us to > + // swap the two saved LR values on the stack, as they're > backwards > + // for what we need since the pop instruction has a pre- > determined > + // order for the registers. > + // +--------+ > + // 0 | LR | Original return address > + // +--------+ > + // 1 | LR | Stub address (start of stub) > + // 2-5 | R3..R0 | Saved registers (we need to preserve all regs) > + // +--------+ > + // > + // We need to exchange the values in slots 0 and 1 so we can > + // return to the address in slot 1 with the address in > slot 0 > + // restored to the LR. > + "ldr r0, [sp,#20]\n" > + "ldr r1, [sp,#16]\n" > + "str r1, [sp,#20]\n" > + "str r0, [sp,#16]\n" > + // Return to the (newly modified) stub to invoke the real > function. > + // The above twiddling of the saved return addresses allows us to > + // deallocate everything, including the LR the stub saved, all > in one > + // pop instruction. > + "pop {r0, r1, r2, r3, lr, pc}\n" > ); > #else // Not an ARM host > void ARMCompilationCallback() { > @@ -85,31 +97,37 @@ > #endif > } > > -/// ARMCompilationCallbackC - This is the target-specific function > invoked by the > -/// function stub when we did not know the real target of a call. > This function > -/// must locate the start of the stub or call site and pass it into > the JIT > -/// compiler function. > -extern "C" void ARMCompilationCallbackC(intptr_t *StackPtr, > intptr_t RetAddr) { > - intptr_t *RetAddrLoc = &StackPtr[-1]; > - > - assert(*RetAddrLoc == RetAddr && > - "Could not find return address on the stack!"); > -#if 0 > - DOUT << "In callback! Addr=" << (void*)RetAddr > - << " FP=" << (void*)StackPtr > - << ": Resolving call to function: " > - << TheVM->getFunctionReferencedName((void*)RetAddr) << "\n"; > -#endif > - intptr_t Addr = RetAddr - 4; > - > - intptr_t NewVal = (intptr_t)JITCompilerFunction((void*)Addr); > +/// ARMCompilationCallbackC - This is the target-specific function > invoked > +/// by the function stub when we did not know the real target of a > call. > +/// This function must locate the start of the stub or call site > and pass > +/// it into the JIT compiler function. > +extern "C" void ARMCompilationCallbackC(intptr_t StubAddr) { > + // Get the address of the compiled code for this function. > + intptr_t NewVal = (intptr_t)JITCompilerFunction((void*)StubAddr); > > // Rewrite the call target... so that we don't end up here every > time we > - // execute the call. > - *(intptr_t *)Addr = NewVal; > - > - // Change the return address to reexecute the branch and link > instruction... > - *RetAddrLoc -= 12; > + // execute the call. We're replacing the first two instructions > of the > + // stub with: > + // ldr pc, [pc,#-4] > + // > +#if defined(__APPLE__) > + bool ok = sys::Memory::setRangeWritable ((void*)StubAddr, 8); This works. But it's probably somewhat inefficient. Do you have any ideas for improving the efficiency? I have some ideas, we should talk about it. Thanks, Evan > > + if (!ok) > + { > + cerr << "ERROR: Unable to mark stub writable\n"; > + abort(); > + } > +#endif > + *(intptr_t *)StubAddr = 0xe51ff004; > + *(intptr_t *)(StubAddr+4) = NewVal; > +#if defined(__APPLE__) > + ok = sys::Memory::setRangeExecutable ((void*)StubAddr, 8); > + if (!ok) > + { > + cerr << "ERROR: Unable to mark stub executable\n"; > + abort(); > + } > +#endif > } > > TargetJITInfo::LazyResolverFn > @@ -127,17 +145,27 @@ > // branch to the corresponding function addr > // the stub is 8-byte size and 4-aligned > MCE.startFunctionStub(F, 8, 4); > - MCE.emitWordLE(0xE51FF004); // LDR PC, [PC,#-4] > + MCE.emitWordLE(0xe51ff004); // LDR PC, [PC,#-4] > MCE.emitWordLE(addr); // addr of function > } else { > - // branch and link to the corresponding function addr > - // the stub is 20-byte size and 4-aligned > - MCE.startFunctionStub(F, 20, 4); > - MCE.emitWordLE(0xE92D4800); // STMFD SP!, [R11, LR] > - MCE.emitWordLE(0xE28FE004); // ADD LR, PC, #4 > - MCE.emitWordLE(0xE51FF004); // LDR PC, [PC,#-4] > - MCE.emitWordLE(addr); // addr of function > - MCE.emitWordLE(0xE8BD8800); // LDMFD SP!, [R11, PC] > + // The compilation callback will overwrite the first two words > of this > + // stub with indirect branch instructions targeting the > compiled code. > + // This stub sets the return address to restart the stub, so that > + // the new branch will be invoked when we come back. > + // > + // branch and link to the compilation callback. > + // the stub is 16-byte size and 4-byte aligned. > + MCE.startFunctionStub(F, 16, 4); > + // Save LR so the callback can determine which stub called it. > + // The compilation callback is responsible for popping this prior > + // to returning. > + MCE.emitWordLE(0xe92d4000); // PUSH {lr} > + // Set the return address to go back to the start of this stub > + MCE.emitWordLE(0xe24fe00c); // SUB LR, PC, #12 > + // Invoke the compilation callback > + MCE.emitWordLE(0xe51ff004); // LDR PC, [PC,#-4] > + // The address of the compilation callback > + MCE.emitWordLE((intptr_t)ARMCompilationCallback); > } > > return MCE.finishFunctionStub(F); > > > _______________________________________________ > llvm-commits mailing list > llvm-commits at cs.uiuc.edu > http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits From kremenek at apple.com Tue Oct 21 00:59:33 2008 From: kremenek at apple.com (Ted Kremenek) Date: Tue, 21 Oct 2008 05:59:33 -0000 Subject: [llvm-commits] [llvm] r57894 - /llvm/trunk/include/llvm/ADT/ImmutableList.h Message-ID: <200810210559.m9L5xXvk020140@zion.cs.uiuc.edu> Author: kremenek Date: Tue Oct 21 00:59:33 2008 New Revision: 57894 URL: http://llvm.org/viewvc/llvm-project?rev=57894&view=rev Log: constify some methods and variables in ImmutableList. Modified: llvm/trunk/include/llvm/ADT/ImmutableList.h Modified: llvm/trunk/include/llvm/ADT/ImmutableList.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ADT/ImmutableList.h?rev=57894&r1=57893&r2=57894&view=diff ============================================================================== --- llvm/trunk/include/llvm/ADT/ImmutableList.h (original) +++ llvm/trunk/include/llvm/ADT/ImmutableList.h Tue Oct 21 00:59:33 2008 @@ -26,9 +26,9 @@ template class ImmutableListImpl : public FoldingSetNode { T Head; - ImmutableListImpl* Tail; + const ImmutableListImpl* Tail; - ImmutableListImpl(const T& head, ImmutableListImpl* tail = 0) + ImmutableListImpl(const T& head, const ImmutableListImpl* tail = 0) : Head(head), Tail(tail) {} friend class ImmutableListFactory; @@ -39,10 +39,10 @@ public: const T& getHead() const { return Head; } - ImmutableListImpl* getTail() const { return Tail; } + const ImmutableListImpl* getTail() const { return Tail; } static inline void Profile(FoldingSetNodeID& ID, const T& H, - ImmutableListImpl* L){ + const ImmutableListImpl* L){ ID.AddPointer(L); ID.Add(H); } @@ -67,20 +67,20 @@ typedef ImmutableListFactory Factory; private: - ImmutableListImpl* X; + const ImmutableListImpl* X; public: // This constructor should normally only be called by ImmutableListFactory. // There may be cases, however, when one needs to extract the internal pointer // and reconstruct a list object from that pointer. - ImmutableList(ImmutableListImpl* x = 0) : X(x) {} + ImmutableList(const ImmutableListImpl* x = 0) : X(x) {} - ImmutableListImpl* getInternalPointer() const { + const ImmutableListImpl* getInternalPointer() const { return X; } class iterator { - ImmutableListImpl* L; + const ImmutableListImpl* L; public: iterator() : L(0) {} iterator(ImmutableList l) : L(l.getInternalPointer()) {} @@ -157,7 +157,7 @@ FoldingSetNodeID ID; void* InsertPos; - ListTy* TailImpl = Tail.getInternalPointer(); + const ListTy* TailImpl = Tail.getInternalPointer(); ListTy::Profile(ID, Head, TailImpl); ListTy* L = Cache.FindNodeOrInsertPos(ID, InsertPos); From baldrick at free.fr Tue Oct 21 02:41:52 2008 From: baldrick at free.fr (Duncan Sands) Date: Tue, 21 Oct 2008 09:41:52 +0200 Subject: [llvm-commits] [llvm] r57846 - in /llvm/trunk: include/llvm/System/Memory.h lib/System/Unix/Memory.inc lib/System/Win32/Memory.inc lib/Target/ARM/ARMJITInfo.cpp In-Reply-To: <200810202139.m9KLdOJK004141@zion.cs.uiuc.edu> References: <200810202139.m9KLdOJK004141@zion.cs.uiuc.edu> Message-ID: <200810210941.52782.baldrick@free.fr> > Added back in range-based memory permission functions for the updating of > the stub on Darwin. Is this really Darwin specific? Also, there doesn't seem to be any need for the #if defined(__APPLE__) in these kinds of places: +#if defined(__APPLE__) + ok = sys::Memory::setRangeExecutable ((void*)StubAddr, 8); + if (!ok) + { + cerr << "ERROR: Unable to mark stub executable\n"; + abort(); + } +#endif After all, the functions complete successfully on non-__APPLE__ platforms. Ciao, Duncan. From nunoplopes at sapo.pt Tue Oct 21 06:42:23 2008 From: nunoplopes at sapo.pt (Nuno Lopes) Date: Tue, 21 Oct 2008 11:42:23 -0000 Subject: [llvm-commits] [llvm] r57900 - in /llvm/trunk: include/llvm/CodeGen/MachineCodeEmitter.h include/llvm/ExecutionEngine/JITMemoryManager.h lib/ExecutionEngine/JIT/JITEmitter.cpp lib/ExecutionEngine/JIT/JITMemoryManager.cpp Message-ID: <200810211142.m9LBgO0s008638@zion.cs.uiuc.edu> Author: nlopes Date: Tue Oct 21 06:42:16 2008 New Revision: 57900 URL: http://llvm.org/viewvc/llvm-project?rev=57900&view=rev Log: fix a tricky bug in the JIT global variable emitter, that was triggered when JITing a variable independently of a function. This lead to sharing memory memory between functions and GVs thus changing the value of a GV could change the code in execution. more details on the ML. Modified: llvm/trunk/include/llvm/CodeGen/MachineCodeEmitter.h llvm/trunk/include/llvm/ExecutionEngine/JITMemoryManager.h llvm/trunk/lib/ExecutionEngine/JIT/JITEmitter.cpp llvm/trunk/lib/ExecutionEngine/JIT/JITMemoryManager.cpp Modified: llvm/trunk/include/llvm/CodeGen/MachineCodeEmitter.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/MachineCodeEmitter.h?rev=57900&r1=57899&r2=57900&view=diff ============================================================================== --- llvm/trunk/include/llvm/CodeGen/MachineCodeEmitter.h (original) +++ llvm/trunk/include/llvm/CodeGen/MachineCodeEmitter.h Tue Oct 21 06:42:16 2008 @@ -207,7 +207,7 @@ /// allocateSpace - Allocate a block of space in the current output buffer, /// returning null (and setting conditions to indicate buffer overflow) on /// failure. Alignment is the alignment in bytes of the buffer desired. - void *allocateSpace(intptr_t Size, unsigned Alignment) { + virtual void *allocateSpace(intptr_t Size, unsigned Alignment) { emitAlignment(Alignment); void *Result = CurBufferPtr; Modified: llvm/trunk/include/llvm/ExecutionEngine/JITMemoryManager.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ExecutionEngine/JITMemoryManager.h?rev=57900&r1=57899&r2=57900&view=diff ============================================================================== --- llvm/trunk/include/llvm/ExecutionEngine/JITMemoryManager.h (original) +++ llvm/trunk/include/llvm/ExecutionEngine/JITMemoryManager.h Tue Oct 21 06:42:16 2008 @@ -101,6 +101,9 @@ /// and remember where it is in case the client wants to deallocate it. virtual void endFunctionBody(const Function *F, unsigned char *FunctionStart, unsigned char *FunctionEnd) = 0; + + /// allocateSpace - Allocate a memory block of the given size. + virtual unsigned char *allocateSpace(intptr_t Size, unsigned Alignment) = 0; /// deallocateMemForFunction - Free JIT memory for the specified function. /// This is never called when the JIT is currently emitting a function. Modified: llvm/trunk/lib/ExecutionEngine/JIT/JITEmitter.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/JIT/JITEmitter.cpp?rev=57900&r1=57899&r2=57900&view=diff ============================================================================== --- llvm/trunk/lib/ExecutionEngine/JIT/JITEmitter.cpp (original) +++ llvm/trunk/lib/ExecutionEngine/JIT/JITEmitter.cpp Tue Oct 21 06:42:16 2008 @@ -518,6 +518,10 @@ unsigned Alignment = 1); virtual void* finishFunctionStub(const GlobalValue *F); + /// allocateSpace - Reserves space in the current block if any, or + /// allocate a new one of the given size. + virtual void *allocateSpace(intptr_t Size, unsigned Alignment); + virtual void addRelocation(const MachineRelocation &MR) { Relocations.push_back(MR); } @@ -915,11 +919,6 @@ Relocations.size(), MemMgr->getGOTBase()); } - unsigned char *FnEnd = CurBufferPtr; - - MemMgr->endFunctionBody(F.getFunction(), BufferBegin, FnEnd); - NumBytes += FnEnd-FnStart; - // Update the GOT entry for F to point to the new code. if (MemMgr->isManagingGOT()) { unsigned idx = Resolver.getGOTIndexForAddr((void*)BufferBegin); @@ -930,6 +929,12 @@ } } + unsigned char *FnEnd = CurBufferPtr; + + MemMgr->endFunctionBody(F.getFunction(), BufferBegin, FnEnd); + BufferBegin = CurBufferPtr = 0; + NumBytes += FnEnd-FnStart; + // Invalidate the icache if necessary. sys::Memory::InvalidateInstructionCache(FnStart, FnEnd-FnStart); @@ -993,6 +998,18 @@ return false; } +void* JITEmitter::allocateSpace(intptr_t Size, unsigned Alignment) { + if (BufferBegin) + return MachineCodeEmitter::allocateSpace(Size, Alignment); + + // create a new memory block if there is no active one. + // care must be taken so that BufferBegin is invalidated when a + // block is trimmed + BufferBegin = CurBufferPtr = MemMgr->allocateSpace(Size, Alignment); + BufferEnd = BufferBegin+Size; + return CurBufferPtr; +} + void JITEmitter::emitConstantPool(MachineConstantPool *MCP) { const std::vector &Constants = MCP->getConstants(); if (Constants.empty()) return; Modified: llvm/trunk/lib/ExecutionEngine/JIT/JITMemoryManager.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/JIT/JITMemoryManager.cpp?rev=57900&r1=57899&r2=57900&view=diff ============================================================================== --- llvm/trunk/lib/ExecutionEngine/JIT/JITMemoryManager.cpp (original) +++ llvm/trunk/lib/ExecutionEngine/JIT/JITMemoryManager.cpp Tue Oct 21 06:42:16 2008 @@ -298,7 +298,24 @@ // Release the memory at the end of this block that isn't needed. FreeMemoryList =CurBlock->TrimAllocationToSize(FreeMemoryList, BlockSize); } - + + /// allocateSpace - Allocate a memory block of the given size. + unsigned char *allocateSpace(intptr_t Size, unsigned Alignment) { + CurBlock = FreeMemoryList; + FreeMemoryList = FreeMemoryList->AllocateBlock(); + + unsigned char *result = (unsigned char *)CurBlock+1; + + if (Alignment == 0) Alignment = 1; + result = (unsigned char*)(((intptr_t)result+Alignment-1) & + ~(intptr_t)(Alignment-1)); + + uintptr_t BlockSize = result + Size - (unsigned char *)CurBlock; + FreeMemoryList =CurBlock->TrimAllocationToSize(FreeMemoryList, BlockSize); + + return result; + } + /// startExceptionTable - Use startFunctionBody to allocate memory for the /// function's exception table. unsigned char* startExceptionTable(const Function* F, From criswell at uiuc.edu Tue Oct 21 09:42:01 2008 From: criswell at uiuc.edu (John Criswell) Date: Tue, 21 Oct 2008 14:42:01 -0000 Subject: [llvm-commits] [poolalloc] r57905 - /poolalloc/trunk/include/poolalloc_runtime/Support/SplayTree.h Message-ID: <200810211442.m9LEg17g015751@zion.cs.uiuc.edu> Author: criswell Date: Tue Oct 21 09:42:00 2008 New Revision: 57905 URL: http://llvm.org/viewvc/llvm-project?rev=57905&view=rev Log: Fixed compilation error in SAFECode runtime. It seems that RangeSplayTree will place the type T in a range_tree_node<> on its own, so RangeSplayMap does not need to do it explicitly. Modified: poolalloc/trunk/include/poolalloc_runtime/Support/SplayTree.h Modified: poolalloc/trunk/include/poolalloc_runtime/Support/SplayTree.h URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/include/poolalloc_runtime/Support/SplayTree.h?rev=57905&r1=57904&r2=57905&view=diff ============================================================================== --- poolalloc/trunk/include/poolalloc_runtime/Support/SplayTree.h (original) +++ poolalloc/trunk/include/poolalloc_runtime/Support/SplayTree.h Tue Oct 21 09:42:00 2008 @@ -232,7 +232,7 @@ template > class RangeSplayMap { - RangeSplayTree, Allocator> Tree; + RangeSplayTree Tree; public: explicit RangeSplayMap(const Allocator& A= Allocator() ) From alenhar2 at cs.uiuc.edu Tue Oct 21 09:48:21 2008 From: alenhar2 at cs.uiuc.edu (Andrew Lenharth) Date: Tue, 21 Oct 2008 14:48:21 -0000 Subject: [llvm-commits] [poolalloc] r57906 - /poolalloc/trunk/include/poolalloc_runtime/test.ex Message-ID: <200810211448.m9LEmLKC015977@zion.cs.uiuc.edu> Author: alenhar2 Date: Tue Oct 21 09:48:20 2008 New Revision: 57906 URL: http://llvm.org/viewvc/llvm-project?rev=57906&view=rev Log: fix this for the map too, not just the set Modified: poolalloc/trunk/include/poolalloc_runtime/test.ex Modified: poolalloc/trunk/include/poolalloc_runtime/test.ex URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/include/poolalloc_runtime/test.ex?rev=57906&r1=57905&r2=57906&view=diff ============================================================================== --- poolalloc/trunk/include/poolalloc_runtime/test.ex (original) +++ poolalloc/trunk/include/poolalloc_runtime/test.ex Tue Oct 21 09:48:20 2008 @@ -6,7 +6,7 @@ PoolAllocator, MallocSlabManager<> > > c(8, 8); -RangeSplayMap x; +RangeSplayMap ma; int main() { void* x = a.alloc(); @@ -24,6 +24,8 @@ c.dealloc(x); c.dealloc(y); + unsigned asdf = 2; + ma.insert((void*)0, (void*)1, asdf); return 0; } From grosbach at apple.com Tue Oct 21 10:22:44 2008 From: grosbach at apple.com (Jim Grosbach) Date: Tue, 21 Oct 2008 08:22:44 -0700 Subject: [llvm-commits] [llvm] r57846 - in /llvm/trunk: include/llvm/System/Memory.h lib/System/Unix/Memory.inc lib/System/Win32/Memory.inc lib/Target/ARM/ARMJITInfo.cpp In-Reply-To: <5E3E66A9-D54A-43CA-8CB4-E9BC1A42FCCC@apple.com> References: <200810202139.m9KLdOJK004141@zion.cs.uiuc.edu> <5E3E66A9-D54A-43CA-8CB4-E9BC1A42FCCC@apple.com> Message-ID: <8EB5CE96-3003-4DAB-A22B-2E7039765B43@apple.com> On Oct 20, 2008, at 10:42 PM, Evan Cheng wrote: > > On Oct 20, 2008, at 2:39 PM, Jim Grosbach wrote: > > Thanks Jim. Good job getting this working. It's a big step. > >> >> + // Save caller saved registers since they may contain stuff >> + // for the real target function right now. We have to act as if >> this >> + // whole compilation callback doesn't exist as far as the >> caller is >> + // concerned, so we can't just preserve the callee saved regs. >> + "push {r0, r1, r2, r3, lr}\n" > > Is this code Mac OS X specific? Is "push" accepted by all the > assemblers? > It's standard, but relatively recent (sometime in the last few years, depending on toolchain) for the mnemonic to be recognized in ARM state. How concerned are we about older assemblers? > > This works. But it's probably somewhat inefficient. Do you have any > ideas for improving the efficiency? I have some ideas, we should talk > about it. A bit. Not a huge amount, though. At this point, I was mainly just focused on correctness. That said, there's a few things I've been tossing around in the back of my head. I'd love to hear any ideas you have as well. There's a strange constant pool thing I was hoping to find time to bounce off of you today, anyway, so we can kill two birds with one conversation. I haven't been very concerned about making the compilation hooks all that efficient, really. Any time spent there is going to be so swamped by the compilation (or probably even just the function address lookup), that it didn't seem worth it, at least in a first pass. Seem reasonable to you? Where I want things to be relatively quick is in subsequent invocations, which is why I re-write the stub to be just an indirect branch. The tweak I'd like to make there is to check the range of the branch and use a direct branch instruction instead if possible. We know both addresses, after all, so there's no unknowns we have to be pessimistic about. Similarly, I'm thinking about putting in some logic to go all the way back to the original call point and adjusting the call instruction there, if it's a direct branch. -Jim From grosbach at apple.com Tue Oct 21 10:26:38 2008 From: grosbach at apple.com (Jim Grosbach) Date: Tue, 21 Oct 2008 08:26:38 -0700 Subject: [llvm-commits] [llvm] r57846 - in /llvm/trunk: include/llvm/System/Memory.h lib/System/Unix/Memory.inc lib/System/Win32/Memory.inc lib/Target/ARM/ARMJITInfo.cpp In-Reply-To: <200810210941.52782.baldrick@free.fr> References: <200810202139.m9KLdOJK004141@zion.cs.uiuc.edu> <200810210941.52782.baldrick@free.fr> Message-ID: On Oct 21, 2008, at 12:41 AM, Duncan Sands wrote: >> Added back in range-based memory permission functions for the >> updating of >> the stub on Darwin. > > Is this really Darwin specific? > Also, there doesn't seem to be any need for the #if defined(__APPLE__) > in these kinds of places: > True. At the moment, it's Darwin specific, yes. Normally, the memory is allocated read-write-execute and none of the twiddling about is necessary at all. The ifdef here isn't strictly necessary, regardless, as you point out. Not something I feel strongly about at all. Prefer having it always execute? > +#if defined(__APPLE__) > + ok = sys::Memory::setRangeExecutable ((void*)StubAddr, 8); > + if (!ok) > + { > + cerr << "ERROR: Unable to mark stub executable\n"; > + abort(); > + } > +#endif > > After all, the functions complete successfully on non-__APPLE__ > platforms. > > Ciao, > > Duncan. From evan.cheng at apple.com Tue Oct 21 11:24:30 2008 From: evan.cheng at apple.com (Evan Cheng) Date: Tue, 21 Oct 2008 09:24:30 -0700 Subject: [llvm-commits] [llvm] r57846 - in /llvm/trunk: include/llvm/System/Memory.h lib/System/Unix/Memory.inc lib/System/Win32/Memory.inc lib/Target/ARM/ARMJITInfo.cpp In-Reply-To: <8EB5CE96-3003-4DAB-A22B-2E7039765B43@apple.com> References: <200810202139.m9KLdOJK004141@zion.cs.uiuc.edu> <5E3E66A9-D54A-43CA-8CB4-E9BC1A42FCCC@apple.com> <8EB5CE96-3003-4DAB-A22B-2E7039765B43@apple.com> Message-ID: <1B266834-90E6-4CD4-B072-0F4A40CBB6CD@apple.com> On Oct 21, 2008, at 8:22 AM, Jim Grosbach wrote: > > On Oct 20, 2008, at 10:42 PM, Evan Cheng wrote: > >> >> On Oct 20, 2008, at 2:39 PM, Jim Grosbach wrote: >> >> Thanks Jim. Good job getting this working. It's a big step. >> >>> >>> + // Save caller saved registers since they may contain stuff >>> + // for the real target function right now. We have to act as if >>> this >>> + // whole compilation callback doesn't exist as far as the >>> caller is >>> + // concerned, so we can't just preserve the callee saved regs. >>> + "push {r0, r1, r2, r3, lr}\n" >> >> Is this code Mac OS X specific? Is "push" accepted by all the >> assemblers? >> > > It's standard, but relatively recent (sometime in the last few years, > depending on toolchain) for the mnemonic to be recognized in ARM > state. How concerned are we about older assemblers? I think we should use mnemonic that are as widely accepted as possible. I believe the original author did test the callback routine on his target. We should be careful not to break it. > >> >> This works. But it's probably somewhat inefficient. Do you have any >> ideas for improving the efficiency? I have some ideas, we should talk >> about it. > > > A bit. Not a huge amount, though. At this point, I was mainly just > focused on correctness. That said, there's a few things I've been > tossing around in the back of my head. I'd love to hear any ideas you > have as well. There's a strange constant pool thing I was hoping to > find time to bounce off of you today, anyway, so we can kill two birds > with one conversation. Sure. > > > I haven't been very concerned about making the compilation hooks all > that efficient, really. Any time spent there is going to be so swamped > by the compilation (or probably even just the function address > lookup), that it didn't seem worth it, at least in a first pass. Seem > reasonable to you? Right. I am not too concerned with getting it perfect at this point. It's definitely not a critical task. That said, this is something we should plan on cleaning up later. I am actually more concerned with "cleanliness" than anything else. Having the stub making a system call to change memory privilege just seem icky to me. My basic idea is to allocate a chunk RX memory for code (like what's being done now) and a chunk of RW memory for data and anything that's going to be changed during execution (i.e. putting addresses of lazily compiled functions there). This will require a larger scale rewrite so it's not something that should be planned for the near future. > > > Where I want things to be relatively quick is in subsequent > invocations, which is why I re-write the stub to be just an indirect > branch. The tweak I'd like to make there is to check the range of the > branch and use a direct branch instruction instead if possible. We > know both addresses, after all, so there's no unknowns we have to be > pessimistic about. Similarly, I'm thinking about putting in some logic > to go all the way back to the original call point and adjusting the > call instruction there, if it's a direct branch. Sounds good. Evan > > > -Jim > _______________________________________________ > llvm-commits mailing list > llvm-commits at cs.uiuc.edu > http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits From grosbach at apple.com Tue Oct 21 11:36:58 2008 From: grosbach at apple.com (Jim Grosbach) Date: Tue, 21 Oct 2008 09:36:58 -0700 Subject: [llvm-commits] [llvm] r57846 - in /llvm/trunk: include/llvm/System/Memory.h lib/System/Unix/Memory.inc lib/System/Win32/Memory.inc lib/Target/ARM/ARMJITInfo.cpp In-Reply-To: <1B266834-90E6-4CD4-B072-0F4A40CBB6CD@apple.com> References: <200810202139.m9KLdOJK004141@zion.cs.uiuc.edu> <5E3E66A9-D54A-43CA-8CB4-E9BC1A42FCCC@apple.com> <8EB5CE96-3003-4DAB-A22B-2E7039765B43@apple.com> <1B266834-90E6-4CD4-B072-0F4A40CBB6CD@apple.com> Message-ID: <9063F4D1-6023-455F-9970-A4CBDE0CDFF8@apple.com> On Oct 21, 2008, at 9:24 AM, Evan Cheng wrote: >>> Is this code Mac OS X specific? Is "push" accepted by all the >>> assemblers? >>> >> >> It's standard, but relatively recent (sometime in the last few years, >> depending on toolchain) for the mnemonic to be recognized in ARM >> state. How concerned are we about older assemblers? > > I think we should use mnemonic that are as widely accepted as > possible. I believe the original author did test the callback routine > on his target. We should be careful not to break it. > Sounds good. I'll tweak it this morning. > Having the stub making a system > call to change memory privilege just seem icky to me. My basic idea is > to allocate a chunk RX memory for code (like what's being done now) > and a chunk of RW memory for data and anything that's going to be > changed during execution (i.e. putting addresses of lazily compiled > functions there). This will require a larger scale rewrite so it's not > something that should be planned for the near future. > No disagreement here. I played with that for a while, but it gets pretty hairy, especially with lazy compilation. I backed off and chose to get it working first, even with the ugly syscalls. Not that in re- writing the stub we're writing not just an address, but an instruction, for example. The meta-data for the memory blocks are another tricky spot. Doing something about this stuff would require a new, or at least significantly re-worked, JIT Memory Manager, possibly one that's target specific. As you say, a pretty significant refactoring and probably outside the scope of what we want to look at right now. From evan.cheng at apple.com Tue Oct 21 11:52:57 2008 From: evan.cheng at apple.com (Evan Cheng) Date: Tue, 21 Oct 2008 09:52:57 -0700 Subject: [llvm-commits] [llvm] r57846 - in /llvm/trunk: include/llvm/System/Memory.h lib/System/Unix/Memory.inc lib/System/Win32/Memory.inc lib/Target/ARM/ARMJITInfo.cpp In-Reply-To: <9063F4D1-6023-455F-9970-A4CBDE0CDFF8@apple.com> References: <200810202139.m9KLdOJK004141@zion.cs.uiuc.edu> <5E3E66A9-D54A-43CA-8CB4-E9BC1A42FCCC@apple.com> <8EB5CE96-3003-4DAB-A22B-2E7039765B43@apple.com> <1B266834-90E6-4CD4-B072-0F4A40CBB6CD@apple.com> <9063F4D1-6023-455F-9970-A4CBDE0CDFF8@apple.com> Message-ID: <040D546A-26BC-419B-8AEA-413A53E367B5@apple.com> On Oct 21, 2008, at 9:36 AM, Jim Grosbach wrote: > > On Oct 21, 2008, at 9:24 AM, Evan Cheng wrote: >>>> Is this code Mac OS X specific? Is "push" accepted by all the >>>> assemblers? >>>> >>> >>> It's standard, but relatively recent (sometime in the last few >>> years, >>> depending on toolchain) for the mnemonic to be recognized in ARM >>> state. How concerned are we about older assemblers? >> >> I think we should use mnemonic that are as widely accepted as >> possible. I believe the original author did test the callback routine >> on his target. We should be careful not to break it. >> > > Sounds good. I'll tweak it this morning. Thanks. > > >> Having the stub making a system >> call to change memory privilege just seem icky to me. My basic idea >> is >> to allocate a chunk RX memory for code (like what's being done now) >> and a chunk of RW memory for data and anything that's going to be >> changed during execution (i.e. putting addresses of lazily compiled >> functions there). This will require a larger scale rewrite so it's >> not >> something that should be planned for the near future. >> > > No disagreement here. I played with that for a while, but it gets > pretty hairy, especially with lazy compilation. I backed off and chose > to get it working first, even with the ugly syscalls. Not that in re- > writing the stub we're writing not just an address, but an > instruction, for example. The meta-data for the memory blocks are > another tricky spot. This can be simplified if codegen always generate indirect calls and the addresses are always loaded from the RW region. We can populate them with the address of the callback routine first and update them as lazy compilation happens. > > > Doing something about this stuff would require a new, or at least > significantly re-worked, JIT Memory Manager, possibly one that's > target specific. As you say, a pretty significant refactoring and > probably outside the scope of what we want to look at right now. Yep. Not something we want to deal with right now. Evan > > > _______________________________________________ > llvm-commits mailing list > llvm-commits at cs.uiuc.edu > http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits From grosbach at apple.com Tue Oct 21 11:54:19 2008 From: grosbach at apple.com (Jim Grosbach) Date: Tue, 21 Oct 2008 16:54:19 -0000 Subject: [llvm-commits] [llvm] r57911 - /llvm/trunk/lib/Target/ARM/ARMJITInfo.cpp Message-ID: <200810211654.m9LGsJJO020453@zion.cs.uiuc.edu> Author: grosbach Date: Tue Oct 21 11:54:12 2008 New Revision: 57911 URL: http://llvm.org/viewvc/llvm-project?rev=57911&view=rev Log: use pre-UAL mnemonics for push/pop for compilaton callback function Modified: llvm/trunk/lib/Target/ARM/ARMJITInfo.cpp Modified: llvm/trunk/lib/Target/ARM/ARMJITInfo.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMJITInfo.cpp?rev=57911&r1=57910&r2=57911&view=diff ============================================================================== --- llvm/trunk/lib/Target/ARM/ARMJITInfo.cpp (original) +++ llvm/trunk/lib/Target/ARM/ARMJITInfo.cpp Tue Oct 21 11:54:12 2008 @@ -56,7 +56,7 @@ // for the real target function right now. We have to act as if this // whole compilation callback doesn't exist as far as the caller is // concerned, so we can't just preserve the callee saved regs. - "push {r0, r1, r2, r3, lr}\n" + "stmdb sp!, {r0, r1, r2, r3, lr}\n" // The LR contains the address of the stub function on entry. // pass it as the argument to the C part of the callback "mov r0, lr\n" @@ -87,7 +87,7 @@ // The above twiddling of the saved return addresses allows us to // deallocate everything, including the LR the stub saved, all in one // pop instruction. - "pop {r0, r1, r2, r3, lr, pc}\n" + "ldmia sp!, {r0, r1, r2, r3, lr, pc}\n" ); #else // Not an ARM host void ARMCompilationCallback() { From baldrick at free.fr Tue Oct 21 12:10:54 2008 From: baldrick at free.fr (Duncan Sands) Date: Tue, 21 Oct 2008 19:10:54 +0200 Subject: [llvm-commits] [llvm] r57846 - in /llvm/trunk: include/llvm/System/Memory.h lib/System/Unix/Memory.inc lib/System/Win32/Memory.inc lib/Target/ARM/ARMJITInfo.cpp In-Reply-To: References: <200810202139.m9KLdOJK004141@zion.cs.uiuc.edu> <200810210941.52782.baldrick@free.fr> Message-ID: <200810211910.54989.baldrick@free.fr> Hi Jim, > The ifdef here isn't strictly necessary, regardless, as you point out. > Not something I feel strongly about at all. Prefer having it always > execute? personally I'd prefer to have it always execute. Ciao, Duncan. > > +#if defined(__APPLE__) > > + ok = sys::Memory::setRangeExecutable ((void*)StubAddr, 8); > > + if (!ok) > > + { > > + cerr << "ERROR: Unable to mark stub executable\n"; > > + abort(); > > + } > > +#endif > > > > After all, the functions complete successfully on non-__APPLE__ > > platforms. > > > > Ciao, > > > > Duncan. > > From edwintorok at gmail.com Tue Oct 21 12:21:33 2008 From: edwintorok at gmail.com (Torok Edwin) Date: Tue, 21 Oct 2008 17:21:33 -0000 Subject: [llvm-commits] [llvm] r57912 - in /llvm/trunk: Makefile.config.in autoconf/configure.ac test/Makefile test/lib/llvm.exp Message-ID: <200810211721.m9LHLXSW021465@zion.cs.uiuc.edu> Author: edwin Date: Tue Oct 21 12:21:32 2008 New Revision: 57912 URL: http://llvm.org/viewvc/llvm-project?rev=57912&view=rev Log: Fix make check on Solaris 10/x86: the default grep is not GNU grep, same for as. Modified: llvm/trunk/Makefile.config.in llvm/trunk/autoconf/configure.ac llvm/trunk/test/Makefile llvm/trunk/test/lib/llvm.exp Modified: llvm/trunk/Makefile.config.in URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/Makefile.config.in?rev=57912&r1=57911&r2=57912&view=diff ============================================================================== --- llvm/trunk/Makefile.config.in (original) +++ llvm/trunk/Makefile.config.in Tue Oct 21 12:21:32 2008 @@ -160,6 +160,7 @@ OCAMLOPT := @OCAMLOPT@ OCAMLDEP := @OCAMLDEP@ OCAMLDOC := @OCAMLDOC@ +GAS := @GAS@ POD2HTML := @POD2HTML@ POD2MAN := @POD2MAN@ RUNTEST := @RUNTEST@ Modified: llvm/trunk/autoconf/configure.ac URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/autoconf/configure.ac?rev=57912&r1=57911&r2=57912&view=diff ============================================================================== --- llvm/trunk/autoconf/configure.ac (original) +++ llvm/trunk/autoconf/configure.ac Tue Oct 21 12:21:32 2008 @@ -614,6 +614,7 @@ AC_PATH_PROGS(OCAMLOPT, [ocamlopt.opt ocamlopt]) AC_PATH_PROGS(OCAMLDEP, [ocamldep.opt ocamldep]) AC_PATH_PROGS(OCAMLDOC, [ocamldoc.opt ocamldoc]) +AC_PATH_PROGS(GAS, [gas as]) dnl Determine if the linker supports the -R option. AC_LINK_USE_R Modified: llvm/trunk/test/Makefile URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Makefile?rev=57912&r1=57911&r2=57912&view=diff ============================================================================== --- llvm/trunk/test/Makefile (original) +++ llvm/trunk/test/Makefile Tue Oct 21 12:21:32 2008 @@ -110,6 +110,8 @@ @echo 'set shlibext "$(SHLIBEXT)"' >> site.tmp @echo 'set ocamlc "$(OCAMLC) -cc $(CXX) -I $(LibDir)/ocaml"' >> site.tmp @echo 'set valgrind "$(VALGRIND)"' >> site.tmp + @echo 'set grep "$(GREP)"' >>site.tmp + @echo 'set gas "$(GAS)"' >>site.tmp @echo '## All variables above are generated by configure. Do Not Edit ## ' >>site.tmp @test ! -f site.exp || \ sed '1,/^## All variables above are.*##/ d' site.exp >> site.tmp Modified: llvm/trunk/test/lib/llvm.exp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/lib/llvm.exp?rev=57912&r1=57911&r2=57912&view=diff ============================================================================== --- llvm/trunk/test/lib/llvm.exp (original) +++ llvm/trunk/test/lib/llvm.exp Tue Oct 21 12:21:32 2008 @@ -49,7 +49,7 @@ global srcroot objroot srcdir objdir subdir target_triplet prcontext global llvmgcc llvmgxx llvmgcc_version llvmgccmajvers ocamlc global gccpath gxxpath compile_c compile_cxx link shlibext llvmlibsdir - global valgrind + global valgrind grep gas set path [file join $srcdir $subdir] # Substitute all Tcl variables. @@ -84,6 +84,11 @@ #replace _#MARKER#_ with % regsub -all {_#MARKER#_} $new_line % new_line + #replace grep with GNU grep + regsub -all { grep } $new_line " $grep " new_line + #replace as with GNU as + regsub -all {\| as } $new_line "| $gas " new_line + #valgind related stuff # regsub -all {bugpoint } $new_line "$valgrind bugpoint " new_line regsub -all {llc } $new_line "$valgrind llc " new_line From edwintorok at gmail.com Tue Oct 21 12:22:24 2008 From: edwintorok at gmail.com (=?ISO-8859-1?Q?T=F6r=F6k_Edvin?=) Date: Tue, 21 Oct 2008 20:22:24 +0300 Subject: [llvm-commits] {PATCH] fix 'make check' on Solaris10 In-Reply-To: References: <4354d3270810181030l6c93a546gd800642e7d9b93ea@mail.gmail.com> Message-ID: <4354d3270810211022v63de47d8qa06745f4e2991492@mail.gmail.com> On Tue, Oct 21, 2008 at 01:59, Eric Christopher wrote: > > On Oct 18, 2008, at 11:25 AM, Chris Lattner wrote: > >> This looks good to me, but I'm not autoconf wizard :). Eric, can >> you take a look? > > Yep. It should be good. > Thanks committed in SVN r57912. Should I also commit the new configure? (I have autoconf-2.61) Best regards, --Edwin From gohman at apple.com Tue Oct 21 13:24:51 2008 From: gohman at apple.com (Dan Gohman) Date: Tue, 21 Oct 2008 18:24:51 -0000 Subject: [llvm-commits] [llvm] r57915 - /llvm/trunk/lib/Target/X86/X86FastISel.cpp Message-ID: <200810211824.m9LIOp59023752@zion.cs.uiuc.edu> Author: djg Date: Tue Oct 21 13:24:51 2008 New Revision: 57915 URL: http://llvm.org/viewvc/llvm-project?rev=57915&view=rev Log: Implement the optimized FCMP_OEQ/FCMP_UNE code for x86 fast-isel. Modified: llvm/trunk/lib/Target/X86/X86FastISel.cpp Modified: llvm/trunk/lib/Target/X86/X86FastISel.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86FastISel.cpp?rev=57915&r1=57914&r2=57915&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/X86FastISel.cpp (original) +++ llvm/trunk/lib/Target/X86/X86FastISel.cpp Tue Oct 21 13:24:51 2008 @@ -692,6 +692,11 @@ unsigned BranchOpc; // Opcode to jump on, e.g. "X86::JA" switch (Predicate) { + case CmpInst::FCMP_OEQ: + std::swap(TrueMBB, FalseMBB); + Predicate = CmpInst::FCMP_UNE; + // FALL THROUGH + case CmpInst::FCMP_UNE: SwapArgs = false; BranchOpc = X86::JNE; break; case CmpInst::FCMP_OGT: SwapArgs = false; BranchOpc = X86::JA; break; case CmpInst::FCMP_OGE: SwapArgs = false; BranchOpc = X86::JAE; break; case CmpInst::FCMP_OLT: SwapArgs = true; BranchOpc = X86::JA; break; @@ -728,6 +733,13 @@ return false; BuildMI(MBB, TII.get(BranchOpc)).addMBB(TrueMBB); + + if (Predicate == CmpInst::FCMP_UNE) { + // X86 requires a second branch to handle UNE (and OEQ, + // which is mapped to UNE above). + BuildMI(MBB, TII.get(X86::JP)).addMBB(TrueMBB); + } + FastEmitBranch(FalseMBB); MBB->addSuccessor(TrueMBB); return true; From kremenek at apple.com Tue Oct 21 14:49:24 2008 From: kremenek at apple.com (Ted Kremenek) Date: Tue, 21 Oct 2008 19:49:24 -0000 Subject: [llvm-commits] [llvm] r57918 - /llvm/tags/checker/checker-114/ Message-ID: <200810211949.m9LJnOxY027564@zion.cs.uiuc.edu> Author: kremenek Date: Tue Oct 21 14:49:23 2008 New Revision: 57918 URL: http://llvm.org/viewvc/llvm-project?rev=57918&view=rev Log: Tagging checker-114. Added: llvm/tags/checker/checker-114/ - copied from r57917, llvm/trunk/ From gohman at apple.com Tue Oct 21 14:50:00 2008 From: gohman at apple.com (Dan Gohman) Date: Tue, 21 Oct 2008 19:50:00 -0000 Subject: [llvm-commits] [llvm] r57920 - /llvm/trunk/CREDITS.TXT Message-ID: <200810211950.m9LJo00I027602@zion.cs.uiuc.edu> Author: djg Date: Tue Oct 21 14:50:00 2008 New Revision: 57920 URL: http://llvm.org/viewvc/llvm-project?rev=57920&view=rev Log: Updated email address. Modified: llvm/trunk/CREDITS.TXT Modified: llvm/trunk/CREDITS.TXT URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/CREDITS.TXT?rev=57920&r1=57919&r2=57920&view=diff ============================================================================== --- llvm/trunk/CREDITS.TXT (original) +++ llvm/trunk/CREDITS.TXT Tue Oct 21 14:50:00 2008 @@ -102,7 +102,7 @@ D: Author of llvmc2 N: Dan Gohman -E: djg at cray.com +E: gohman at apple.com D: Miscellaneous bug fixes N: David Greene From nicolas.geoffray at lip6.fr Tue Oct 21 14:51:31 2008 From: nicolas.geoffray at lip6.fr (Nicolas Geoffray) Date: Tue, 21 Oct 2008 21:51:31 +0200 Subject: [llvm-commits] Thread local storage support in the JIT Message-ID: <48FE32C3.3010501@lip6.fr> Hi everyone, This patch enables thread local storage in JIT/Interpreter environments (on linux/x86). It does 2 things: - The emission of thread local global variables by giving it an offset in the thread local register (ie SG). - The code generation of thread local global variable loads and stores. What do you guys think? Thanks, Nicolas -------------- next part -------------- A non-text attachment was scrubbed... Name: jit-tls.patch Type: text/x-diff Size: 6927 bytes Desc: not available Url : http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20081021/45355e97/attachment.bin From kremenek at apple.com Tue Oct 21 14:52:55 2008 From: kremenek at apple.com (Ted Kremenek) Date: Tue, 21 Oct 2008 19:52:55 -0000 Subject: [llvm-commits] [llvm] r57921 - /llvm/tags/checker/checker-114/ Message-ID: <200810211952.m9LJqtep027811@zion.cs.uiuc.edu> Author: kremenek Date: Tue Oct 21 14:52:54 2008 New Revision: 57921 URL: http://llvm.org/viewvc/llvm-project?rev=57921&view=rev Log: Removing checker-114. Removed: llvm/tags/checker/checker-114/ From daniel at zuster.org Tue Oct 21 14:53:11 2008 From: daniel at zuster.org (Daniel Dunbar) Date: Tue, 21 Oct 2008 19:53:11 -0000 Subject: [llvm-commits] [llvm] r57923 - in /llvm/trunk: include/llvm/Support/raw_ostream.h lib/Support/raw_ostream.cpp Message-ID: <200810211953.m9LJrBjH027841@zion.cs.uiuc.edu> Author: ddunbar Date: Tue Oct 21 14:53:10 2008 New Revision: 57923 URL: http://llvm.org/viewvc/llvm-project?rev=57923&view=rev Log: Clear raw_fd_ostream error string on success and explain behavior in documentation. Add C++ header marker. Modified: llvm/trunk/include/llvm/Support/raw_ostream.h llvm/trunk/lib/Support/raw_ostream.cpp Modified: llvm/trunk/include/llvm/Support/raw_ostream.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/raw_ostream.h?rev=57923&r1=57922&r2=57923&view=diff ============================================================================== --- llvm/trunk/include/llvm/Support/raw_ostream.h (original) +++ llvm/trunk/include/llvm/Support/raw_ostream.h Tue Oct 21 14:53:10 2008 @@ -1,4 +1,4 @@ -//===--- raw_ostream.h - Raw output stream --------------------------------===// +//===--- raw_ostream.h - Raw output stream ----------------------*- C++ -*-===// // // The LLVM Compiler Infrastructure // @@ -152,9 +152,10 @@ int FD; bool ShouldClose; public: - /// raw_fd_ostream - Open the specified file for writing. If an error occurs, - /// information about the error is put into ErrorInfo, and the stream should - /// be immediately destroyed. + /// raw_fd_ostream - Open the specified file for writing. If an + /// error occurs, information about the error is put into ErrorInfo, + /// and the stream should be immediately destroyed; the string will + /// be empty if no error occurred. raw_fd_ostream(const char *Filename, std::string &ErrorInfo); /// raw_fd_ostream ctor - FD is the file descriptor that this writes to. If Modified: llvm/trunk/lib/Support/raw_ostream.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/raw_ostream.cpp?rev=57923&r1=57922&r2=57923&view=diff ============================================================================== --- llvm/trunk/lib/Support/raw_ostream.cpp (original) +++ llvm/trunk/lib/Support/raw_ostream.cpp Tue Oct 21 14:53:10 2008 @@ -196,10 +196,13 @@ // raw_fd_ostream //===----------------------------------------------------------------------===// -/// raw_fd_ostream - Open the specified file for writing. If an error occurs, -/// information about the error is put into ErrorInfo, and the stream should -/// be immediately destroyed. +/// raw_fd_ostream - Open the specified file for writing. If an error +/// occurs, information about the error is put into ErrorInfo, and the +/// stream should be immediately destroyed; the string will be empty +/// if no error occurred. raw_fd_ostream::raw_fd_ostream(const char *Filename, std::string &ErrorInfo) { + ErrorInfo.clear(); + // Handle "-" as stdout. if (Filename[0] == '-' && Filename[1] == 0) { FD = STDOUT_FILENO; From gohman at apple.com Tue Oct 21 15:00:43 2008 From: gohman at apple.com (Dan Gohman) Date: Tue, 21 Oct 2008 20:00:43 -0000 Subject: [llvm-commits] [llvm] r57925 - in /llvm/trunk: lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp test/CodeGen/X86/pr2924.ll Message-ID: <200810212000.m9LK0h2U028185@zion.cs.uiuc.edu> Author: djg Date: Tue Oct 21 15:00:42 2008 New Revision: 57925 URL: http://llvm.org/viewvc/llvm-project?rev=57925&view=rev Log: Fix SelectionDAGBuild lowering of Select instructions to handle first-class aggregate values. Also, fix a bug in the Ret handling for empty aggregates. Added: llvm/trunk/test/CodeGen/X86/pr2924.ll Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp?rev=57925&r1=57924&r2=57925&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp Tue Oct 21 15:00:42 2008 @@ -902,11 +902,13 @@ SmallVector NewValues; NewValues.push_back(getControlRoot()); for (unsigned i = 0, e = I.getNumOperands(); i != e; ++i) { - SDValue RetOp = getValue(I.getOperand(i)); - SmallVector ValueVTs; ComputeValueVTs(TLI, I.getOperand(i)->getType(), ValueVTs); - for (unsigned j = 0, f = ValueVTs.size(); j != f; ++j) { + unsigned NumValues = ValueVTs.size(); + if (NumValues == 0) continue; + + SDValue RetOp = getValue(I.getOperand(i)); + for (unsigned j = 0, f = NumValues; j != f; ++j) { MVT VT = ValueVTs[j]; // FIXME: C calling convention requires the return type to be promoted to @@ -2137,11 +2139,23 @@ } void SelectionDAGLowering::visitSelect(User &I) { - SDValue Cond = getValue(I.getOperand(0)); - SDValue TrueVal = getValue(I.getOperand(1)); - SDValue FalseVal = getValue(I.getOperand(2)); - setValue(&I, DAG.getNode(ISD::SELECT, TrueVal.getValueType(), Cond, - TrueVal, FalseVal)); + SmallVector ValueVTs; + ComputeValueVTs(TLI, I.getType(), ValueVTs); + unsigned NumValues = ValueVTs.size(); + if (NumValues != 0) { + SmallVector Values(NumValues); + SDValue Cond = getValue(I.getOperand(0)); + SDValue TrueVal = getValue(I.getOperand(1)); + SDValue FalseVal = getValue(I.getOperand(2)); + + for (unsigned i = 0; i != NumValues; ++i) + Values[i] = DAG.getNode(ISD::SELECT, TrueVal.getValueType(), Cond, + SDValue(TrueVal.getNode(), TrueVal.getResNo() + i), + SDValue(FalseVal.getNode(), FalseVal.getResNo() + i)); + + setValue(&I, DAG.getMergeValues(DAG.getVTList(&ValueVTs[0], NumValues), + &Values[0], NumValues)); + } } Added: llvm/trunk/test/CodeGen/X86/pr2924.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/pr2924.ll?rev=57925&view=auto ============================================================================== --- llvm/trunk/test/CodeGen/X86/pr2924.ll (added) +++ llvm/trunk/test/CodeGen/X86/pr2924.ll Tue Oct 21 15:00:42 2008 @@ -0,0 +1,24 @@ +; RUN: llvm-as < %s | llc +; PR2924 + +target datalayout = +"e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:32:32" +target triple = "i686-pc-linux-gnu" + +define x86_stdcallcc { i32, i8* } @_D3std6string7toupperFAaZAa({ i32, i8* } %s) { +entry_std.string.toupper: + %tmp58 = load i32* null + %tmp59 = icmp eq i32 %tmp58, 0 + %r.val = load { i32, i8* }* null, align 8 + %condtmp.0 = select i1 %tmp59, { i32, i8* } undef, { i32, i8* } %r.val + + ret { i32, i8* } %condtmp.0 +} +define { } @empty({ } %s) { +entry_std.string.toupper: + %tmp58 = load i32* null + %tmp59 = icmp eq i32 %tmp58, 0 + %r.val = load { }* null, align 8 + %condtmp.0 = select i1 %tmp59, { } undef, { } %r.val + ret { } %condtmp.0 +} From isanbard at gmail.com Tue Oct 21 15:41:19 2008 From: isanbard at gmail.com (Bill Wendling) Date: Tue, 21 Oct 2008 13:41:19 -0700 Subject: [llvm-commits] [llvm] r57912 - in /llvm/trunk: Makefile.config.in autoconf/configure.ac test/Makefile test/lib/llvm.exp In-Reply-To: <200810211721.m9LHLXSW021465@zion.cs.uiuc.edu> References: <200810211721.m9LHLXSW021465@zion.cs.uiuc.edu> Message-ID: <16e5fdf90810211341v3913677fo1baeacb143f781a1@mail.gmail.com> T?r?k, Please regenerate the configure file. I'm getting this error during "make check": FAIL: /Volumes/Sandbox/Buildbot/llvm/full-llvm/build/llvm.src/test/CodeGen/Generic/2008-07-29-EHLabel.ll for PR2609 Failed with posix(ENOENT,no such file or directory) at line 1 while running: llvm-as < /Volumes/Sandbox/Buildbot/llvm/full-llvm/build/llvm.src/test/CodeGen/Generic/2008-07-29-EHLabel.ll | llc -o - | @GAS@ -o /dev/null couldn't execute "@GAS@": no such file or directory -bw On Tue, Oct 21, 2008 at 10:21 AM, Torok Edwin wrote: > Author: edwin > Date: Tue Oct 21 12:21:32 2008 > New Revision: 57912 > > URL: http://llvm.org/viewvc/llvm-project?rev=57912&view=rev > Log: > Fix make check on Solaris 10/x86: the default grep is not GNU grep, same for as. > > Modified: > llvm/trunk/Makefile.config.in > llvm/trunk/autoconf/configure.ac > llvm/trunk/test/Makefile > llvm/trunk/test/lib/llvm.exp > > Modified: llvm/trunk/Makefile.config.in > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/Makefile.config.in?rev=57912&r1=57911&r2=57912&view=diff > > ============================================================================== > --- llvm/trunk/Makefile.config.in (original) > +++ llvm/trunk/Makefile.config.in Tue Oct 21 12:21:32 2008 > @@ -160,6 +160,7 @@ > OCAMLOPT := @OCAMLOPT@ > OCAMLDEP := @OCAMLDEP@ > OCAMLDOC := @OCAMLDOC@ > +GAS := @GAS@ > POD2HTML := @POD2HTML@ > POD2MAN := @POD2MAN@ > RUNTEST := @RUNTEST@ > > Modified: llvm/trunk/autoconf/configure.ac > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/autoconf/configure.ac?rev=57912&r1=57911&r2=57912&view=diff > > ============================================================================== > --- llvm/trunk/autoconf/configure.ac (original) > +++ llvm/trunk/autoconf/configure.ac Tue Oct 21 12:21:32 2008 > @@ -614,6 +614,7 @@ > AC_PATH_PROGS(OCAMLOPT, [ocamlopt.opt ocamlopt]) > AC_PATH_PROGS(OCAMLDEP, [ocamldep.opt ocamldep]) > AC_PATH_PROGS(OCAMLDOC, [ocamldoc.opt ocamldoc]) > +AC_PATH_PROGS(GAS, [gas as]) > > dnl Determine if the linker supports the -R option. > AC_LINK_USE_R > > Modified: llvm/trunk/test/Makefile > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Makefile?rev=57912&r1=57911&r2=57912&view=diff > > ============================================================================== > --- llvm/trunk/test/Makefile (original) > +++ llvm/trunk/test/Makefile Tue Oct 21 12:21:32 2008 > @@ -110,6 +110,8 @@ > @echo 'set shlibext "$(SHLIBEXT)"' >> site.tmp > @echo 'set ocamlc "$(OCAMLC) -cc $(CXX) -I $(LibDir)/ocaml"' >> site.tmp > @echo 'set valgrind "$(VALGRIND)"' >> site.tmp > + @echo 'set grep "$(GREP)"' >>site.tmp > + @echo 'set gas "$(GAS)"' >>site.tmp > @echo '## All variables above are generated by configure. Do Not Edit ## ' >>site.tmp > @test ! -f site.exp || \ > sed '1,/^## All variables above are.*##/ d' site.exp >> site.tmp > > Modified: llvm/trunk/test/lib/llvm.exp > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/lib/llvm.exp?rev=57912&r1=57911&r2=57912&view=diff > > ============================================================================== > --- llvm/trunk/test/lib/llvm.exp (original) > +++ llvm/trunk/test/lib/llvm.exp Tue Oct 21 12:21:32 2008 > @@ -49,7 +49,7 @@ > global srcroot objroot srcdir objdir subdir target_triplet prcontext > global llvmgcc llvmgxx llvmgcc_version llvmgccmajvers ocamlc > global gccpath gxxpath compile_c compile_cxx link shlibext llvmlibsdir > - global valgrind > + global valgrind grep gas > set path [file join $srcdir $subdir] > > # Substitute all Tcl variables. > @@ -84,6 +84,11 @@ > #replace _#MARKER#_ with % > regsub -all {_#MARKER#_} $new_line % new_line > > + #replace grep with GNU grep > + regsub -all { grep } $new_line " $grep " new_line > + #replace as with GNU as > + regsub -all {\| as } $new_line "| $gas " new_line > + > #valgind related stuff > # regsub -all {bugpoint } $new_line "$valgrind bugpoint " new_line > regsub -all {llc } $new_line "$valgrind llc " new_line > > > _______________________________________________ > llvm-commits mailing list > llvm-commits at cs.uiuc.edu > http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits > From dalej at apple.com Tue Oct 21 15:50:02 2008 From: dalej at apple.com (Dale Johannesen) Date: Tue, 21 Oct 2008 20:50:02 -0000 Subject: [llvm-commits] [llvm] r57926 - in /llvm/trunk/lib: CodeGen/SelectionDAG/LegalizeDAG.cpp Target/X86/X86ISelLowering.cpp Target/X86/X86ISelLowering.h Message-ID: <200810212050.m9LKo2jD029848@zion.cs.uiuc.edu> Author: johannes Date: Tue Oct 21 15:50:01 2008 New Revision: 57926 URL: http://llvm.org/viewvc/llvm-project?rev=57926&view=rev Log: Add an SSE2 algorithm for uint64->f64 conversion. The same one Apple gcc uses, faster. Also gets the extreme case in gcc.c-torture/execute/ieee/rbug.c correct which we weren't before; this is not sufficient to get the test to pass though, there is another bug. Modified: llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp llvm/trunk/lib/Target/X86/X86ISelLowering.cpp llvm/trunk/lib/Target/X86/X86ISelLowering.h Modified: llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp?rev=57926&r1=57925&r2=57926&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp Tue Oct 21 15:50:01 2008 @@ -5473,6 +5473,22 @@ Hi = Source; } + // Check to see if the target has a custom way to lower this. If so, use it. + // (Note we've already expanded the operand in this case.) + switch (TLI.getOperationAction(ISD::UINT_TO_FP, SourceVT)) { + default: assert(0 && "This action not implemented for this operation!"); + case TargetLowering::Legal: + case TargetLowering::Expand: + break; // This case is handled below. + case TargetLowering::Custom: { + SDValue NV = TLI.LowerOperation(DAG.getNode(ISD::UINT_TO_FP, DestTy, + Source), DAG); + if (NV.getNode()) + return LegalizeOp(NV); + break; // The target decided this was legal after all + } + } + // If this is unsigned, and not supported, first perform the conversion to // signed, then adjust the result if the sign bit is set. SDValue SignedConv = ExpandIntToFP(true, DestTy, Source); Modified: llvm/trunk/lib/Target/X86/X86ISelLowering.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86ISelLowering.cpp?rev=57926&r1=57925&r2=57926&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/X86ISelLowering.cpp (original) +++ llvm/trunk/lib/Target/X86/X86ISelLowering.cpp Tue Oct 21 15:50:01 2008 @@ -112,10 +112,12 @@ setOperationAction(ISD::UINT_TO_FP , MVT::i64 , Expand); setOperationAction(ISD::UINT_TO_FP , MVT::i32 , Promote); } else { - if (X86ScalarSSEf64) + if (X86ScalarSSEf64) { + // We have an impenetrably clever algorithm for ui64->double only. + setOperationAction(ISD::UINT_TO_FP , MVT::i64 , Custom); // If SSE i64 SINT_TO_FP is not available, expand i32 UINT_TO_FP. setOperationAction(ISD::UINT_TO_FP , MVT::i32 , Expand); - else + } else setOperationAction(ISD::UINT_TO_FP , MVT::i32 , Promote); } @@ -4686,6 +4688,70 @@ return Result; } +SDValue X86TargetLowering::LowerUINT_TO_FP(SDValue Op, SelectionDAG &DAG) { + MVT SrcVT = Op.getOperand(0).getValueType(); + assert(SrcVT.getSimpleVT() == MVT::i64 && "Unknown UINT_TO_FP to lower!"); + + // We only handle SSE2 f64 target here; caller can handle the rest. + if (Op.getValueType() != MVT::f64 || !X86ScalarSSEf64) + return SDValue(); + + // Get a XMM-vector-sized stack slot. + unsigned Size = 128/8; + MachineFunction &MF = DAG.getMachineFunction(); + int SSFI = MF.getFrameInfo()->CreateStackObject(Size, Size); + SDValue StackSlot = DAG.getFrameIndex(SSFI, getPointerTy()); + + // Build some magic constants. + std::vectorCV0; + CV0.push_back(ConstantInt::get(APInt(32, 0x45300000))); + CV0.push_back(ConstantInt::get(APInt(32, 0x43300000))); + CV0.push_back(ConstantInt::get(APInt(32, 0))); + CV0.push_back(ConstantInt::get(APInt(32, 0))); + Constant *C0 = ConstantVector::get(CV0); + SDValue CPIdx0 = DAG.getConstantPool(C0, getPointerTy(), 4); + + std::vectorCV1; + CV1.push_back(ConstantFP::get(APFloat(APInt(64, 0x4530000000000000ULL)))); + CV1.push_back(ConstantFP::get(APFloat(APInt(64, 0x4330000000000000ULL)))); + Constant *C1 = ConstantVector::get(CV1); + SDValue CPIdx1 = DAG.getConstantPool(C1, getPointerTy(), 4); + + SmallVector MaskVec; + MaskVec.push_back(DAG.getConstant(0, MVT::i32)); + MaskVec.push_back(DAG.getConstant(4, MVT::i32)); + MaskVec.push_back(DAG.getConstant(1, MVT::i32)); + MaskVec.push_back(DAG.getConstant(5, MVT::i32)); + SDValue UnpcklMask = DAG.getNode(ISD::BUILD_VECTOR, MVT::v4i32, &MaskVec[0], + MaskVec.size()); + SmallVector MaskVec2; + MaskVec2.push_back(DAG.getConstant(1, MVT::i64)); + MaskVec2.push_back(DAG.getConstant(0, MVT::i64)); + SDValue ShufMask = DAG.getNode(ISD::BUILD_VECTOR, MVT::v2i64, &MaskVec2[0], + MaskVec2.size()); + + SDValue XR1 = DAG.getNode(ISD::SCALAR_TO_VECTOR, MVT::v4i32, + Op.getOperand(0).getOperand(1)); + SDValue XR2 = DAG.getNode(ISD::SCALAR_TO_VECTOR, MVT::v4i32, + Op.getOperand(0).getOperand(0)); + SDValue Unpck1 = DAG.getNode(ISD::VECTOR_SHUFFLE, MVT::v4i32, + XR1, XR2, UnpcklMask); + SDValue CLod0 = DAG.getLoad(MVT::v4i32, DAG.getEntryNode(), CPIdx0, + PseudoSourceValue::getConstantPool(), 0, false, 16); + SDValue Unpck2 = DAG.getNode(ISD::VECTOR_SHUFFLE, MVT::v4i32, + Unpck1, CLod0, UnpcklMask); + SDValue XR2F = DAG.getNode(ISD::BIT_CONVERT, MVT::v2f64, Unpck2); + SDValue CLod1 = DAG.getLoad(MVT::v2f64, CLod0.getValue(1), CPIdx1, + PseudoSourceValue::getConstantPool(), 0, false, 16); + SDValue Sub = DAG.getNode(ISD::FSUB, MVT::v2f64, XR2F, CLod1); + // Add the halves; easiest way is to swap them into another reg first. + SDValue Shuf = DAG.getNode(ISD::VECTOR_SHUFFLE, MVT::v2f64, + Sub, Sub, ShufMask); + SDValue Add = DAG.getNode(ISD::FADD, MVT::v2f64, Shuf, Sub); + return DAG.getNode(ISD::EXTRACT_VECTOR_ELT, MVT::f64, Add, + DAG.getIntPtrConstant(0)); +} + std::pair X86TargetLowering:: FP_TO_SINTHelper(SDValue Op, SelectionDAG &DAG) { assert(Op.getValueType().getSimpleVT() <= MVT::i64 && @@ -6184,6 +6250,7 @@ case ISD::SRA_PARTS: case ISD::SRL_PARTS: return LowerShift(Op, DAG); case ISD::SINT_TO_FP: return LowerSINT_TO_FP(Op, DAG); + case ISD::UINT_TO_FP: return LowerUINT_TO_FP(Op, DAG); case ISD::FP_TO_SINT: return LowerFP_TO_SINT(Op, DAG); case ISD::FABS: return LowerFABS(Op, DAG); case ISD::FNEG: return LowerFNEG(Op, DAG); Modified: llvm/trunk/lib/Target/X86/X86ISelLowering.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86ISelLowering.h?rev=57926&r1=57925&r2=57926&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/X86ISelLowering.h (original) +++ llvm/trunk/lib/Target/X86/X86ISelLowering.h Tue Oct 21 15:50:01 2008 @@ -558,6 +558,7 @@ SDValue LowerExternalSymbol(SDValue Op, SelectionDAG &DAG); SDValue LowerShift(SDValue Op, SelectionDAG &DAG); SDValue LowerSINT_TO_FP(SDValue Op, SelectionDAG &DAG); + SDValue LowerUINT_TO_FP(SDValue Op, SelectionDAG &DAG); SDValue LowerFP_TO_SINT(SDValue Op, SelectionDAG &DAG); SDValue LowerFABS(SDValue Op, SelectionDAG &DAG); SDValue LowerFNEG(SDValue Op, SelectionDAG &DAG); From kremenek at apple.com Tue Oct 21 16:32:11 2008 From: kremenek at apple.com (Ted Kremenek) Date: Tue, 21 Oct 2008 21:32:11 -0000 Subject: [llvm-commits] [llvm] r57928 - /llvm/tags/checker/checker-114/ Message-ID: <200810212132.m9LLWBCh031506@zion.cs.uiuc.edu> Author: kremenek Date: Tue Oct 21 16:32:11 2008 New Revision: 57928 URL: http://llvm.org/viewvc/llvm-project?rev=57928&view=rev Log: Tagging checker-114. Added: llvm/tags/checker/checker-114/ - copied from r57927, llvm/trunk/ From evan.cheng at apple.com Tue Oct 21 16:58:03 2008 From: evan.cheng at apple.com (Evan Cheng) Date: Tue, 21 Oct 2008 14:58:03 -0700 Subject: [llvm-commits] [llvm] r57926 - in /llvm/trunk/lib: CodeGen/SelectionDAG/LegalizeDAG.cpp Target/X86/X86ISelLowering.cpp Target/X86/X86ISelLowering.h In-Reply-To: <200810212050.m9LKo2jD029848@zion.cs.uiuc.edu> References: <200810212050.m9LKo2jD029848@zion.cs.uiuc.edu> Message-ID: On Oct 21, 2008, at 1:50 PM, Dale Johannesen wrote: > Author: johannes > Date: Tue Oct 21 15:50:01 2008 > New Revision: 57926 > > URL: http://llvm.org/viewvc/llvm-project?rev=57926&view=rev > Log: > Add an SSE2 algorithm for uint64->f64 conversion. > The same one Apple gcc uses, faster. Also gets the > extreme case in gcc.c-torture/execute/ieee/rbug.c > correct which we weren't before; this is not > sufficient to get the test to pass though, there > is another bug. > Awesome! > > +SDValue X86TargetLowering::LowerUINT_TO_FP(SDValue Op, SelectionDAG > &DAG) { > + MVT SrcVT = Op.getOperand(0).getValueType(); > + assert(SrcVT.getSimpleVT() == MVT::i64 && "Unknown UINT_TO_FP to > lower!"); > + > + // We only handle SSE2 f64 target here; caller can handle the rest. > + if (Op.getValueType() != MVT::f64 || !X86ScalarSSEf64) > + return SDValue(); > + > + // Get a XMM-vector-sized stack slot. > + unsigned Size = 128/8; > + MachineFunction &MF = DAG.getMachineFunction(); > + int SSFI = MF.getFrameInfo()->CreateStackObject(Size, Size); > + SDValue StackSlot = DAG.getFrameIndex(SSFI, getPointerTy()); > + > + // Build some magic constants. Can you add comments describing the algorithm? I can't figure out what's going on here. Thanks, Evan > > + std::vectorCV0; > + CV0.push_back(ConstantInt::get(APInt(32, 0x45300000))); > + CV0.push_back(ConstantInt::get(APInt(32, 0x43300000))); > + CV0.push_back(ConstantInt::get(APInt(32, 0))); > + CV0.push_back(ConstantInt::get(APInt(32, 0))); > + Constant *C0 = ConstantVector::get(CV0); > + SDValue CPIdx0 = DAG.getConstantPool(C0, getPointerTy(), 4); > + > + std::vectorCV1; > + CV1.push_back(ConstantFP::get(APFloat(APInt(64, > 0x4530000000000000ULL)))); > + CV1.push_back(ConstantFP::get(APFloat(APInt(64, > 0x4330000000000000ULL)))); > + Constant *C1 = ConstantVector::get(CV1); > + SDValue CPIdx1 = DAG.getConstantPool(C1, getPointerTy(), 4); > + > + SmallVector MaskVec; > + MaskVec.push_back(DAG.getConstant(0, MVT::i32)); > + MaskVec.push_back(DAG.getConstant(4, MVT::i32)); > + MaskVec.push_back(DAG.getConstant(1, MVT::i32)); > + MaskVec.push_back(DAG.getConstant(5, MVT::i32)); > + SDValue UnpcklMask = DAG.getNode(ISD::BUILD_VECTOR, MVT::v4i32, > &MaskVec[0], > + MaskVec.size()); > + SmallVector MaskVec2; > + MaskVec2.push_back(DAG.getConstant(1, MVT::i64)); > + MaskVec2.push_back(DAG.getConstant(0, MVT::i64)); > + SDValue ShufMask = DAG.getNode(ISD::BUILD_VECTOR, MVT::v2i64, > &MaskVec2[0], > + MaskVec2.size()); > + > + SDValue XR1 = DAG.getNode(ISD::SCALAR_TO_VECTOR, MVT::v4i32, > + Op.getOperand(0).getOperand(1)); > + SDValue XR2 = DAG.getNode(ISD::SCALAR_TO_VECTOR, MVT::v4i32, > + Op.getOperand(0).getOperand(0)); > + SDValue Unpck1 = DAG.getNode(ISD::VECTOR_SHUFFLE, MVT::v4i32, > + XR1, XR2, UnpcklMask); > + SDValue CLod0 = DAG.getLoad(MVT::v4i32, DAG.getEntryNode(), CPIdx0, > + PseudoSourceValue::getConstantPool(), 0, > false, 16); > + SDValue Unpck2 = DAG.getNode(ISD::VECTOR_SHUFFLE, MVT::v4i32, > + Unpck1, CLod0, UnpcklMask); > + SDValue XR2F = DAG.getNode(ISD::BIT_CONVERT, MVT::v2f64, Unpck2); > + SDValue CLod1 = DAG.getLoad(MVT::v2f64, CLod0.getValue(1), CPIdx1, > + PseudoSourceValue::getConstantPool(), 0, > false, 16); > + SDValue Sub = DAG.getNode(ISD::FSUB, MVT::v2f64, XR2F, CLod1); > + // Add the halves; easiest way is to swap them into another reg > first. > + SDValue Shuf = DAG.getNode(ISD::VECTOR_SHUFFLE, MVT::v2f64, > + Sub, Sub, ShufMask); > + SDValue Add = DAG.getNode(ISD::FADD, MVT::v2f64, Shuf, Sub); > + return DAG.getNode(ISD::EXTRACT_VECTOR_ELT, MVT::f64, Add, > + DAG.getIntPtrConstant(0)); > +} > + > std::pair X86TargetLowering:: > FP_TO_SINTHelper(SDValue Op, SelectionDAG &DAG) { > assert(Op.getValueType().getSimpleVT() <= MVT::i64 && > @@ -6184,6 +6250,7 @@ > case ISD::SRA_PARTS: > case ISD::SRL_PARTS: return LowerShift(Op, DAG); > case ISD::SINT_TO_FP: return LowerSINT_TO_FP(Op, DAG); > + case ISD::UINT_TO_FP: return LowerUINT_TO_FP(Op, DAG); > case ISD::FP_TO_SINT: return LowerFP_TO_SINT(Op, DAG); > case ISD::FABS: return LowerFABS(Op, DAG); > case ISD::FNEG: return LowerFNEG(Op, DAG); > > Modified: llvm/trunk/lib/Target/X86/X86ISelLowering.h > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86ISelLowering.h?rev=57926&r1=57925&r2=57926&view=diff > > = > = > = > = > = > = > = > = > ====================================================================== > --- llvm/trunk/lib/Target/X86/X86ISelLowering.h (original) > +++ llvm/trunk/lib/Target/X86/X86ISelLowering.h Tue Oct 21 15:50:01 > 2008 > @@ -558,6 +558,7 @@ > SDValue LowerExternalSymbol(SDValue Op, SelectionDAG &DAG); > SDValue LowerShift(SDValue Op, SelectionDAG &DAG); > SDValue LowerSINT_TO_FP(SDValue Op, SelectionDAG &DAG); > + SDValue LowerUINT_TO_FP(SDValue Op, SelectionDAG &DAG); > SDValue LowerFP_TO_SINT(SDValue Op, SelectionDAG &DAG); > SDValue LowerFABS(SDValue Op, SelectionDAG &DAG); > SDValue LowerFNEG(SDValue Op, SelectionDAG &DAG); > > > _______________________________________________ > llvm-commits mailing list > llvm-commits at cs.uiuc.edu > http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits From dalej at apple.com Tue Oct 21 17:08:15 2008 From: dalej at apple.com (Dale Johannesen) Date: Tue, 21 Oct 2008 15:08:15 -0700 Subject: [llvm-commits] [llvm] r57926 - in /llvm/trunk/lib: CodeGen/SelectionDAG/LegalizeDAG.cpp Target/X86/X86ISelLowering.cpp Target/X86/X86ISelLowering.h In-Reply-To: References: <200810212050.m9LKo2jD029848@zion.cs.uiuc.edu> Message-ID: <61299DEB-E5F5-4C70-B78C-24986EADB58E@apple.com> On Oct 21, 2008, at 2:58 PMPDT, Evan Cheng wrote: >> >> +SDValue X86TargetLowering::LowerUINT_TO_FP(SDValue Op, SelectionDAG >> &DAG) { >> + MVT SrcVT = Op.getOperand(0).getValueType(); >> + assert(SrcVT.getSimpleVT() == MVT::i64 && "Unknown UINT_TO_FP to >> lower!"); >> + >> + // We only handle SSE2 f64 target here; caller can handle the >> rest. >> + if (Op.getValueType() != MVT::f64 || !X86ScalarSSEf64) >> + return SDValue(); >> + >> + // Get a XMM-vector-sized stack slot. >> + unsigned Size = 128/8; >> + MachineFunction &MF = DAG.getMachineFunction(); >> + int SSFI = MF.getFrameInfo()->CreateStackObject(Size, Size); >> + SDValue StackSlot = DAG.getFrameIndex(SSFI, getPointerTy()); >> + >> + // Build some magic constants. > > Can you add comments describing the algorithm? I can't figure out > what's going on here. I was afraid somebody would ask for that:( I'll come up with something. From dalej at apple.com Tue Oct 21 18:07:50 2008 From: dalej at apple.com (Dale Johannesen) Date: Tue, 21 Oct 2008 23:07:50 -0000 Subject: [llvm-commits] [llvm] r57932 - /llvm/trunk/lib/Target/X86/X86ISelLowering.cpp Message-ID: <200810212307.m9LN7p3S001712@zion.cs.uiuc.edu> Author: johannes Date: Tue Oct 21 18:07:49 2008 New Revision: 57932 URL: http://llvm.org/viewvc/llvm-project?rev=57932&view=rev Log: Add comments to explain uint64->f64 algorithm, well, sort of. (Algorithm by Ian Ollmann.) Modified: llvm/trunk/lib/Target/X86/X86ISelLowering.cpp Modified: llvm/trunk/lib/Target/X86/X86ISelLowering.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86ISelLowering.cpp?rev=57932&r1=57931&r2=57932&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/X86ISelLowering.cpp (original) +++ llvm/trunk/lib/Target/X86/X86ISelLowering.cpp Tue Oct 21 18:07:49 2008 @@ -4696,6 +4696,41 @@ if (Op.getValueType() != MVT::f64 || !X86ScalarSSEf64) return SDValue(); + // This algorithm is not obvious. Here it is in C code, more or less: +/* + double uint64_to_double( uint32_t hi, uint32_t lo ) + { + static const __m128i exp = { 0x4330000045300000ULL, 0 }; + static const __m128d bias = { 0x1.0p84, 0x1.0p52 }; + + //copy ints to xmm registers + __m128i xh = _mm_cvtsi32_si128( hi ); + __m128i xl = _mm_cvtsi32_si128( lo ); + + //combine into low half of a single xmm register + __m128i x = _mm_unpacklo_epi32( xh, xl ); + __m128d d; + double sd; + + //merge in appropriate exponents to give the integer bits the + // right magnitude + x = _mm_unpacklo_epi32( x, exp ); + + //subtract away the biases to deal with the IEEE-754 double precision + //implicit 1 + d = _mm_sub_pd( (__m128d) x, bias ); + + //All conversions up to here are exact. The correctly rounded result is + // calculated using the + //current rounding mode using the following horizontal add. + d = _mm_add_sd( d, _mm_unpackhi_pd( d, d ) ); + _mm_store_sd( &sd, d ); //since we are returning doubles in XMM, this + //store doesn't really need to be here (except maybe to zero the other + //double) + return sd; + } +*/ + // Get a XMM-vector-sized stack slot. unsigned Size = 128/8; MachineFunction &MF = DAG.getMachineFunction(); From daniel at zuster.org Tue Oct 21 18:33:39 2008 From: daniel at zuster.org (Daniel Dunbar) Date: Tue, 21 Oct 2008 23:33:39 -0000 Subject: [llvm-commits] [llvm] r57933 - in /llvm/trunk: include/llvm/Assembly/PrintModulePass.h include/llvm/LinkAllPasses.h lib/CodeGen/LLVMTargetMachine.cpp lib/VMCore/AsmWriter.cpp lib/VMCore/PrintModulePass.cpp tools/llvm-dis/llvm-dis.cpp tools/opt/opt.cpp Message-ID: <200810212333.m9LNXeFW002430@zion.cs.uiuc.edu> Author: ddunbar Date: Tue Oct 21 18:33:38 2008 New Revision: 57933 URL: http://llvm.org/viewvc/llvm-project?rev=57933&view=rev Log: Privatize PrintModulePass and PrintFunctionPass and add createPrintModulePass and createPrintFunctionPass. - So clients who compile w/o RTTI can use them. Added: llvm/trunk/lib/VMCore/PrintModulePass.cpp Modified: llvm/trunk/include/llvm/Assembly/PrintModulePass.h llvm/trunk/include/llvm/LinkAllPasses.h llvm/trunk/lib/CodeGen/LLVMTargetMachine.cpp llvm/trunk/lib/VMCore/AsmWriter.cpp llvm/trunk/tools/llvm-dis/llvm-dis.cpp llvm/trunk/tools/opt/opt.cpp Modified: llvm/trunk/include/llvm/Assembly/PrintModulePass.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Assembly/PrintModulePass.h?rev=57933&r1=57932&r2=57933&view=diff ============================================================================== --- llvm/trunk/include/llvm/Assembly/PrintModulePass.h (original) +++ llvm/trunk/include/llvm/Assembly/PrintModulePass.h Tue Oct 21 18:33:38 2008 @@ -18,64 +18,22 @@ #ifndef LLVM_ASSEMBLY_PRINTMODULEPASS_H #define LLVM_ASSEMBLY_PRINTMODULEPASS_H -#include "llvm/Pass.h" -#include "llvm/Module.h" #include "llvm/Support/Streams.h" +#include namespace llvm { - -class PrintModulePass : public ModulePass { - OStream *Out; // ostream to print on - bool DeleteStream; // Delete the ostream in our dtor? -public: - static char ID; - PrintModulePass() : ModulePass(intptr_t(&ID)), Out(&cerr), - DeleteStream(false) {} - PrintModulePass(OStream *o, bool DS = false) - : ModulePass(intptr_t(&ID)), Out(o), DeleteStream(DS) {} - - ~PrintModulePass() { - if (DeleteStream) delete Out; - } - - bool runOnModule(Module &M) { - (*Out) << M << std::flush; - return false; - } - - virtual void getAnalysisUsage(AnalysisUsage &AU) const { - AU.setPreservesAll(); - } -}; - -class PrintFunctionPass : public FunctionPass { - std::string Banner; // String to print before each function - OStream *Out; // ostream to print on - bool DeleteStream; // Delete the ostream in our dtor? -public: - static char ID; - PrintFunctionPass() : FunctionPass(intptr_t(&ID)), Banner(""), Out(&cerr), - DeleteStream(false) {} - PrintFunctionPass(const std::string &B, OStream *o = &cout, - bool DS = false) - : FunctionPass(intptr_t(&ID)), Banner(B), Out(o), DeleteStream(DS) {} - - inline ~PrintFunctionPass() { - if (DeleteStream) delete Out; - } - - // runOnFunction - This pass just prints a banner followed by the function as - // it's processed. - // - bool runOnFunction(Function &F) { - (*Out) << Banner << static_cast(F); - return false; - } - - virtual void getAnalysisUsage(AnalysisUsage &AU) const { - AU.setPreservesAll(); - } -}; + class FunctionPass; + class ModulePass; + + /// createPrintModulePass - Create and return a pass that writes the + /// module to the specified OStream. + ModulePass *createPrintModulePass(llvm::OStream *OS, bool DeleteStream=false); + + /// createPrintFunctionPass - Create and return a pass that prints + /// functions to the specified OStream as they are processed. + FunctionPass *createPrintFunctionPass(const std::string &Banner, + llvm::OStream *OS, + bool DeleteStream=false); } // End llvm namespace Modified: llvm/trunk/include/llvm/LinkAllPasses.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/LinkAllPasses.h?rev=57933&r1=57932&r2=57933&view=diff ============================================================================== --- llvm/trunk/include/llvm/LinkAllPasses.h (original) +++ llvm/trunk/include/llvm/LinkAllPasses.h Tue Oct 21 18:33:38 2008 @@ -23,6 +23,7 @@ #include "llvm/Analysis/Passes.h" #include "llvm/Analysis/PostDominators.h" #include "llvm/Analysis/ScalarEvolution.h" +#include "llvm/Assembly/PrintModulePass.h" #include "llvm/CodeGen/Passes.h" #include "llvm/Function.h" #include "llvm/Transforms/Instrumentation.h" @@ -120,6 +121,8 @@ (void) llvm::createInstructionNamerPass(); (void) llvm::createPartialSpecializationPass(); (void) llvm::createAddReadAttrsPass(); + (void) llvm::createPrintModulePass(0); + (void) llvm::createPrintFunctionPass("", 0); (void)new llvm::IntervalPartition(); (void)new llvm::FindUsedTypes(); Modified: llvm/trunk/lib/CodeGen/LLVMTargetMachine.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/LLVMTargetMachine.cpp?rev=57933&r1=57932&r2=57933&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/LLVMTargetMachine.cpp (original) +++ llvm/trunk/lib/CodeGen/LLVMTargetMachine.cpp Tue Oct 21 18:33:38 2008 @@ -151,7 +151,7 @@ if (!Fast) { PM.add(createLoopStrengthReducePass(getTargetLowering())); if (PrintLSR) - PM.add(new PrintFunctionPass("\n\n*** Code after LSR ***\n", &cerr)); + PM.add(createPrintFunctionPass("\n\n*** Code after LSR ***\n", &cerr)); } PM.add(createGCLoweringPass()); @@ -166,8 +166,9 @@ PM.add(createCodeGenPreparePass(getTargetLowering())); if (PrintISelInput) - PM.add(new PrintFunctionPass("\n\n*** Final LLVM Code input to ISel ***\n", - &cerr)); + PM.add(createPrintFunctionPass("\n\n" + "*** Final LLVM Code input to ISel ***\n", + &cerr)); // Standard Lower-Level Passes. Modified: llvm/trunk/lib/VMCore/AsmWriter.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/AsmWriter.cpp?rev=57933&r1=57932&r2=57933&view=diff ============================================================================== --- llvm/trunk/lib/VMCore/AsmWriter.cpp (original) +++ llvm/trunk/lib/VMCore/AsmWriter.cpp Tue Oct 21 18:33:38 2008 @@ -39,14 +39,6 @@ // Make virtual table appear in this compilation unit. AssemblyAnnotationWriter::~AssemblyAnnotationWriter() {} -char PrintModulePass::ID = 0; -static RegisterPass -X("print-module", "Print module to stderr"); -char PrintFunctionPass::ID = 0; -static RegisterPass -Y("print-function","Print function to stderr"); - - //===----------------------------------------------------------------------===// // Helper Functions //===----------------------------------------------------------------------===// Added: llvm/trunk/lib/VMCore/PrintModulePass.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/PrintModulePass.cpp?rev=57933&view=auto ============================================================================== --- llvm/trunk/lib/VMCore/PrintModulePass.cpp (added) +++ llvm/trunk/lib/VMCore/PrintModulePass.cpp Tue Oct 21 18:33:38 2008 @@ -0,0 +1,96 @@ +//===--- VMCore/PrintModulePass.cpp - Module/Function Printer -------------===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// +// +// PrintModulePass and PrintFunctionPass implementations. +// +//===----------------------------------------------------------------------===// + +#include "llvm/Assembly/PrintModulePass.h" + +#include "llvm/Function.h" +#include "llvm/Module.h" +#include "llvm/Pass.h" +#include "llvm/Support/Compiler.h" +using namespace llvm; + +namespace { + + class VISIBILITY_HIDDEN PrintModulePass : public ModulePass { + OStream *Out; // ostream to print on + bool DeleteStream; // Delete the ostream in our dtor? + public: + static char ID; + PrintModulePass() : ModulePass(intptr_t(&ID)), Out(&cerr), + DeleteStream(false) {} + PrintModulePass(OStream *o, bool DS) + : ModulePass(intptr_t(&ID)), Out(o), DeleteStream(DS) {} + + ~PrintModulePass() { + if (DeleteStream) delete Out; + } + + bool runOnModule(Module &M) { + (*Out) << M << std::flush; + return false; + } + + virtual void getAnalysisUsage(AnalysisUsage &AU) const { + AU.setPreservesAll(); + } + }; + + class PrintFunctionPass : public FunctionPass { + std::string Banner; // String to print before each function + OStream *Out; // ostream to print on + bool DeleteStream; // Delete the ostream in our dtor? + public: + static char ID; + PrintFunctionPass() : FunctionPass(intptr_t(&ID)), Banner(""), Out(&cerr), + DeleteStream(false) {} + PrintFunctionPass(const std::string &B, OStream *o, bool DS) + : FunctionPass(intptr_t(&ID)), Banner(B), Out(o), DeleteStream(DS) {} + + inline ~PrintFunctionPass() { + if (DeleteStream) delete Out; + } + + // runOnFunction - This pass just prints a banner followed by the + // function as it's processed. + // + bool runOnFunction(Function &F) { + (*Out) << Banner << static_cast(F); + return false; + } + + virtual void getAnalysisUsage(AnalysisUsage &AU) const { + AU.setPreservesAll(); + } + }; +} + +char PrintModulePass::ID = 0; +static RegisterPass +X("print-module", "Print module to stderr"); +char PrintFunctionPass::ID = 0; +static RegisterPass +Y("print-function","Print function to stderr"); + +/// createPrintModulePass - Create and return a pass that writes the +/// module to the specified OStream. +ModulePass *llvm::createPrintModulePass(llvm::OStream *OS, bool DeleteStream) { + return new PrintModulePass(OS, DeleteStream); +} + +/// createPrintFunctionPass - Create and return a pass that prints +/// functions to the specified OStream as they are processed. +FunctionPass *llvm::createPrintFunctionPass(const std::string &Banner, + OStream *OS, bool DeleteStream) { + return new PrintFunctionPass(Banner, OS, DeleteStream); +} + Modified: llvm/trunk/tools/llvm-dis/llvm-dis.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-dis/llvm-dis.cpp?rev=57933&r1=57932&r2=57933&view=diff ============================================================================== --- llvm/trunk/tools/llvm-dis/llvm-dis.cpp (original) +++ llvm/trunk/tools/llvm-dis/llvm-dis.cpp Tue Oct 21 18:33:38 2008 @@ -118,7 +118,7 @@ if (!DontPrint) { PassManager Passes; OStream L(*Out); - Passes.add(new PrintModulePass(&L)); + Passes.add(createPrintModulePass(&L)); Passes.run(*M.get()); } Modified: llvm/trunk/tools/opt/opt.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/opt/opt.cpp?rev=57933&r1=57932&r2=57933&view=diff ============================================================================== --- llvm/trunk/tools/opt/opt.cpp (original) +++ llvm/trunk/tools/opt/opt.cpp Tue Oct 21 18:33:38 2008 @@ -543,7 +543,7 @@ } if (PrintEachXForm) - Passes.add(new PrintModulePass(&cerr)); + Passes.add(createPrintModulePass(&cerr)); } // If -std-compile-opts was specified at the end of the pass list, add them. From daniel at zuster.org Tue Oct 21 18:34:13 2008 From: daniel at zuster.org (Daniel Dunbar) Date: Tue, 21 Oct 2008 23:34:13 -0000 Subject: [llvm-commits] [llvm-gcc-4.2] r57934 - in /llvm-gcc-4.2/trunk/gcc: llvm-backend.cpp llvm-linker-hack.cpp Message-ID: <200810212334.m9LNYD6S002457@zion.cs.uiuc.edu> Author: ddunbar Date: Tue Oct 21 18:34:13 2008 New Revision: 57934 URL: http://llvm.org/viewvc/llvm-project?rev=57934&view=rev Log: Update for PrintModulePass API change. Modified: llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp llvm-gcc-4.2/trunk/gcc/llvm-linker-hack.cpp Modified: llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp?rev=57934&r1=57933&r2=57934&view=diff ============================================================================== --- llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp (original) +++ llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp Tue Oct 21 18:34:13 2008 @@ -469,7 +469,7 @@ } else if (emit_llvm) { // Emit an LLVM .ll file to the output. This is used when passed // -emit-llvm -S to the GCC driver. - PerModulePasses->add(new PrintModulePass(AsmOutFile)); + PerModulePasses->add(createPrintModulePass(AsmOutFile)); HasPerModulePasses = true; } else { FunctionPassManager *PM; @@ -656,7 +656,7 @@ if (emit_llvm_bc) IntermediatePM->add(CreateBitcodeWriterPass(*AsmIntermediateOutStream)); if (emit_llvm) - IntermediatePM->add(new PrintModulePass(AsmIntermediateOutFile)); + IntermediatePM->add(createPrintModulePass(AsmIntermediateOutFile)); IntermediatePM->run(*TheModule); AsmIntermediateOutStream->flush(); fflush(asm_intermediate_out_file); Modified: llvm-gcc-4.2/trunk/gcc/llvm-linker-hack.cpp URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-linker-hack.cpp?rev=57934&r1=57933&r2=57934&view=diff ============================================================================== --- llvm-gcc-4.2/trunk/gcc/llvm-linker-hack.cpp (original) +++ llvm-gcc-4.2/trunk/gcc/llvm-linker-hack.cpp Tue Oct 21 18:34:13 2008 @@ -23,6 +23,7 @@ #include "llvm/Module.h" #include "llvm/ModuleProvider.h" #include "llvm/Analysis/Verifier.h" +#include "llvm/Assembly/PrintModulePass.h" #include "llvm/Target/TargetMachineRegistry.h" #include "llvm/Transforms/Scalar.h" #include "llvm/Transforms/IPO.h" @@ -86,6 +87,7 @@ llvm::createDeadTypeEliminationPass(); llvm::createLoopDeletionPass(); llvm::createAddReadAttrsPass(); + llvm::createPrintModulePass(0); std::string Err; llvm::TargetMachineRegistry::getClosestStaticTargetForModule(*MP->getModule(), From evan.cheng at apple.com Tue Oct 21 18:51:15 2008 From: evan.cheng at apple.com (Evan Cheng) Date: Tue, 21 Oct 2008 16:51:15 -0700 Subject: [llvm-commits] [llvm] r57932 - /llvm/trunk/lib/Target/X86/X86ISelLowering.cpp In-Reply-To: <200810212307.m9LN7p3S001712@zion.cs.uiuc.edu> References: <200810212307.m9LN7p3S001712@zion.cs.uiuc.edu> Message-ID: Nice. Thanks. However, can you fix the comments so there is a space between "//" and the first letter? It's driving me nuts. :-) Evan On Oct 21, 2008, at 4:07 PM, Dale Johannesen wrote: > Author: johannes > Date: Tue Oct 21 18:07:49 2008 > New Revision: 57932 > > URL: http://llvm.org/viewvc/llvm-project?rev=57932&view=rev > Log: > Add comments to explain uint64->f64 algorithm, > well, sort of. (Algorithm by Ian Ollmann.) > > > Modified: > llvm/trunk/lib/Target/X86/X86ISelLowering.cpp > > Modified: llvm/trunk/lib/Target/X86/X86ISelLowering.cpp > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86ISelLowering.cpp?rev=57932&r1=57931&r2=57932&view=diff > > = > = > = > = > = > = > = > = > ====================================================================== > --- llvm/trunk/lib/Target/X86/X86ISelLowering.cpp (original) > +++ llvm/trunk/lib/Target/X86/X86ISelLowering.cpp Tue Oct 21 > 18:07:49 2008 > @@ -4696,6 +4696,41 @@ > if (Op.getValueType() != MVT::f64 || !X86ScalarSSEf64) > return SDValue(); > > + // This algorithm is not obvious. Here it is in C code, more or > less: > +/* > + double uint64_to_double( uint32_t hi, uint32_t lo ) > + { > + static const __m128i exp = { 0x4330000045300000ULL, 0 }; > + static const __m128d bias = { 0x1.0p84, 0x1.0p52 }; > + > + //copy ints to xmm registers > + __m128i xh = _mm_cvtsi32_si128( hi ); > + __m128i xl = _mm_cvtsi32_si128( lo ); > + > + //combine into low half of a single xmm register > + __m128i x = _mm_unpacklo_epi32( xh, xl ); > + __m128d d; > + double sd; > + > + //merge in appropriate exponents to give the integer bits the > + // right magnitude > + x = _mm_unpacklo_epi32( x, exp ); > + > + //subtract away the biases to deal with the IEEE-754 double > precision > + //implicit 1 > + d = _mm_sub_pd( (__m128d) x, bias ); > + > + //All conversions up to here are exact. The correctly rounded > result is > + // calculated using the > + //current rounding mode using the following horizontal add. > + d = _mm_add_sd( d, _mm_unpackhi_pd( d, d ) ); > + _mm_store_sd( &sd, d ); //since we are returning doubles in > XMM, this > + //store doesn't really need to be here (except maybe to zero > the other > + //double) > + return sd; > + } > +*/ > + > // Get a XMM-vector-sized stack slot. > unsigned Size = 128/8; > MachineFunction &MF = DAG.getMachineFunction(); > > > _______________________________________________ > llvm-commits mailing list > llvm-commits at cs.uiuc.edu > http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits From ofv at wanadoo.es Tue Oct 21 18:52:03 2008 From: ofv at wanadoo.es (Oscar Fuentes) Date: Tue, 21 Oct 2008 23:52:03 -0000 Subject: [llvm-commits] [llvm] r57937 - /llvm/trunk/lib/VMCore/CMakeLists.txt Message-ID: <200810212352.m9LNq3Mv002975@zion.cs.uiuc.edu> Author: ofv Date: Tue Oct 21 18:52:03 2008 New Revision: 57937 URL: http://llvm.org/viewvc/llvm-project?rev=57937&view=rev Log: CMake: updated lib/VMCore/CMakeLists.txt Modified: llvm/trunk/lib/VMCore/CMakeLists.txt Modified: llvm/trunk/lib/VMCore/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/CMakeLists.txt?rev=57937&r1=57936&r2=57937&view=diff ============================================================================== --- llvm/trunk/lib/VMCore/CMakeLists.txt (original) +++ llvm/trunk/lib/VMCore/CMakeLists.txt Tue Oct 21 18:52:03 2008 @@ -20,6 +20,7 @@ ModuleProvider.cpp Pass.cpp PassManager.cpp + PrintModulePass.cpp Type.cpp TypeSymbolTable.cpp Use.cpp From isanbard at gmail.com Tue Oct 21 18:57:52 2008 From: isanbard at gmail.com (Bill Wendling) Date: Tue, 21 Oct 2008 23:57:52 -0000 Subject: [llvm-commits] [llvm] r57939 - /llvm/trunk/include/llvm/CodeGen/SelectionDAGNodes.h Message-ID: <200810212357.m9LNvqfp003139@zion.cs.uiuc.edu> Author: void Date: Tue Oct 21 18:57:52 2008 New Revision: 57939 URL: http://llvm.org/viewvc/llvm-project?rev=57939&view=rev Log: Fix comment to name "TokenFactor" instead of "Token factor". Modified: llvm/trunk/include/llvm/CodeGen/SelectionDAGNodes.h Modified: llvm/trunk/include/llvm/CodeGen/SelectionDAGNodes.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/SelectionDAGNodes.h?rev=57939&r1=57938&r2=57939&view=diff ============================================================================== --- llvm/trunk/include/llvm/CodeGen/SelectionDAGNodes.h (original) +++ llvm/trunk/include/llvm/CodeGen/SelectionDAGNodes.h Tue Oct 21 18:57:52 2008 @@ -73,7 +73,7 @@ // EntryToken - This is the marker used to indicate the start of the region. EntryToken, - // Token factor - This node takes multiple tokens as input and produces a + // TokenFactor - This node takes multiple tokens as input and produces a // single token result. This is used to represent the fact that the operand // operators are independent of each other. TokenFactor, From dalej at apple.com Tue Oct 21 19:02:32 2008 From: dalej at apple.com (Dale Johannesen) Date: Wed, 22 Oct 2008 00:02:32 -0000 Subject: [llvm-commits] [llvm] r57940 - /llvm/trunk/lib/Target/X86/X86ISelLowering.cpp Message-ID: <200810220002.m9M02XGE003275@zion.cs.uiuc.edu> Author: johannes Date: Tue Oct 21 19:02:32 2008 New Revision: 57940 URL: http://llvm.org/viewvc/llvm-project?rev=57940&view=rev Log: Adjust comments for pedantic satisfaction. Modified: llvm/trunk/lib/Target/X86/X86ISelLowering.cpp Modified: llvm/trunk/lib/Target/X86/X86ISelLowering.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86ISelLowering.cpp?rev=57940&r1=57939&r2=57940&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/X86ISelLowering.cpp (original) +++ llvm/trunk/lib/Target/X86/X86ISelLowering.cpp Tue Oct 21 19:02:32 2008 @@ -4703,30 +4703,30 @@ static const __m128i exp = { 0x4330000045300000ULL, 0 }; static const __m128d bias = { 0x1.0p84, 0x1.0p52 }; - //copy ints to xmm registers + // copy ints to xmm registers __m128i xh = _mm_cvtsi32_si128( hi ); __m128i xl = _mm_cvtsi32_si128( lo ); - //combine into low half of a single xmm register + // combine into low half of a single xmm register __m128i x = _mm_unpacklo_epi32( xh, xl ); __m128d d; double sd; - //merge in appropriate exponents to give the integer bits the + // merge in appropriate exponents to give the integer bits the // right magnitude x = _mm_unpacklo_epi32( x, exp ); - //subtract away the biases to deal with the IEEE-754 double precision - //implicit 1 + // subtract away the biases to deal with the IEEE-754 double precision + // implicit 1 d = _mm_sub_pd( (__m128d) x, bias ); - //All conversions up to here are exact. The correctly rounded result is + // All conversions up to here are exact. The correctly rounded result is // calculated using the - //current rounding mode using the following horizontal add. + // current rounding mode using the following horizontal add. d = _mm_add_sd( d, _mm_unpackhi_pd( d, d ) ); _mm_store_sd( &sd, d ); //since we are returning doubles in XMM, this - //store doesn't really need to be here (except maybe to zero the other - //double) + // store doesn't really need to be here (except maybe to zero the other + // double) return sd; } */ From ofv at wanadoo.es Tue Oct 21 21:51:55 2008 From: ofv at wanadoo.es (Oscar Fuentes) Date: Wed, 22 Oct 2008 02:51:55 -0000 Subject: [llvm-commits] [llvm] r57943 - in /llvm/trunk/lib: ExecutionEngine/CMakeLists.txt Target/ARM/CMakeLists.txt Target/PowerPC/AsmPrinter/CMakeLists.txt Target/X86/AsmPrinter/CMakeLists.txt VMCore/CMakeLists.txt Message-ID: <200810220251.m9M2pt9Z008069@zion.cs.uiuc.edu> Author: ofv Date: Tue Oct 21 21:51:53 2008 New Revision: 57943 URL: http://llvm.org/viewvc/llvm-project?rev=57943&view=rev Log: CMake: Turned some libraries into partially linked objects. Corrected names of LLVMCore and ARMCodeGen. Modified: llvm/trunk/lib/ExecutionEngine/CMakeLists.txt llvm/trunk/lib/Target/ARM/CMakeLists.txt llvm/trunk/lib/Target/PowerPC/AsmPrinter/CMakeLists.txt llvm/trunk/lib/Target/X86/AsmPrinter/CMakeLists.txt llvm/trunk/lib/VMCore/CMakeLists.txt Modified: llvm/trunk/lib/ExecutionEngine/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/CMakeLists.txt?rev=57943&r1=57942&r2=57943&view=diff ============================================================================== --- llvm/trunk/lib/ExecutionEngine/CMakeLists.txt (original) +++ llvm/trunk/lib/ExecutionEngine/CMakeLists.txt Tue Oct 21 21:51:53 2008 @@ -1,4 +1,4 @@ -add_llvm_library(LLVMExecutionEngine +add_partially_linked_object(LLVMExecutionEngine ExecutionEngine.cpp ExecutionEngineBindings.cpp ) Modified: llvm/trunk/lib/Target/ARM/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/CMakeLists.txt?rev=57943&r1=57942&r2=57943&view=diff ============================================================================== --- llvm/trunk/lib/Target/ARM/CMakeLists.txt (original) +++ llvm/trunk/lib/Target/ARM/CMakeLists.txt Tue Oct 21 21:51:53 2008 @@ -10,7 +10,7 @@ tablegen(ARMGenDAGISel.inc -gen-dag-isel) tablegen(ARMGenSubtarget.inc -gen-subtarget) -add_llvm_target(ARM +add_llvm_target(ARMCodeGen ARMCodeEmitter.cpp ARMConstantIslandPass.cpp ARMConstantPoolValue.cpp Modified: llvm/trunk/lib/Target/PowerPC/AsmPrinter/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/AsmPrinter/CMakeLists.txt?rev=57943&r1=57942&r2=57943&view=diff ============================================================================== --- llvm/trunk/lib/Target/PowerPC/AsmPrinter/CMakeLists.txt (original) +++ llvm/trunk/lib/Target/PowerPC/AsmPrinter/CMakeLists.txt Tue Oct 21 21:51:53 2008 @@ -1,6 +1,6 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/.. ) -add_llvm_library(LLVMPowerPCAsmPrinter +add_partially_linked_object(LLVMPowerPCAsmPrinter PPCAsmPrinter.cpp ) Modified: llvm/trunk/lib/Target/X86/AsmPrinter/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/AsmPrinter/CMakeLists.txt?rev=57943&r1=57942&r2=57943&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/AsmPrinter/CMakeLists.txt (original) +++ llvm/trunk/lib/Target/X86/AsmPrinter/CMakeLists.txt Tue Oct 21 21:51:53 2008 @@ -1,6 +1,6 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/.. ) -add_llvm_library(LLVMX86AsmPrinter +add_partially_linked_object(LLVMX86AsmPrinter X86ATTAsmPrinter.cpp X86AsmPrinter.cpp X86IntelAsmPrinter.cpp Modified: llvm/trunk/lib/VMCore/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/CMakeLists.txt?rev=57943&r1=57942&r2=57943&view=diff ============================================================================== --- llvm/trunk/lib/VMCore/CMakeLists.txt (original) +++ llvm/trunk/lib/VMCore/CMakeLists.txt Tue Oct 21 21:51:53 2008 @@ -1,4 +1,4 @@ -add_llvm_library(LLVMVMCore +add_llvm_library(LLVMCore AsmWriter.cpp Attributes.cpp AutoUpgrade.cpp From ofv at wanadoo.es Tue Oct 21 21:52:59 2008 From: ofv at wanadoo.es (Oscar Fuentes) Date: Wed, 22 Oct 2008 02:52:59 -0000 Subject: [llvm-commits] [llvm] r57944 - /llvm/trunk/examples/HowToUseJIT/CMakeLists.txt Message-ID: <200810220252.m9M2qxJd008156@zion.cs.uiuc.edu> Author: ofv Date: Tue Oct 21 21:52:59 2008 New Revision: 57944 URL: http://llvm.org/viewvc/llvm-project?rev=57944&view=rev Log: CMake: use add_llvm_example for HowToUseJIT. Modified: llvm/trunk/examples/HowToUseJIT/CMakeLists.txt Modified: llvm/trunk/examples/HowToUseJIT/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/examples/HowToUseJIT/CMakeLists.txt?rev=57944&r1=57943&r2=57944&view=diff ============================================================================== --- llvm/trunk/examples/HowToUseJIT/CMakeLists.txt (original) +++ llvm/trunk/examples/HowToUseJIT/CMakeLists.txt Tue Oct 21 21:52:59 2008 @@ -1,5 +1,5 @@ set(LLVM_LINK_COMPONENTS jit interpreter nativecodegen) -add_llvm_executable(HowToUseJIT +add_llvm_example(HowToUseJIT HowToUseJIT.cpp ) From ofv at wanadoo.es Tue Oct 21 21:56:07 2008 From: ofv at wanadoo.es (Oscar Fuentes) Date: Wed, 22 Oct 2008 02:56:07 -0000 Subject: [llvm-commits] [llvm] r57945 - in /llvm/trunk: CMakeLists.txt cmake/modules/AddLLVM.cmake cmake/modules/AddPartiallyLinkedObject.cmake tools/llvm-config/CMakeLists.txt Message-ID: <200810220256.m9M2u7pZ008241@zion.cs.uiuc.edu> Author: ofv Date: Tue Oct 21 21:56:07 2008 New Revision: 57945 URL: http://llvm.org/viewvc/llvm-project?rev=57945&view=rev Log: CMake: `make install' for libraries, executables and header files. Modified: llvm/trunk/CMakeLists.txt llvm/trunk/cmake/modules/AddLLVM.cmake llvm/trunk/cmake/modules/AddPartiallyLinkedObject.cmake llvm/trunk/tools/llvm-config/CMakeLists.txt Modified: llvm/trunk/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/CMakeLists.txt?rev=57945&r1=57944&r2=57945&view=diff ============================================================================== --- llvm/trunk/CMakeLists.txt (original) +++ llvm/trunk/CMakeLists.txt Tue Oct 21 21:56:07 2008 @@ -157,3 +157,16 @@ add_subdirectory(tools) add_subdirectory(examples) + +install(DIRECTORY include + DESTINATION . + PATTERN ".svn" EXCLUDE + PATTERN "*.cmake" EXCLUDE + PATTERN "*.in" EXCLUDE + ) + +install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include + DESTINATION . + ) + +# TODO: make and install documentation. Modified: llvm/trunk/cmake/modules/AddLLVM.cmake URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/AddLLVM.cmake?rev=57945&r1=57944&r2=57945&view=diff ============================================================================== --- llvm/trunk/cmake/modules/AddLLVM.cmake (original) +++ llvm/trunk/cmake/modules/AddLLVM.cmake Tue Oct 21 21:56:07 2008 @@ -7,6 +7,9 @@ if( LLVM_COMMON_DEPENDS ) add_dependencies( ${name} ${LLVM_COMMON_DEPENDS} ) endif( LLVM_COMMON_DEPENDS ) + install(TARGETS ${name} + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) endmacro(add_llvm_library name) @@ -34,12 +37,16 @@ macro(add_llvm_tool name) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${LLVM_TOOLS_BINARY_DIR}) add_llvm_executable(${name} ${ARGN}) + install(TARGETS ${name} + RUNTIME DESTINATION bin) endmacro(add_llvm_tool name) macro(add_llvm_example name) # set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${LLVM_EXAMPLES_BINARY_DIR}) add_llvm_executable(${name} ${ARGN}) + install(TARGETS ${name} + RUNTIME DESTINATION examples) endmacro(add_llvm_example name) Modified: llvm/trunk/cmake/modules/AddPartiallyLinkedObject.cmake URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/AddPartiallyLinkedObject.cmake?rev=57945&r1=57944&r2=57945&view=diff ============================================================================== --- llvm/trunk/cmake/modules/AddPartiallyLinkedObject.cmake (original) +++ llvm/trunk/cmake/modules/AddPartiallyLinkedObject.cmake Tue Oct 21 21:56:07 2008 @@ -32,4 +32,6 @@ set( llvm_libs ${llvm_libs} ${pll} PARENT_SCOPE) set( llvm_lib_targets ${llvm_lib_targets} ${tnplo} PARENT_SCOPE ) endif( MSVC ) + install(FILES ${pll} + DESTINATION lib) endmacro(add_partially_linked_object lib) Modified: llvm/trunk/tools/llvm-config/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-config/CMakeLists.txt?rev=57945&r1=57944&r2=57945&view=diff ============================================================================== --- llvm/trunk/tools/llvm-config/CMakeLists.txt (original) +++ llvm/trunk/tools/llvm-config/CMakeLists.txt Tue Oct 21 21:56:07 2008 @@ -104,3 +104,8 @@ DEPENDS ${LLVM_CONFIG}) add_dependencies(llvm-config.target ${llvm_lib_targets}) + +install(FILES ${LLVM_CONFIG} + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE + WORLD_READ WORLD_EXECUTE + DESTINATION bin) From daniel at zuster.org Tue Oct 21 22:25:24 2008 From: daniel at zuster.org (Daniel Dunbar) Date: Wed, 22 Oct 2008 03:25:24 -0000 Subject: [llvm-commits] [llvm] r57946 - in /llvm/trunk: include/llvm/Assembly/PrintModulePass.h lib/CodeGen/LLVMTargetMachine.cpp lib/VMCore/PrintModulePass.cpp tools/llvm-dis/llvm-dis.cpp tools/opt/opt.cpp Message-ID: <200810220325.m9M3POJ9009033@zion.cs.uiuc.edu> Author: ddunbar Date: Tue Oct 21 22:25:22 2008 New Revision: 57946 URL: http://llvm.org/viewvc/llvm-project?rev=57946&view=rev Log: Move Print*Pass to use raw_ostream. Modified: llvm/trunk/include/llvm/Assembly/PrintModulePass.h llvm/trunk/lib/CodeGen/LLVMTargetMachine.cpp llvm/trunk/lib/VMCore/PrintModulePass.cpp llvm/trunk/tools/llvm-dis/llvm-dis.cpp llvm/trunk/tools/opt/opt.cpp Modified: llvm/trunk/include/llvm/Assembly/PrintModulePass.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Assembly/PrintModulePass.h?rev=57946&r1=57945&r2=57946&view=diff ============================================================================== --- llvm/trunk/include/llvm/Assembly/PrintModulePass.h (original) +++ llvm/trunk/include/llvm/Assembly/PrintModulePass.h Tue Oct 21 22:25:22 2008 @@ -18,21 +18,21 @@ #ifndef LLVM_ASSEMBLY_PRINTMODULEPASS_H #define LLVM_ASSEMBLY_PRINTMODULEPASS_H -#include "llvm/Support/Streams.h" #include namespace llvm { class FunctionPass; class ModulePass; + class raw_ostream; /// createPrintModulePass - Create and return a pass that writes the - /// module to the specified OStream. - ModulePass *createPrintModulePass(llvm::OStream *OS, bool DeleteStream=false); + /// module to the specified raw_ostream. + ModulePass *createPrintModulePass(raw_ostream *OS, bool DeleteStream=false); /// createPrintFunctionPass - Create and return a pass that prints - /// functions to the specified OStream as they are processed. + /// functions to the specified raw_ostream as they are processed. FunctionPass *createPrintFunctionPass(const std::string &Banner, - llvm::OStream *OS, + raw_ostream *OS, bool DeleteStream=false); } // End llvm namespace Modified: llvm/trunk/lib/CodeGen/LLVMTargetMachine.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/LLVMTargetMachine.cpp?rev=57946&r1=57945&r2=57946&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/LLVMTargetMachine.cpp (original) +++ llvm/trunk/lib/CodeGen/LLVMTargetMachine.cpp Tue Oct 21 22:25:22 2008 @@ -151,7 +151,7 @@ if (!Fast) { PM.add(createLoopStrengthReducePass(getTargetLowering())); if (PrintLSR) - PM.add(createPrintFunctionPass("\n\n*** Code after LSR ***\n", &cerr)); + PM.add(createPrintFunctionPass("\n\n*** Code after LSR ***\n", &errs())); } PM.add(createGCLoweringPass()); @@ -168,7 +168,7 @@ if (PrintISelInput) PM.add(createPrintFunctionPass("\n\n" "*** Final LLVM Code input to ISel ***\n", - &cerr)); + &errs())); // Standard Lower-Level Passes. Modified: llvm/trunk/lib/VMCore/PrintModulePass.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/PrintModulePass.cpp?rev=57946&r1=57945&r2=57946&view=diff ============================================================================== --- llvm/trunk/lib/VMCore/PrintModulePass.cpp (original) +++ llvm/trunk/lib/VMCore/PrintModulePass.cpp Tue Oct 21 22:25:22 2008 @@ -17,18 +17,19 @@ #include "llvm/Module.h" #include "llvm/Pass.h" #include "llvm/Support/Compiler.h" +#include "llvm/Support/raw_ostream.h" using namespace llvm; namespace { class VISIBILITY_HIDDEN PrintModulePass : public ModulePass { - OStream *Out; // ostream to print on + raw_ostream *Out; // raw_ostream to print on bool DeleteStream; // Delete the ostream in our dtor? public: static char ID; - PrintModulePass() : ModulePass(intptr_t(&ID)), Out(&cerr), + PrintModulePass() : ModulePass(intptr_t(&ID)), Out(&errs()), DeleteStream(false) {} - PrintModulePass(OStream *o, bool DS) + PrintModulePass(raw_ostream *o, bool DS) : ModulePass(intptr_t(&ID)), Out(o), DeleteStream(DS) {} ~PrintModulePass() { @@ -36,7 +37,8 @@ } bool runOnModule(Module &M) { - (*Out) << M << std::flush; + (*Out) << M; + Out->flush(); return false; } @@ -47,13 +49,13 @@ class PrintFunctionPass : public FunctionPass { std::string Banner; // String to print before each function - OStream *Out; // ostream to print on + raw_ostream *Out; // raw_ostream to print on bool DeleteStream; // Delete the ostream in our dtor? public: static char ID; - PrintFunctionPass() : FunctionPass(intptr_t(&ID)), Banner(""), Out(&cerr), + PrintFunctionPass() : FunctionPass(intptr_t(&ID)), Banner(""), Out(&errs()), DeleteStream(false) {} - PrintFunctionPass(const std::string &B, OStream *o, bool DS) + PrintFunctionPass(const std::string &B, raw_ostream *o, bool DS) : FunctionPass(intptr_t(&ID)), Banner(B), Out(o), DeleteStream(DS) {} inline ~PrintFunctionPass() { @@ -65,6 +67,7 @@ // bool runOnFunction(Function &F) { (*Out) << Banner << static_cast(F); + Out->flush(); return false; } @@ -82,15 +85,17 @@ Y("print-function","Print function to stderr"); /// createPrintModulePass - Create and return a pass that writes the -/// module to the specified OStream. -ModulePass *llvm::createPrintModulePass(llvm::OStream *OS, bool DeleteStream) { +/// module to the specified raw_ostream. +ModulePass *llvm::createPrintModulePass(llvm::raw_ostream *OS, + bool DeleteStream) { return new PrintModulePass(OS, DeleteStream); } /// createPrintFunctionPass - Create and return a pass that prints -/// functions to the specified OStream as they are processed. +/// functions to the specified raw_ostream as they are processed. FunctionPass *llvm::createPrintFunctionPass(const std::string &Banner, - OStream *OS, bool DeleteStream) { + llvm::raw_ostream *OS, + bool DeleteStream) { return new PrintFunctionPass(Banner, OS, DeleteStream); } Modified: llvm/trunk/tools/llvm-dis/llvm-dis.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-dis/llvm-dis.cpp?rev=57946&r1=57945&r2=57946&view=diff ============================================================================== --- llvm/trunk/tools/llvm-dis/llvm-dis.cpp (original) +++ llvm/trunk/tools/llvm-dis/llvm-dis.cpp Tue Oct 21 22:25:22 2008 @@ -24,6 +24,7 @@ #include "llvm/Support/ManagedStatic.h" #include "llvm/Support/MemoryBuffer.h" #include "llvm/Support/Streams.h" +#include "llvm/Support/raw_ostream.h" #include "llvm/System/Signals.h" #include #include @@ -117,7 +118,7 @@ // All that llvm-dis does is write the assembly to a file. if (!DontPrint) { PassManager Passes; - OStream L(*Out); + raw_os_ostream L(*Out); Passes.add(createPrintModulePass(&L)); Passes.run(*M.get()); } Modified: llvm/trunk/tools/opt/opt.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/opt/opt.cpp?rev=57946&r1=57945&r2=57946&view=diff ============================================================================== --- llvm/trunk/tools/opt/opt.cpp (original) +++ llvm/trunk/tools/opt/opt.cpp Tue Oct 21 22:25:22 2008 @@ -30,6 +30,7 @@ #include "llvm/Support/PluginLoader.h" #include "llvm/Support/Streams.h" #include "llvm/Support/SystemUtils.h" +#include "llvm/Support/raw_ostream.h" #include "llvm/LinkAllPasses.h" #include "llvm/LinkAllVMCore.h" #include @@ -543,7 +544,7 @@ } if (PrintEachXForm) - Passes.add(createPrintModulePass(&cerr)); + Passes.add(createPrintModulePass(&errs())); } // If -std-compile-opts was specified at the end of the pass list, add them. From daniel at zuster.org Tue Oct 21 22:26:55 2008 From: daniel at zuster.org (Daniel Dunbar) Date: Wed, 22 Oct 2008 03:26:55 -0000 Subject: [llvm-commits] [llvm-gcc-4.2] r57947 - /llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp Message-ID: <200810220326.m9M3QuJd009078@zion.cs.uiuc.edu> Author: ddunbar Date: Tue Oct 21 22:26:55 2008 New Revision: 57947 URL: http://llvm.org/viewvc/llvm-project?rev=57947&view=rev Log: Update to use raw_ostream for PrintModulePass. Modified: llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp Modified: llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp?rev=57947&r1=57946&r2=57947&view=diff ============================================================================== --- llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp (original) +++ llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp Tue Oct 21 22:26:55 2008 @@ -469,7 +469,7 @@ } else if (emit_llvm) { // Emit an LLVM .ll file to the output. This is used when passed // -emit-llvm -S to the GCC driver. - PerModulePasses->add(createPrintModulePass(AsmOutFile)); + PerModulePasses->add(createPrintModulePass(AsmOutRawStream)); HasPerModulePasses = true; } else { FunctionPassManager *PM; @@ -653,11 +653,16 @@ FILE *asm_intermediate_out_file = fopen(asm_intermediate_out_filename, "w+b"); AsmIntermediateOutStream = new oFILEstream(asm_intermediate_out_file); AsmIntermediateOutFile = new OStream(*AsmIntermediateOutStream); + raw_ostream *AsmIntermediateRawOutStream = + new raw_os_ostream(*AsmIntermediateOutStream); if (emit_llvm_bc) IntermediatePM->add(CreateBitcodeWriterPass(*AsmIntermediateOutStream)); if (emit_llvm) - IntermediatePM->add(createPrintModulePass(AsmIntermediateOutFile)); + IntermediatePM->add(createPrintModulePass(AsmIntermediateRawOutStream)); IntermediatePM->run(*TheModule); + AsmIntermediateRawOutStream->flush(); + delete AsmIntermediateRawOutStream; + AsmIntermediateRawOutStream = 0; AsmIntermediateOutStream->flush(); fflush(asm_intermediate_out_file); delete AsmIntermediateOutStream; From clattner at apple.com Tue Oct 21 22:54:03 2008 From: clattner at apple.com (Chris Lattner) Date: Tue, 21 Oct 2008 20:54:03 -0700 Subject: [llvm-commits] [llvm] r57946 - in /llvm/trunk: include/llvm/Assembly/PrintModulePass.h lib/CodeGen/LLVMTargetMachine.cpp lib/VMCore/PrintModulePass.cpp tools/llvm-dis/llvm-dis.cpp tools/opt/opt.cpp In-Reply-To: <200810220325.m9M3POJ9009033@zion.cs.uiuc.edu> References: <200810220325.m9M3POJ9009033@zion.cs.uiuc.edu> Message-ID: <50A6BBF4-B6ED-44B7-A699-E4D365320C38@apple.com> On Oct 21, 2008, at 8:25 PM, Daniel Dunbar wrote: > Author: ddunbar > Date: Tue Oct 21 22:25:22 2008 > New Revision: 57946 > > URL: http://llvm.org/viewvc/llvm-project?rev=57946&view=rev > Log: > Move Print*Pass to use raw_ostream. nice! -Chris From sabre at nondot.org Tue Oct 21 23:09:39 2008 From: sabre at nondot.org (Chris Lattner) Date: Wed, 22 Oct 2008 04:09:39 -0000 Subject: [llvm-commits] [test-suite] r57950 - /test-suite/trunk/External/SPEC/CFP2000/188.ammp/Makefile Message-ID: <200810220409.m9M49dQ9010197@zion.cs.uiuc.edu> Author: lattner Date: Tue Oct 21 23:09:39 2008 New Revision: 57950 URL: http://llvm.org/viewvc/llvm-project?rev=57950&view=rev Log: Specify the FP tolerance that SPEC uses. This fixes PR2891 by allowing the CBE to produce a slightly different result than GCC due to awesome x87 numerical precision fu. Modified: test-suite/trunk/External/SPEC/CFP2000/188.ammp/Makefile Modified: test-suite/trunk/External/SPEC/CFP2000/188.ammp/Makefile URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CFP2000/188.ammp/Makefile?rev=57950&r1=57949&r2=57950&view=diff ============================================================================== --- test-suite/trunk/External/SPEC/CFP2000/188.ammp/Makefile (original) +++ test-suite/trunk/External/SPEC/CFP2000/188.ammp/Makefile Tue Oct 21 23:09:39 2008 @@ -5,6 +5,9 @@ STDOUT_FILENAME = ammp.out CPPFLAGS = +FP_ABSTOLERANCE=0.0001 +FP_TOLERANCE=0.003 + # override RUN_TYPE (this is a long running test): ifndef RUN_TYPE ifdef SMALL_PROBLEM_SIZE From tonic at nondot.org Tue Oct 21 23:22:16 2008 From: tonic at nondot.org (Tanya Lattner) Date: Wed, 22 Oct 2008 04:22:16 -0000 Subject: [llvm-commits] [test-suite] r57952 - /test-suite/branches/release_24/External/SPEC/CFP2000/188.ammp/Makefile Message-ID: <200810220422.m9M4MH0D010763@zion.cs.uiuc.edu> Author: tbrethou Date: Tue Oct 21 23:22:16 2008 New Revision: 57952 URL: http://llvm.org/viewvc/llvm-project?rev=57952&view=rev Log: Merge from mainline. Modified: test-suite/branches/release_24/External/SPEC/CFP2000/188.ammp/Makefile Modified: test-suite/branches/release_24/External/SPEC/CFP2000/188.ammp/Makefile URL: http://llvm.org/viewvc/llvm-project/test-suite/branches/release_24/External/SPEC/CFP2000/188.ammp/Makefile?rev=57952&r1=57951&r2=57952&view=diff ============================================================================== --- test-suite/branches/release_24/External/SPEC/CFP2000/188.ammp/Makefile (original) +++ test-suite/branches/release_24/External/SPEC/CFP2000/188.ammp/Makefile Tue Oct 21 23:22:16 2008 @@ -5,6 +5,9 @@ STDOUT_FILENAME = ammp.out CPPFLAGS = +FP_ABSTOLERANCE=0.0001 +FP_TOLERANCE=0.003 + # override RUN_TYPE (this is a long running test): ifndef RUN_TYPE ifdef SMALL_PROBLEM_SIZE From tonic at nondot.org Tue Oct 21 23:23:59 2008 From: tonic at nondot.org (Tanya Lattner) Date: Wed, 22 Oct 2008 04:23:59 -0000 Subject: [llvm-commits] [llvm] r57953 - /llvm/branches/release_24/lib/Transforms/IPO/ExtractGV.cpp Message-ID: <200810220423.m9M4Nxkr010911@zion.cs.uiuc.edu> Author: tbrethou Date: Tue Oct 21 23:23:59 2008 New Revision: 57953 URL: http://llvm.org/viewvc/llvm-project?rev=57953&view=rev Log: Merge from mainline Fix a bug that prevented llvm-extract -delete from working. Modified: llvm/branches/release_24/lib/Transforms/IPO/ExtractGV.cpp Modified: llvm/branches/release_24/lib/Transforms/IPO/ExtractGV.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_24/lib/Transforms/IPO/ExtractGV.cpp?rev=57953&r1=57952&r2=57953&view=diff ============================================================================== --- llvm/branches/release_24/lib/Transforms/IPO/ExtractGV.cpp (original) +++ llvm/branches/release_24/lib/Transforms/IPO/ExtractGV.cpp Tue Oct 21 23:23:59 2008 @@ -52,7 +52,7 @@ bool deleteGV() { for (std::vector::iterator GI = Named.begin(), GE = Named.end(); GI != GE; ++GI) { - if (Function* NamedFunc = dyn_cast(&*GI)) { + if (Function* NamedFunc = dyn_cast(*GI)) { // If we're in relinking mode, set linkage of all internal callees to // external. This will allow us extract function, and then - link // everything together From tonic at nondot.org Tue Oct 21 23:30:56 2008 From: tonic at nondot.org (Tanya Lattner) Date: Wed, 22 Oct 2008 04:30:56 -0000 Subject: [llvm-commits] [test-suite] r57954 - /test-suite/branches/release_24/MultiSource/Applications/lua/ Message-ID: <200810220430.m9M4Uu3t011131@zion.cs.uiuc.edu> Author: tbrethou Date: Tue Oct 21 23:30:56 2008 New Revision: 57954 URL: http://llvm.org/viewvc/llvm-project?rev=57954&view=rev Log: Remove lua from the release. Removed: test-suite/branches/release_24/MultiSource/Applications/lua/ From tonic at nondot.org Tue Oct 21 23:35:42 2008 From: tonic at nondot.org (Tanya Lattner) Date: Wed, 22 Oct 2008 04:35:42 -0000 Subject: [llvm-commits] [llvm] r57955 - in /llvm/branches/release_24: lib/CodeGen/AsmPrinter/DwarfWriter.cpp test/DebugInfo/2008-10-17-C++DebugCrash.ll Message-ID: <200810220435.m9M4Zg5m011274@zion.cs.uiuc.edu> Author: tbrethou Date: Tue Oct 21 23:35:41 2008 New Revision: 57955 URL: http://llvm.org/viewvc/llvm-project?rev=57955&view=rev Log: Merge from mainline. Added: llvm/branches/release_24/test/DebugInfo/2008-10-17-C++DebugCrash.ll - copied unchanged from r57714, llvm/trunk/test/DebugInfo/2008-10-17-C++DebugCrash.ll Modified: llvm/branches/release_24/lib/CodeGen/AsmPrinter/DwarfWriter.cpp Modified: llvm/branches/release_24/lib/CodeGen/AsmPrinter/DwarfWriter.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_24/lib/CodeGen/AsmPrinter/DwarfWriter.cpp?rev=57955&r1=57954&r2=57955&view=diff ============================================================================== --- llvm/branches/release_24/lib/CodeGen/AsmPrinter/DwarfWriter.cpp (original) +++ llvm/branches/release_24/lib/CodeGen/AsmPrinter/DwarfWriter.cpp Tue Oct 21 23:35:41 2008 @@ -2060,8 +2060,11 @@ return; } } - +#if 0 + // FIXME: This is causing an abort because C++ mangled names are compared + // with their unmangled counterparts. See PR2885. Don't do this assert. assert(0 && "Couldn't find DIE for machine function!"); +#endif } /// EmitInitial - Emit initial Dwarf declarations. This is necessary for cc From sabre at nondot.org Tue Oct 21 23:53:17 2008 From: sabre at nondot.org (Chris Lattner) Date: Wed, 22 Oct 2008 04:53:17 -0000 Subject: [llvm-commits] [llvm] r57956 - in /llvm/trunk: lib/Target/CBackend/CBackend.cpp test/CodeGen/CBackend/2008-10-21-PPCLongDoubleConstant.ll Message-ID: <200810220453.m9M4rHul011748@zion.cs.uiuc.edu> Author: lattner Date: Tue Oct 21 23:53:16 2008 New Revision: 57956 URL: http://llvm.org/viewvc/llvm-project?rev=57956&view=rev Log: Fix PR2907 by digging through constant expressions to find FP constants that are their operands. Added: llvm/trunk/test/CodeGen/CBackend/2008-10-21-PPCLongDoubleConstant.ll Modified: llvm/trunk/lib/Target/CBackend/CBackend.cpp Modified: llvm/trunk/lib/Target/CBackend/CBackend.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/CBackend/CBackend.cpp?rev=57956&r1=57955&r2=57956&view=diff ============================================================================== --- llvm/trunk/lib/Target/CBackend/CBackend.cpp (original) +++ llvm/trunk/lib/Target/CBackend/CBackend.cpp Tue Oct 21 23:53:16 2008 @@ -88,12 +88,15 @@ std::map FPConstantMap; std::set intrinsicPrototypesAlreadyGenerated; std::set ByValParams; + unsigned FPCounter; public: static char ID; explicit CWriter(raw_ostream &o) : FunctionPass(&ID), Out(o), IL(0), Mang(0), LI(0), - TheModule(0), TAsm(0), TD(0) {} + TheModule(0), TAsm(0), TD(0) { + FPCounter = 0; + } virtual const char *getPassName() const { return "C backend"; } @@ -181,6 +184,7 @@ void printModuleTypes(const TypeSymbolTable &ST); void printContainedStructs(const Type *Ty, std::set &); void printFloatingPointConstants(Function &F); + void printFloatingPointConstants(const Constant *C); void printFunctionSignature(const Function *F, bool Prototype); void printFunction(Function &); @@ -834,10 +838,10 @@ static bool isFPCSafeToPrint(const ConstantFP *CFP) { bool ignored; // Do long doubles in hex for now. - if (CFP->getType()!=Type::FloatTy && CFP->getType()!=Type::DoubleTy) + if (CFP->getType() != Type::FloatTy && CFP->getType() != Type::DoubleTy) return false; APFloat APF = APFloat(CFP->getValueAPF()); // copy - if (CFP->getType()==Type::FloatTy) + if (CFP->getType() == Type::FloatTy) APF.convert(APFloat::IEEEdouble, APFloat::rmNearestTiesToEven, &ignored); #if HAVE_PRINTF_A && ENABLE_CBE_PRINTF_A char Buffer[100]; @@ -2029,51 +2033,68 @@ // the precision of the printed form, unless the printed form preserves // precision. // - static unsigned FPCounter = 0; for (constant_iterator I = constant_begin(&F), E = constant_end(&F); I != E; ++I) - if (const ConstantFP *FPC = dyn_cast(*I)) - if (!isFPCSafeToPrint(FPC) && // Do not put in FPConstantMap if safe. - !FPConstantMap.count(FPC)) { - FPConstantMap[FPC] = FPCounter; // Number the FP constants - - if (FPC->getType() == Type::DoubleTy) { - double Val = FPC->getValueAPF().convertToDouble(); - uint64_t i = FPC->getValueAPF().bitcastToAPInt().getZExtValue(); - Out << "static const ConstantDoubleTy FPConstant" << FPCounter++ - << " = 0x" << utohexstr(i) - << "ULL; /* " << Val << " */\n"; - } else if (FPC->getType() == Type::FloatTy) { - float Val = FPC->getValueAPF().convertToFloat(); - uint32_t i = (uint32_t)FPC->getValueAPF().bitcastToAPInt(). - getZExtValue(); - Out << "static const ConstantFloatTy FPConstant" << FPCounter++ - << " = 0x" << utohexstr(i) - << "U; /* " << Val << " */\n"; - } else if (FPC->getType() == Type::X86_FP80Ty) { - // api needed to prevent premature destruction - APInt api = FPC->getValueAPF().bitcastToAPInt(); - const uint64_t *p = api.getRawData(); - Out << "static const ConstantFP80Ty FPConstant" << FPCounter++ - << " = { 0x" - << utohexstr((uint16_t)p[1] | (p[0] & 0xffffffffffffLL)<<16) - << "ULL, 0x" << utohexstr((uint16_t)(p[0] >> 48)) << ",{0,0,0}" - << "}; /* Long double constant */\n"; - } else if (FPC->getType() == Type::PPC_FP128Ty) { - APInt api = FPC->getValueAPF().bitcastToAPInt(); - const uint64_t *p = api.getRawData(); - Out << "static const ConstantFP128Ty FPConstant" << FPCounter++ - << " = { 0x" - << utohexstr(p[0]) << ", 0x" << utohexstr(p[1]) - << "}; /* Long double constant */\n"; - - } else - assert(0 && "Unknown float type!"); - } + printFloatingPointConstants(*I); Out << '\n'; } +void CWriter::printFloatingPointConstants(const Constant *C) { + // If this is a constant expression, recursively check for constant fp values. + if (const ConstantExpr *CE = dyn_cast(C)) { + for (unsigned i = 0, e = CE->getNumOperands(); i != e; ++i) + printFloatingPointConstants(CE->getOperand(i)); + return; + } + + // Otherwise, check for a FP constant that we need to print. + const ConstantFP *FPC = dyn_cast(C); + if (FPC == 0 || + // Do not put in FPConstantMap if safe. + isFPCSafeToPrint(FPC) || + // Already printed this constant? + FPConstantMap.count(FPC)) + return; + + FPConstantMap[FPC] = FPCounter; // Number the FP constants + + if (FPC->getType() == Type::DoubleTy) { + double Val = FPC->getValueAPF().convertToDouble(); + uint64_t i = FPC->getValueAPF().bitcastToAPInt().getZExtValue(); + Out << "static const ConstantDoubleTy FPConstant" << FPCounter++ + << " = 0x" << utohexstr(i) + << "ULL; /* " << Val << " */\n"; + } else if (FPC->getType() == Type::FloatTy) { + float Val = FPC->getValueAPF().convertToFloat(); + uint32_t i = (uint32_t)FPC->getValueAPF().bitcastToAPInt(). + getZExtValue(); + Out << "static const ConstantFloatTy FPConstant" << FPCounter++ + << " = 0x" << utohexstr(i) + << "U; /* " << Val << " */\n"; + } else if (FPC->getType() == Type::X86_FP80Ty) { + // api needed to prevent premature destruction + APInt api = FPC->getValueAPF().bitcastToAPInt(); + const uint64_t *p = api.getRawData(); + Out << "static const ConstantFP80Ty FPConstant" << FPCounter++ + << " = { 0x" + << utohexstr((uint16_t)p[1] | (p[0] & 0xffffffffffffLL)<<16) + << "ULL, 0x" << utohexstr((uint16_t)(p[0] >> 48)) << ",{0,0,0}" + << "}; /* Long double constant */\n"; + } else if (FPC->getType() == Type::PPC_FP128Ty) { + APInt api = FPC->getValueAPF().bitcastToAPInt(); + const uint64_t *p = api.getRawData(); + Out << "static const ConstantFP128Ty FPConstant" << FPCounter++ + << " = { 0x" + << utohexstr(p[0]) << ", 0x" << utohexstr(p[1]) + << "}; /* Long double constant */\n"; + + } else { + assert(0 && "Unknown float type!"); + } +} + + /// printSymbolTable - Run through symbol table looking for type names. If a /// type name is found, emit its declaration... Added: llvm/trunk/test/CodeGen/CBackend/2008-10-21-PPCLongDoubleConstant.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/CBackend/2008-10-21-PPCLongDoubleConstant.ll?rev=57956&view=auto ============================================================================== --- llvm/trunk/test/CodeGen/CBackend/2008-10-21-PPCLongDoubleConstant.ll (added) +++ llvm/trunk/test/CodeGen/CBackend/2008-10-21-PPCLongDoubleConstant.ll Tue Oct 21 23:53:16 2008 @@ -0,0 +1,29 @@ +; RUN: llvm-as < %s | llc -march=c +; PR2907 +target datalayout = "E-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f128:64:128" +target triple = "powerpc-apple-darwin9.5" + %"struct.Point<0>" = type { %"struct.Tensor<1,0>" } + %"struct.QGauss2<1>" = type { %"struct.Quadrature<0>" } + %"struct.Quadrature<0>" = type { %struct.Subscriptor, i32, %"struct.std::vector,std::allocator > >", %"struct.std::vector >" } + %struct.Subscriptor = type { i32 (...)**, i32, %"struct.std::type_info"* } + %"struct.Tensor<1,0>" = type { [1 x double] } + %"struct.std::_Vector_base,std::allocator > >" = type { %"struct.std::_Vector_base,std::allocator > >::_Vector_impl" } + %"struct.std::_Vector_base,std::allocator > >::_Vector_impl" = type { %"struct.Point<0>"*, %"struct.Point<0>"*, %"struct.Point<0>"* } + %"struct.std::_Vector_base >" = type { %"struct.std::_Vector_base >::_Vector_impl" } + %"struct.std::_Vector_base >::_Vector_impl" = type { double*, double*, double* } + %"struct.std::type_info" = type { i32 (...)**, i8* } + %"struct.std::vector,std::allocator > >" = type { %"struct.std::_Vector_base,std::allocator > >" } + %"struct.std::vector >" = type { %"struct.std::_Vector_base >" } + +define fastcc void @_ZN6QGaussILi1EEC1Ej(%"struct.QGauss2<1>"* %this, i32 %n) { +entry: + br label %bb4 + +bb4: ; preds = %bb5.split, %bb4, %entry + %0 = fcmp ogt ppc_fp128 0xM00000000000000000000000000000000, select (i1 fcmp olt (ppc_fp128 fpext (double 0x3C447AE147AE147B to ppc_fp128), ppc_fp128 mul (ppc_fp128 0xM00000000000000010000000000000000, ppc_fp128 0xM40140000000000000000000000000000)), ppc_fp128 mul (ppc_fp128 0xM00000000000000010000000000000000, ppc_fp128 0xM40140000000000000000000000000000), ppc_fp128 fpext (double 0x3C447AE147AE147B to ppc_fp128)) ; [#uses=1] + br i1 %0, label %bb4, label %bb5.split + +bb5.split: ; preds = %bb4 + %1 = getelementptr double* null, i32 0 ; [#uses=0] + br label %bb4 +} From tonic at nondot.org Wed Oct 22 00:05:36 2008 From: tonic at nondot.org (Tanya Lattner) Date: Wed, 22 Oct 2008 05:05:36 -0000 Subject: [llvm-commits] [llvm] r57957 - in /llvm/branches/release_24: lib/Target/CBackend/CBackend.cpp test/CodeGen/CBackend/2008-10-21-PPCLongDoubleConstant.ll Message-ID: <200810220505.m9M55aiZ012148@zion.cs.uiuc.edu> Author: tbrethou Date: Wed Oct 22 00:05:36 2008 New Revision: 57957 URL: http://llvm.org/viewvc/llvm-project?rev=57957&view=rev Log: Merge from mainline. Added: llvm/branches/release_24/test/CodeGen/CBackend/2008-10-21-PPCLongDoubleConstant.ll - copied unchanged from r57956, llvm/trunk/test/CodeGen/CBackend/2008-10-21-PPCLongDoubleConstant.ll Modified: llvm/branches/release_24/lib/Target/CBackend/CBackend.cpp Modified: llvm/branches/release_24/lib/Target/CBackend/CBackend.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_24/lib/Target/CBackend/CBackend.cpp?rev=57957&r1=57956&r2=57957&view=diff ============================================================================== --- llvm/branches/release_24/lib/Target/CBackend/CBackend.cpp (original) +++ llvm/branches/release_24/lib/Target/CBackend/CBackend.cpp Wed Oct 22 00:05:36 2008 @@ -88,12 +88,15 @@ std::map FPConstantMap; std::set intrinsicPrototypesAlreadyGenerated; std::set ByValParams; + unsigned FPCounter; public: static char ID; explicit CWriter(raw_ostream &o) : FunctionPass(&ID), Out(o), IL(0), Mang(0), LI(0), - TheModule(0), TAsm(0), TD(0) {} + TheModule(0), TAsm(0), TD(0) { + FPCounter = 0; + } virtual const char *getPassName() const { return "C backend"; } @@ -181,6 +184,7 @@ void printModuleTypes(const TypeSymbolTable &ST); void printContainedStructs(const Type *Ty, std::set &); void printFloatingPointConstants(Function &F); + void printFloatingPointConstants(const Constant *C); void printFunctionSignature(const Function *F, bool Prototype); void printFunction(Function &); @@ -833,10 +837,10 @@ // static bool isFPCSafeToPrint(const ConstantFP *CFP) { // Do long doubles in hex for now. - if (CFP->getType()!=Type::FloatTy && CFP->getType()!=Type::DoubleTy) + if (CFP->getType() != Type::FloatTy && CFP->getType() != Type::DoubleTy) return false; APFloat APF = APFloat(CFP->getValueAPF()); // copy - if (CFP->getType()==Type::FloatTy) + if (CFP->getType() == Type::FloatTy) APF.convert(APFloat::IEEEdouble, APFloat::rmNearestTiesToEven); #if HAVE_PRINTF_A && ENABLE_CBE_PRINTF_A char Buffer[100]; @@ -1128,11 +1132,21 @@ "long double") << "*)&FPConstant" << I->second << ')'; } else { - assert(FPC->getType() == Type::FloatTy || - FPC->getType() == Type::DoubleTy); - double V = FPC->getType() == Type::FloatTy ? - FPC->getValueAPF().convertToFloat() : - FPC->getValueAPF().convertToDouble(); + double V; + if (FPC->getType() == Type::FloatTy) + V = FPC->getValueAPF().convertToFloat(); + else if (FPC->getType() == Type::DoubleTy) + V = FPC->getValueAPF().convertToDouble(); + else { + // Long double. Convert the number to double, discarding precision. + // This is not awesome, but it at least makes the CBE output somewhat + // useful. + APFloat Tmp = FPC->getValueAPF(); + bool LosesInfo; + Tmp.convert(APFloat::IEEEdouble, APFloat::rmTowardZero, &LosesInfo); + V = Tmp.convertToDouble(); + } + if (IsNAN(V)) { // The value is NaN @@ -2018,51 +2032,68 @@ // the precision of the printed form, unless the printed form preserves // precision. // - static unsigned FPCounter = 0; for (constant_iterator I = constant_begin(&F), E = constant_end(&F); I != E; ++I) - if (const ConstantFP *FPC = dyn_cast(*I)) - if (!isFPCSafeToPrint(FPC) && // Do not put in FPConstantMap if safe. - !FPConstantMap.count(FPC)) { - FPConstantMap[FPC] = FPCounter; // Number the FP constants - - if (FPC->getType() == Type::DoubleTy) { - double Val = FPC->getValueAPF().convertToDouble(); - uint64_t i = FPC->getValueAPF().convertToAPInt().getZExtValue(); - Out << "static const ConstantDoubleTy FPConstant" << FPCounter++ - << " = 0x" << utohexstr(i) - << "ULL; /* " << Val << " */\n"; - } else if (FPC->getType() == Type::FloatTy) { - float Val = FPC->getValueAPF().convertToFloat(); - uint32_t i = (uint32_t)FPC->getValueAPF().convertToAPInt(). - getZExtValue(); - Out << "static const ConstantFloatTy FPConstant" << FPCounter++ - << " = 0x" << utohexstr(i) - << "U; /* " << Val << " */\n"; - } else if (FPC->getType() == Type::X86_FP80Ty) { - // api needed to prevent premature destruction - APInt api = FPC->getValueAPF().convertToAPInt(); - const uint64_t *p = api.getRawData(); - Out << "static const ConstantFP80Ty FPConstant" << FPCounter++ - << " = { 0x" - << utohexstr((uint16_t)p[1] | (p[0] & 0xffffffffffffLL)<<16) - << "ULL, 0x" << utohexstr((uint16_t)(p[0] >> 48)) << ",{0,0,0}" - << "}; /* Long double constant */\n"; - } else if (FPC->getType() == Type::PPC_FP128Ty) { - APInt api = FPC->getValueAPF().convertToAPInt(); - const uint64_t *p = api.getRawData(); - Out << "static const ConstantFP128Ty FPConstant" << FPCounter++ - << " = { 0x" - << utohexstr(p[0]) << ", 0x" << utohexstr(p[1]) - << "}; /* Long double constant */\n"; - - } else - assert(0 && "Unknown float type!"); - } + printFloatingPointConstants(*I); Out << '\n'; } +void CWriter::printFloatingPointConstants(const Constant *C) { + // If this is a constant expression, recursively check for constant fp values. + if (const ConstantExpr *CE = dyn_cast(C)) { + for (unsigned i = 0, e = CE->getNumOperands(); i != e; ++i) + printFloatingPointConstants(CE->getOperand(i)); + return; + } + + // Otherwise, check for a FP constant that we need to print. + const ConstantFP *FPC = dyn_cast(C); + if (FPC == 0 || + // Do not put in FPConstantMap if safe. + isFPCSafeToPrint(FPC) || + // Already printed this constant? + FPConstantMap.count(FPC)) + return; + + FPConstantMap[FPC] = FPCounter; // Number the FP constants + + if (FPC->getType() == Type::DoubleTy) { + double Val = FPC->getValueAPF().convertToDouble(); + uint64_t i = FPC->getValueAPF().bitcastToAPInt().getZExtValue(); + Out << "static const ConstantDoubleTy FPConstant" << FPCounter++ + << " = 0x" << utohexstr(i) + << "ULL; /* " << Val << " */\n"; + } else if (FPC->getType() == Type::FloatTy) { + float Val = FPC->getValueAPF().convertToFloat(); + uint32_t i = (uint32_t)FPC->getValueAPF().bitcastToAPInt(). + getZExtValue(); + Out << "static const ConstantFloatTy FPConstant" << FPCounter++ + << " = 0x" << utohexstr(i) + << "U; /* " << Val << " */\n"; + } else if (FPC->getType() == Type::X86_FP80Ty) { + // api needed to prevent premature destruction + APInt api = FPC->getValueAPF().bitcastToAPInt(); + const uint64_t *p = api.getRawData(); + Out << "static const ConstantFP80Ty FPConstant" << FPCounter++ + << " = { 0x" + << utohexstr((uint16_t)p[1] | (p[0] & 0xffffffffffffLL)<<16) + << "ULL, 0x" << utohexstr((uint16_t)(p[0] >> 48)) << ",{0,0,0}" + << "}; /* Long double constant */\n"; + } else if (FPC->getType() == Type::PPC_FP128Ty) { + APInt api = FPC->getValueAPF().bitcastToAPInt(); + const uint64_t *p = api.getRawData(); + Out << "static const ConstantFP128Ty FPConstant" << FPCounter++ + << " = { 0x" + << utohexstr(p[0]) << ", 0x" << utohexstr(p[1]) + << "}; /* Long double constant */\n"; + + } else { + assert(0 && "Unknown float type!"); + } +} + + /// printSymbolTable - Run through symbol table looking for type names. If a /// type name is found, emit its declaration... From tonic at nondot.org Wed Oct 22 00:09:51 2008 From: tonic at nondot.org (Tanya Lattner) Date: Wed, 22 Oct 2008 05:09:51 -0000 Subject: [llvm-commits] [llvm] r57958 - /llvm/branches/release_24/lib/Analysis/ScalarEvolution.cpp Message-ID: <200810220509.m9M59pK3012337@zion.cs.uiuc.edu> Author: tbrethou Date: Wed Oct 22 00:09:51 2008 New Revision: 57958 URL: http://llvm.org/viewvc/llvm-project?rev=57958&view=rev Log: Merge from mainline. Disallow the construction of SCEVs with could-not-compute operands. Catch CNCs returned by BinomialCoefficient and don't try to operate with them. This replaces the previous fix for PR2857. Modified: llvm/branches/release_24/lib/Analysis/ScalarEvolution.cpp Modified: llvm/branches/release_24/lib/Analysis/ScalarEvolution.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_24/lib/Analysis/ScalarEvolution.cpp?rev=57958&r1=57957&r2=57958&view=diff ============================================================================== --- llvm/branches/release_24/lib/Analysis/ScalarEvolution.cpp (original) +++ llvm/branches/release_24/lib/Analysis/ScalarEvolution.cpp Wed Oct 22 00:09:51 2008 @@ -644,11 +644,12 @@ // The computation is correct in the face of overflow provided that the // multiplication is performed _after_ the evaluation of the binomial // coefficient. - SCEVHandle Val = - SE.getMulExpr(getOperand(i), - BinomialCoefficient(It, i, SE, - cast(getType()))); - Result = SE.getAddExpr(Result, Val); + SCEVHandle Coeff = BinomialCoefficient(It, i, SE, + cast(getType())); + if (isa(Coeff)) + return Coeff; + + Result = SE.getAddExpr(Result, SE.getMulExpr(getOperand(i), Coeff)); } return Result; } @@ -676,9 +677,6 @@ return getAddRecExpr(Operands, AddRec->getLoop()); } - if (isa(Op)) - return new SCEVCouldNotCompute(); - SCEVTruncateExpr *&Result = (*SCEVTruncates)[std::make_pair(Op, Ty)]; if (Result == 0) Result = new SCEVTruncateExpr(Op, Ty); return Result; @@ -694,9 +692,6 @@ // operands (often constants). This would allow analysis of something like // this: for (unsigned char X = 0; X < 100; ++X) { int Y = X; } - if (isa(Op)) - return new SCEVCouldNotCompute(); - SCEVZeroExtendExpr *&Result = (*SCEVZeroExtends)[std::make_pair(Op, Ty)]; if (Result == 0) Result = new SCEVZeroExtendExpr(Op, Ty); return Result; @@ -712,9 +707,6 @@ // operands (often constants). This would allow analysis of something like // this: for (signed char X = 0; X < 100; ++X) { int Y = X; } - if (isa(Op)) - return new SCEVCouldNotCompute(); - SCEVSignExtendExpr *&Result = (*SCEVSignExtends)[std::make_pair(Op, Ty)]; if (Result == 0) Result = new SCEVSignExtendExpr(Op, Ty); return Result; @@ -743,10 +735,6 @@ // Sort by complexity, this groups all similar expression types together. GroupByComplexity(Ops); - // Could not compute plus anything equals could not compute. - if (isa(Ops.back())) - return new SCEVCouldNotCompute(); - // If there are any constants, fold them together. unsigned Idx = 0; if (SCEVConstant *LHSC = dyn_cast(Ops[0])) { @@ -972,21 +960,6 @@ // Sort by complexity, this groups all similar expression types together. GroupByComplexity(Ops); - if (isa(Ops.back())) { - // CNC * 0 = 0 - for (unsigned i = 0, e = Ops.size() - 1; i != e; ++i) { - if (Ops[i]->getSCEVType() != scConstant) - break; - - SCEVConstant *SC = cast(Ops[i]); - if (SC->getValue()->isMinValue(false)) - return SC; - } - - // Otherwise, we can't compute it. - return new SCEVCouldNotCompute(); - } - // If there are any constants, fold them together. unsigned Idx = 0; if (SCEVConstant *LHSC = dyn_cast(Ops[0])) { @@ -1152,9 +1125,6 @@ // FIXME: implement folding of (X*4)/4 when we know X*4 doesn't overflow. - if (isa(LHS) || isa(RHS)) - return new SCEVCouldNotCompute(); - SCEVUDivExpr *&Result = (*SCEVUDivs)[std::make_pair(LHS, RHS)]; if (Result == 0) Result = new SCEVUDivExpr(LHS, RHS); return Result; @@ -1202,12 +1172,6 @@ } } - // Refuse to build an AddRec out of SCEVCouldNotCompute. - for (unsigned i = 0, e = Operands.size(); i != e; ++i) { - if (isa(Operands[i])) - return new SCEVCouldNotCompute(); - } - SCEVAddRecExpr *&Result = (*SCEVAddRecExprs)[std::make_pair(L, std::vector(Operands.begin(), Operands.end()))]; @@ -1230,21 +1194,6 @@ // Sort by complexity, this groups all similar expression types together. GroupByComplexity(Ops); - if (isa(Ops.back())) { - // CNC smax +inf = +inf. - for (unsigned i = 0, e = Ops.size() - 1; i != e; ++i) { - if (Ops[i]->getSCEVType() != scConstant) - break; - - SCEVConstant *SC = cast(Ops[i]); - if (SC->getValue()->isMaxValue(true)) - return SC; - } - - // Otherwise, we can't compute it. - return new SCEVCouldNotCompute(); - } - // If there are any constants, fold them together. unsigned Idx = 0; if (SCEVConstant *LHSC = dyn_cast(Ops[0])) { @@ -1325,21 +1274,6 @@ // Sort by complexity, this groups all similar expression types together. GroupByComplexity(Ops); - if (isa(Ops[0])) { - // CNC umax inf = inf. - for (unsigned i = 0, e = Ops.size() - 1; i != e; ++i) { - if (Ops[i]->getSCEVType() != scConstant) - break; - - SCEVConstant *SC = cast(Ops[i]); - if (SC->getValue()->isMaxValue(false)) - return SC; - } - - // Otherwise, we can't compute it. - return new SCEVCouldNotCompute(); - } - // If there are any constants, fold them together. unsigned Idx = 0; if (SCEVConstant *LHSC = dyn_cast(Ops[0])) { From sabre at nondot.org Wed Oct 22 00:29:55 2008 From: sabre at nondot.org (Chris Lattner) Date: Wed, 22 Oct 2008 05:29:55 -0000 Subject: [llvm-commits] [test-suite] r57961 - /test-suite/trunk/MultiSource/Benchmarks/Trimaran/netbench-crc/packet.c Message-ID: <200810220529.m9M5Ttni013745@zion.cs.uiuc.edu> Author: lattner Date: Wed Oct 22 00:29:55 2008 New Revision: 57961 URL: http://llvm.org/viewvc/llvm-project?rev=57961&view=rev Log: remove use of uninitialized memory from this program. This lets it be valgrind clean. Modified: test-suite/trunk/MultiSource/Benchmarks/Trimaran/netbench-crc/packet.c Modified: test-suite/trunk/MultiSource/Benchmarks/Trimaran/netbench-crc/packet.c URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Trimaran/netbench-crc/packet.c?rev=57961&r1=57960&r2=57961&view=diff ============================================================================== --- test-suite/trunk/MultiSource/Benchmarks/Trimaran/netbench-crc/packet.c (original) +++ test-suite/trunk/MultiSource/Benchmarks/Trimaran/netbench-crc/packet.c Wed Oct 22 00:29:55 2008 @@ -16,6 +16,7 @@ #include #include +#include #include "packet_lengths.h" #include "headers.h" #include "packet.h" @@ -56,6 +57,7 @@ } /* Copy the header information */ + memset((void*)packet, 0, packet_length); memcpy ((void *)packet, (void *)headers[packet_number], HEADER_SIZE); #endif From tonic at nondot.org Wed Oct 22 00:38:06 2008 From: tonic at nondot.org (Tanya Lattner) Date: Wed, 22 Oct 2008 05:38:06 -0000 Subject: [llvm-commits] [test-suite] r57962 - /test-suite/branches/release_24/MultiSource/Benchmarks/Trimaran/netbench-crc/packet.c Message-ID: <200810220538.m9M5c6fb014379@zion.cs.uiuc.edu> Author: tbrethou Date: Wed Oct 22 00:38:05 2008 New Revision: 57962 URL: http://llvm.org/viewvc/llvm-project?rev=57962&view=rev Log: Merge from mainline. remove use of uninitialized memory from this program. This lets it be valgrind clean. Modified: test-suite/branches/release_24/MultiSource/Benchmarks/Trimaran/netbench-crc/packet.c Modified: test-suite/branches/release_24/MultiSource/Benchmarks/Trimaran/netbench-crc/packet.c URL: http://llvm.org/viewvc/llvm-project/test-suite/branches/release_24/MultiSource/Benchmarks/Trimaran/netbench-crc/packet.c?rev=57962&r1=57961&r2=57962&view=diff ============================================================================== --- test-suite/branches/release_24/MultiSource/Benchmarks/Trimaran/netbench-crc/packet.c (original) +++ test-suite/branches/release_24/MultiSource/Benchmarks/Trimaran/netbench-crc/packet.c Wed Oct 22 00:38:05 2008 @@ -16,6 +16,7 @@ #include #include +#include #include "packet_lengths.h" #include "headers.h" #include "packet.h" @@ -56,6 +57,7 @@ } /* Copy the header information */ + memset((void*)packet, 0, packet_length); memcpy ((void *)packet, (void *)headers[packet_number], HEADER_SIZE); #endif From tomas.l.olsen at gmail.com Wed Oct 22 03:15:05 2008 From: tomas.l.olsen at gmail.com (Tomas Lindquist Olsen) Date: Wed, 22 Oct 2008 10:15:05 +0200 Subject: [llvm-commits] [llvm] r57925 - in /llvm/trunk: lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp test/CodeGen/X86/pr2924.ll In-Reply-To: <200810212000.m9LK0h2U028185@zion.cs.uiuc.edu> References: <200810212000.m9LK0h2U028185@zion.cs.uiuc.edu> Message-ID: <7aa9f8a40810220115v487c513ci764df9b5b5fcb947@mail.gmail.com> On Tue, Oct 21, 2008 at 10:00 PM, Dan Gohman wrote: > Author: djg > Date: Tue Oct 21 15:00:42 2008 > New Revision: 57925 > > URL: http://llvm.org/viewvc/llvm-project?rev=57925&view=rev > Log: > Fix SelectionDAGBuild lowering of Select instructions to > handle first-class aggregate values. Also, fix a bug in > the Ret handling for empty aggregates. > > Added: > llvm/trunk/test/CodeGen/X86/pr2924.ll > Modified: > llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp > > Any chance this will make it into the 2.4 branch ? -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20081022/1397aa9b/attachment.html From baldrick at free.fr Wed Oct 22 04:00:33 2008 From: baldrick at free.fr (Duncan Sands) Date: Wed, 22 Oct 2008 09:00:33 -0000 Subject: [llvm-commits] [llvm] r57965 - /llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp Message-ID: <200810220900.m9M90X1p031596@zion.cs.uiuc.edu> Author: baldrick Date: Wed Oct 22 04:00:33 2008 New Revision: 57965 URL: http://llvm.org/viewvc/llvm-project?rev=57965&view=rev Log: Temporarily allow the operands of a BUILD_VECTOR to have a different type to the vector element type. This should be fairly harmless because in the past guys like this were being built all over the place (and were cleaned up when I added this check). The reason for relaxing this check is that it helps LegalizeTypes legalize vector shuffles: the mask is a BUILD_VECTOR that it is *not always possible* to legalize while keeping it a BUILD_VECTOR (vector_shuffle requires the mask to be a BUILD_VECTOR, as opposed to a vector with the right vector type). With this check it is even harder to legalize the mask - turning the check off means that LegalizeTypes manages to legalize almost all vector shuffles encountered in practice. The correct solution is to change vector_shuffle to be a variadic node with the mask built into it as operands. While waiting for that change, this hack stops the problem with vector_shuffle from blocking the turning on of LegalizeTypes. Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp?rev=57965&r1=57964&r2=57965&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp Wed Oct 22 04:00:33 2008 @@ -797,10 +797,14 @@ assert(N->getValueType(0).isVector() && "Wrong BUILD_VECTOR return type!"); assert(N->getNumOperands() == N->getValueType(0).getVectorNumElements() && "Wrong number of BUILD_VECTOR operands!"); - MVT EltVT = N->getValueType(0).getVectorElementType(); - for (SDNode::op_iterator I = N->op_begin(), E = N->op_end(); I != E; ++I) - assert(I->getSDValue().getValueType() == EltVT && - "Wrong BUILD_VECTOR operand type!"); + // FIXME: Change vector_shuffle to a variadic node with mask elements being + // operands of the node. Currently the mask is a BUILD_VECTOR passed as an + // operand, and it is not always possible to legalize it. Turning off the + // following checks at least makes it possible to legalize most of the time. +// MVT EltVT = N->getValueType(0).getVectorElementType(); +// for (SDNode::op_iterator I = N->op_begin(), E = N->op_end(); I != E; ++I) +// assert(I->getSDValue().getValueType() == EltVT && +// "Wrong BUILD_VECTOR operand type!"); break; } } From baldrick at free.fr Wed Oct 22 04:06:24 2008 From: baldrick at free.fr (Duncan Sands) Date: Wed, 22 Oct 2008 09:06:24 -0000 Subject: [llvm-commits] [llvm] r57966 - in /llvm/trunk: include/llvm/CodeGen/SelectionDAGNodes.h lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp Message-ID: <200810220906.m9M96OuS032385@zion.cs.uiuc.edu> Author: baldrick Date: Wed Oct 22 04:06:24 2008 New Revision: 57966 URL: http://llvm.org/viewvc/llvm-project?rev=57966&view=rev Log: Add some comments explaining the meaning of a boolean that is not of type MVT::i1 in SELECT and SETCC nodes. Relax the LegalizeTypes SELECT condition promotion sanity checks to allow other condition types than i1. Modified: llvm/trunk/include/llvm/CodeGen/SelectionDAGNodes.h llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp Modified: llvm/trunk/include/llvm/CodeGen/SelectionDAGNodes.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/SelectionDAGNodes.h?rev=57966&r1=57965&r2=57966&view=diff ============================================================================== --- llvm/trunk/include/llvm/CodeGen/SelectionDAGNodes.h (original) +++ llvm/trunk/include/llvm/CodeGen/SelectionDAGNodes.h Wed Oct 22 04:06:24 2008 @@ -326,19 +326,21 @@ // Counting operators CTTZ, CTLZ, CTPOP, - // Select(COND, TRUEVAL, FALSEVAL) - SELECT, - + // Select(COND, TRUEVAL, FALSEVAL). If the type of the boolean COND is not + // i1 then the high bits must conform to getSetCCResultContents. + SELECT, + // Select with condition operator - This selects between a true value and // a false value (ops #2 and #3) based on the boolean result of comparing // the lhs and rhs (ops #0 and #1) of a conditional expression with the // condition code in op #4, a CondCodeSDNode. SELECT_CC, - // SetCC operator - This evaluates to a boolean (i1) true value if the - // condition is true. The operands to this are the left and right operands - // to compare (ops #0, and #1) and the condition code to compare them with - // (op #2) as a CondCodeSDNode. + // SetCC operator - This evaluates to a true value iff the condition is + // true. If the result value type is not i1 then the high bits conform + // to getSetCCResultContents. The operands to this are the left and right + // operands to compare (ops #0, and #1) and the condition code to compare + // them with (op #2) as a CondCodeSDNode. SETCC, // Vector SetCC operator - This evaluates to a vector of integer elements Modified: llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp?rev=57966&r1=57965&r2=57966&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp Wed Oct 22 04:06:24 2008 @@ -808,8 +808,6 @@ SDValue DAGTypeLegalizer::PromoteIntOp_SELECT(SDNode *N, unsigned OpNo) { assert(OpNo == 0 && "Only know how to promote condition"); - assert(N->getOperand(0).getValueType() == MVT::i1 && - "SetCC type is not legal??"); SDValue Cond = GetPromotedInteger(N->getOperand(0)); // Promote all the way up to SVT, the canonical SetCC type. @@ -835,7 +833,7 @@ ExtendCode = ISD::ZERO_EXTEND; if (!DAG.MaskedValueIsZero(Cond,APInt::getHighBitsSet(CondBits,CondBits-1))) // All extra bits need to be cleared. Do this by zero extending the - // original MVT::i1 condition value all the way to SVT. + // original condition value all the way to SVT. Cond = N->getOperand(0); break; case TargetLowering::ZeroOrNegativeOneSetCCResult: { @@ -843,7 +841,7 @@ unsigned SignBits = DAG.ComputeNumSignBits(Cond); if (SignBits != CondBits) // All extra bits need to be sign extended. Do this by sign extending the - // original MVT::i1 condition value all the way to SVT. + // original condition value all the way to SVT. Cond = N->getOperand(0); break; } From baldrick at free.fr Wed Oct 22 04:07:29 2008 From: baldrick at free.fr (Duncan Sands) Date: Wed, 22 Oct 2008 09:07:29 -0000 Subject: [llvm-commits] [llvm] r57967 - /llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp Message-ID: <200810220907.m9M97UIE032473@zion.cs.uiuc.edu> Author: baldrick Date: Wed Oct 22 04:07:29 2008 New Revision: 57967 URL: http://llvm.org/viewvc/llvm-project?rev=57967&view=rev Log: Port from LegalizeDAG the logic to only generate ADDC/ADDE/SUBC/SUBE if the target supports it. Modified: llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp Modified: llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp?rev=57967&r1=57966&r2=57967&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp Wed Oct 22 04:07:29 2008 @@ -1165,18 +1165,54 @@ SDValue LHSL, LHSH, RHSL, RHSH; GetExpandedInteger(N->getOperand(0), LHSL, LHSH); GetExpandedInteger(N->getOperand(1), RHSL, RHSH); - SDVTList VTList = DAG.getVTList(LHSL.getValueType(), MVT::Flag); + + MVT NVT = LHSL.getValueType(); + SDVTList VTList = DAG.getVTList(NVT, MVT::Flag); SDValue LoOps[2] = { LHSL, RHSL }; SDValue HiOps[3] = { LHSH, RHSH }; - if (N->getOpcode() == ISD::ADD) { - Lo = DAG.getNode(ISD::ADDC, VTList, LoOps, 2); - HiOps[2] = Lo.getValue(1); - Hi = DAG.getNode(ISD::ADDE, VTList, HiOps, 3); + // Do not generate ADDC/ADDE or SUBC/SUBE if the target does not support + // them. TODO: Teach operation legalization how to expand unsupported + // ADDC/ADDE/SUBC/SUBE. The problem is that these operations generate + // a carry of type MVT::Flag, but there doesn't seem to be any way to + // generate a value of this type in the expanded code sequence. + bool hasCarry = + TLI.isOperationLegal(N->getOpcode() == ISD::ADD ? ISD::ADDC : ISD::SUBC, + TLI.getTypeToExpandTo(NVT)); + + if (hasCarry) { + if (N->getOpcode() == ISD::ADD) { + Lo = DAG.getNode(ISD::ADDC, VTList, LoOps, 2); + HiOps[2] = Lo.getValue(1); + Hi = DAG.getNode(ISD::ADDE, VTList, HiOps, 3); + } else { + Lo = DAG.getNode(ISD::SUBC, VTList, LoOps, 2); + HiOps[2] = Lo.getValue(1); + Hi = DAG.getNode(ISD::SUBE, VTList, HiOps, 3); + } } else { - Lo = DAG.getNode(ISD::SUBC, VTList, LoOps, 2); - HiOps[2] = Lo.getValue(1); - Hi = DAG.getNode(ISD::SUBE, VTList, HiOps, 3); + if (N->getOpcode() == ISD::ADD) { + Lo = DAG.getNode(ISD::ADD, VTList, LoOps, 2); + Hi = DAG.getNode(ISD::ADD, VTList, HiOps, 2); + SDValue Cmp1 = DAG.getSetCC(TLI.getSetCCResultType(Lo), Lo, LoOps[0], + ISD::SETULT); + SDValue Carry1 = DAG.getNode(ISD::SELECT, NVT, Cmp1, + DAG.getConstant(1, NVT), + DAG.getConstant(0, NVT)); + SDValue Cmp2 = DAG.getSetCC(TLI.getSetCCResultType(Lo), Lo, LoOps[1], + ISD::SETULT); + SDValue Carry2 = DAG.getNode(ISD::SELECT, NVT, Cmp2, + DAG.getConstant(1, NVT), Carry1); + Hi = DAG.getNode(ISD::ADD, NVT, Hi, Carry2); + } else { + Lo = DAG.getNode(ISD::SUB, VTList, LoOps, 2); + Hi = DAG.getNode(ISD::SUB, VTList, HiOps, 2); + SDValue Cmp = DAG.getSetCC(NVT, LoOps[0], LoOps[1], ISD::SETULT); + SDValue Borrow = DAG.getNode(ISD::SELECT, NVT, Cmp, + DAG.getConstant(1, NVT), + DAG.getConstant(0, NVT)); + Hi = DAG.getNode(ISD::SUB, NVT, Hi, Borrow); + } } } From baldrick at free.fr Wed Oct 22 04:23:20 2008 From: baldrick at free.fr (Duncan Sands) Date: Wed, 22 Oct 2008 09:23:20 -0000 Subject: [llvm-commits] [llvm] r57968 - /llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp Message-ID: <200810220923.m9M9NKui000427@zion.cs.uiuc.edu> Author: baldrick Date: Wed Oct 22 04:23:20 2008 New Revision: 57968 URL: http://llvm.org/viewvc/llvm-project?rev=57968&view=rev Log: Be nice to CellSPU: for this target getSetCCResultType may return i8, which can result in SELECT nodes for which the type of the condition is i8, but there are no patterns for select with i8 condition. Tweak the LegalizeTypes logic to avoid this as much as possible. This isn't a real fix because it is still perfectly possible to end up with such select nodes - CellSPU needs to be fixed IMHO. Modified: llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp Modified: llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp?rev=57968&r1=57967&r2=57968&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp Wed Oct 22 04:23:20 2008 @@ -811,10 +811,16 @@ SDValue Cond = GetPromotedInteger(N->getOperand(0)); // Promote all the way up to SVT, the canonical SetCC type. - MVT SVT = TLI.getSetCCResultType(Cond); + // FIXME: Not clear what value to pass to getSetCCResultType. + // [This only matters for CellSPU since all other targets + // ignore the argument.] We used to pass Cond, resulting in + // SVT = MVT::i8, but CellSPU has no select patterns for i8, + // causing an abort later. Passing the result type works + // around the problem. + MVT SVT = TLI.getSetCCResultType(N->getOperand(1)); assert(isTypeLegal(SVT) && "Illegal SetCC type!"); assert(Cond.getValueSizeInBits() <= SVT.getSizeInBits() && - "Integer type overpromoted?"); + "Unexpected SetCC type!"); // Make sure the extra bits conform to getSetCCResultContents. There are // two sets of extra bits: those in Cond, which come from type promotion, From baldrick at free.fr Wed Oct 22 04:42:14 2008 From: baldrick at free.fr (Duncan Sands) Date: Wed, 22 Oct 2008 09:42:14 -0000 Subject: [llvm-commits] [llvm] r57969 - /llvm/trunk/Makefile.config.in Message-ID: <200810220942.m9M9gEqT001152@zion.cs.uiuc.edu> Author: baldrick Date: Wed Oct 22 04:42:14 2008 New Revision: 57969 URL: http://llvm.org/viewvc/llvm-project?rev=57969&view=rev Log: Use spaces rather than tab. Modified: llvm/trunk/Makefile.config.in Modified: llvm/trunk/Makefile.config.in URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/Makefile.config.in?rev=57969&r1=57968&r2=57969&view=diff ============================================================================== --- llvm/trunk/Makefile.config.in (original) +++ llvm/trunk/Makefile.config.in Wed Oct 22 04:42:14 2008 @@ -160,7 +160,7 @@ OCAMLOPT := @OCAMLOPT@ OCAMLDEP := @OCAMLDEP@ OCAMLDOC := @OCAMLDOC@ -GAS := @GAS@ +GAS := @GAS@ POD2HTML := @POD2HTML@ POD2MAN := @POD2MAN@ RUNTEST := @RUNTEST@ From akyrtzi at gmail.com Wed Oct 22 04:54:13 2008 From: akyrtzi at gmail.com (Argiris Kirtzidis) Date: Wed, 22 Oct 2008 09:54:13 -0000 Subject: [llvm-commits] [llvm] r57970 - in /llvm/trunk: utils/TableGen/Record.h utils/TableGen/TGLexer.h win32/config.h Message-ID: <200810220954.m9M9sDca001491@zion.cs.uiuc.edu> Author: akirtzidis Date: Wed Oct 22 04:54:13 2008 New Revision: 57970 URL: http://llvm.org/viewvc/llvm-project?rev=57970&view=rev Log: Unbreak LLVM on the MSVC compiler: -Bring in int64_t for TableGen/Record.h and TableGen/TGLexer.h -Define strtoull Modified: llvm/trunk/utils/TableGen/Record.h llvm/trunk/utils/TableGen/TGLexer.h llvm/trunk/win32/config.h Modified: llvm/trunk/utils/TableGen/Record.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/Record.h?rev=57970&r1=57969&r2=57970&view=diff ============================================================================== --- llvm/trunk/utils/TableGen/Record.h (original) +++ llvm/trunk/utils/TableGen/Record.h Wed Oct 22 04:54:13 2008 @@ -15,6 +15,7 @@ #ifndef RECORD_H #define RECORD_H +#include "llvm/Support/DataTypes.h" #include #include #include Modified: llvm/trunk/utils/TableGen/TGLexer.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/TGLexer.h?rev=57970&r1=57969&r2=57970&view=diff ============================================================================== --- llvm/trunk/utils/TableGen/TGLexer.h (original) +++ llvm/trunk/utils/TableGen/TGLexer.h Wed Oct 22 04:54:13 2008 @@ -14,6 +14,7 @@ #ifndef TGLEXER_H #define TGLEXER_H +#include "llvm/Support/DataTypes.h" #include #include #include Modified: llvm/trunk/win32/config.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/win32/config.h?rev=57970&r1=57969&r2=57970&view=diff ============================================================================== --- llvm/trunk/win32/config.h (original) +++ llvm/trunk/win32/config.h Wed Oct 22 04:54:13 2008 @@ -2,7 +2,7 @@ * config.h */ #define PACKAGE_NAME "LLVM (win32 vc8.0)" -#define PACKAGE_VERSION 2.2 +#define PACKAGE_VERSION 2.4 #define LLVM_HOSTTRIPLE "i686-pc-win32" #define HAVE_WINDOWS_H 1 #define HAVE_LIMITS_H 1 @@ -22,7 +22,8 @@ #define LTDL_SYSSEARCHPATH "" #define LLVM_ON_WIN32 1 -#define strtoll strtol +#define strtoll _strtoi64 +#define strtoull _strtoui64 #define stricmp _stricmp #define strdup _strdup From edwintorok at gmail.com Wed Oct 22 04:56:27 2008 From: edwintorok at gmail.com (Torok Edwin) Date: Wed, 22 Oct 2008 09:56:27 -0000 Subject: [llvm-commits] [llvm] r57971 - /llvm/trunk/configure Message-ID: <200810220956.m9M9uSRK001560@zion.cs.uiuc.edu> Author: edwin Date: Wed Oct 22 04:56:27 2008 New Revision: 57971 URL: http://llvm.org/viewvc/llvm-project?rev=57971&view=rev Log: Regenerate configure Modified: llvm/trunk/configure Modified: llvm/trunk/configure URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/configure?rev=57971&r1=57970&r2=57971&view=diff ============================================================================== --- llvm/trunk/configure (original) +++ llvm/trunk/configure Wed Oct 22 04:56:27 2008 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.60 for llvm 2.5svn. +# Generated by GNU Autoconf 2.61 for llvm 2.5svn. # # Report bugs to . # @@ -14,7 +14,8 @@ ## M4sh Initialization. ## ## --------------------- ## -# Be Bourne compatible +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: @@ -23,10 +24,13 @@ alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh + + # PATH needs CR @@ -219,7 +223,7 @@ else as_candidate_shells= as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -237,7 +241,6 @@ # Try only shells that exist, to save several forks. if { test -f "$as_shell" || test -f "$as_shell.exe"; } && { ("$as_shell") 2> /dev/null <<\_ASEOF -# Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: @@ -246,10 +249,12 @@ alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh + : _ASEOF @@ -257,7 +262,6 @@ CONFIG_SHELL=$as_shell as_have_required=yes if { "$as_shell" 2> /dev/null <<\_ASEOF -# Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: @@ -266,10 +270,12 @@ alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh + : (as_func_return () { @@ -516,19 +522,28 @@ as_mkdir_p=false fi -# Find out whether ``test -x'' works. Don't use a zero-byte file, as -# systems may use methods other than mode bits to determine executability. -cat >conf$$.file <<_ASEOF -#! /bin/sh -exit 0 -_ASEOF -chmod +x conf$$.file -if test -x conf$$.file >/dev/null 2>&1; then - as_executable_p="test -x" +if test -x / >/dev/null 2>&1; then + as_test_x='test -x' else - as_executable_p=: + if ls -dL / >/dev/null 2>&1; then + as_ls_L_option=L + else + as_ls_L_option= + fi + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then + test -d "$1/."; + else + case $1 in + -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' fi -rm -f conf$$.file +as_executable_p=$as_test_x # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -723,36 +738,36 @@ # Factoring default headers for most tests. ac_includes_default="\ #include -#if HAVE_SYS_TYPES_H +#ifdef HAVE_SYS_TYPES_H # include #endif -#if HAVE_SYS_STAT_H +#ifdef HAVE_SYS_STAT_H # include #endif -#if STDC_HEADERS +#ifdef STDC_HEADERS # include # include #else -# if HAVE_STDLIB_H +# ifdef HAVE_STDLIB_H # include # endif #endif -#if HAVE_STRING_H -# if !STDC_HEADERS && HAVE_MEMORY_H +#ifdef HAVE_STRING_H +# if !defined STDC_HEADERS && defined HAVE_MEMORY_H # include # endif # include #endif -#if HAVE_STRINGS_H +#ifdef HAVE_STRINGS_H # include #endif -#if HAVE_INTTYPES_H +#ifdef HAVE_INTTYPES_H # include #endif -#if HAVE_STDINT_H +#ifdef HAVE_STDINT_H # include #endif -#if HAVE_UNISTD_H +#ifdef HAVE_UNISTD_H # include #endif" @@ -846,8 +861,8 @@ CXXFLAGS ac_ct_CXX LEX -LEXLIB LEX_OUTPUT_ROOT +LEXLIB FLEX YACC YFLAGS @@ -888,6 +903,7 @@ OCAMLOPT OCAMLDEP OCAMLDOC +GAS INSTALL_LTDL_TRUE INSTALL_LTDL_FALSE CONVENIENCE_LTDL_TRUE @@ -939,6 +955,7 @@ CC CFLAGS LDFLAGS +LIBS CPPFLAGS CPP CXX @@ -1065,10 +1082,10 @@ -disable-* | --disable-*) ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && + expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid feature name: $ac_feature" >&2 { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/-/_/g'` + ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` eval enable_$ac_feature=no ;; -docdir | --docdir | --docdi | --doc | --do) @@ -1084,10 +1101,10 @@ -enable-* | --enable-*) ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && + expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid feature name: $ac_feature" >&2 { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/-/_/g'` + ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` eval enable_$ac_feature=\$ac_optarg ;; -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ @@ -1281,19 +1298,19 @@ -with-* | --with-*) ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && + expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid package name: $ac_package" >&2 { (exit 1); exit 1; }; } - ac_package=`echo $ac_package| sed 's/-/_/g'` + ac_package=`echo $ac_package | sed 's/[-.]/_/g'` eval with_$ac_package=\$ac_optarg ;; -without-* | --without-*) ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && + expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid package name: $ac_package" >&2 { (exit 1); exit 1; }; } - ac_package=`echo $ac_package | sed 's/-/_/g'` + ac_package=`echo $ac_package | sed 's/[-.]/_/g'` eval with_$ac_package=no ;; --x) @@ -1585,6 +1602,7 @@ CFLAGS C compiler flags LDFLAGS linker flags, e.g. -L if you have libraries in a nonstandard directory + LIBS libraries to pass to the linker, e.g. -l CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if you have headers in a nonstandard directory CPP C preprocessor @@ -1664,7 +1682,7 @@ if $ac_init_version; then cat <<\_ACEOF llvm configure 2.5svn -generated by GNU Autoconf 2.60 +generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. @@ -1680,7 +1698,7 @@ running configure, to aid debugging if configure makes a mistake. It was created by llvm $as_me 2.5svn, which was -generated by GNU Autoconf 2.60. Invocation command line was +generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2424,7 +2442,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}gcc" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2464,7 +2482,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="gcc" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2521,7 +2539,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}cc" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2562,7 +2580,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -2620,7 +2638,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2664,7 +2682,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2805,7 +2823,7 @@ # in a Makefile. We should not override ac_cv_exeext if it was cached, # so that the user can short-circuit this test for compilers unknown to # Autoconf. -for ac_file in $ac_files +for ac_file in $ac_files '' do test -f "$ac_file" || continue case $ac_file in @@ -2833,6 +2851,12 @@ test "$ac_cv_exeext" = no && ac_cv_exeext= else + ac_file='' +fi + +{ echo "$as_me:$LINENO: result: $ac_file" >&5 +echo "${ECHO_T}$ac_file" >&6; } +if test -z "$ac_file"; then echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -2844,8 +2868,6 @@ fi ac_exeext=$ac_cv_exeext -{ echo "$as_me:$LINENO: result: $ac_file" >&5 -echo "${ECHO_T}$ac_file" >&6; } # Check that the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. @@ -3023,27 +3045,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 @@ -3098,27 +3103,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_prog_cc_g=yes else echo "$as_me: failed program was:" >&5 @@ -3153,27 +3141,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then : else echo "$as_me: failed program was:" >&5 @@ -3209,27 +3180,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_prog_cc_g=yes else echo "$as_me: failed program was:" >&5 @@ -3345,27 +3299,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_prog_cc_c89=$ac_arg else echo "$as_me: failed program was:" >&5 @@ -3455,17 +3392,10 @@ 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 - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then : else echo "$as_me: failed program was:" >&5 @@ -3499,17 +3429,10 @@ 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 - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then # Broken: success on invalid input. continue else @@ -3574,17 +3497,10 @@ 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 - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then : else echo "$as_me: failed program was:" >&5 @@ -3618,17 +3534,10 @@ 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 - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then # Broken: success on invalid input. continue else @@ -3683,7 +3592,7 @@ for ac_prog in grep ggrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_executable_p "$ac_path_GREP"; } || continue + { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue # Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP case `"$ac_path_GREP" --version 2>&1` in @@ -3765,7 +3674,7 @@ for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_executable_p "$ac_path_EGREP"; } || continue + { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in @@ -3861,27 +3770,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_header_stdc=yes else echo "$as_me: failed program was:" >&5 @@ -4057,27 +3949,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 @@ -4119,7 +3994,8 @@ int main () { -#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN +#if ! (defined BYTE_ORDER && defined BIG_ENDIAN && defined LITTLE_ENDIAN \ + && BYTE_ORDER && BIG_ENDIAN && LITTLE_ENDIAN) bogus endian macros #endif @@ -4140,27 +4016,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then # It does; now see whether it defined to BIG_ENDIAN or not. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -4195,27 +4054,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_c_bigendian=yes else echo "$as_me: failed program was:" >&5 @@ -4266,27 +4108,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then ac_cv_c_bigendian=yes fi @@ -4416,7 +4241,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_BUILD_CC="${ac_build_prefix}gcc" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4454,7 +4279,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_BUILD_CC="gcc" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4493,7 +4318,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -4583,7 +4408,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_BUILD_CXX="${ac_build_prefix}g++" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4621,7 +4446,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_BUILD_CXX="g++" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4660,7 +4485,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/c++"; then ac_prog_rejected=yes continue @@ -5109,17 +4934,10 @@ 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 - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then : else echo "$as_me: failed program was:" >&5 @@ -5153,17 +4971,10 @@ 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 - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then # Broken: success on invalid input. continue else @@ -5228,17 +5039,10 @@ 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 - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then : else echo "$as_me: failed program was:" >&5 @@ -5272,17 +5076,10 @@ 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 - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then # Broken: success on invalid input. continue else @@ -5339,7 +5136,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5383,7 +5180,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5501,27 +5298,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 @@ -5576,27 +5356,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_prog_cc_g=yes else echo "$as_me: failed program was:" >&5 @@ -5631,27 +5394,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then : else echo "$as_me: failed program was:" >&5 @@ -5687,27 +5433,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_prog_cc_g=yes else echo "$as_me: failed program was:" >&5 @@ -5823,27 +5552,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_prog_cc_c89=$ac_arg else echo "$as_me: failed program was:" >&5 @@ -5908,7 +5620,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5952,7 +5664,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CXX="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6065,27 +5777,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 @@ -6140,27 +5835,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_prog_cxx_g=yes else echo "$as_me: failed program was:" >&5 @@ -6195,27 +5873,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then : else echo "$as_me: failed program was:" >&5 @@ -6251,27 +5912,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_prog_cxx_g=yes else echo "$as_me: failed program was:" >&5 @@ -6335,7 +5979,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_LEX="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6360,116 +6004,123 @@ done test -n "$LEX" || LEX=":" -if test -z "$LEXLIB" -then - { echo "$as_me:$LINENO: checking for yywrap in -lfl" >&5 -echo $ECHO_N "checking for yywrap in -lfl... $ECHO_C" >&6; } -if test "${ac_cv_lib_fl_yywrap+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lfl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" +if test "x$LEX" != "x:"; then + cat >conftest.l <<_ACEOF +%% +a { ECHO; } +b { REJECT; } +c { yymore (); } +d { yyless (1); } +e { yyless (input () != 0); } +f { unput (yytext[0]); } +. { BEGIN INITIAL; } +%% +#ifdef YYTEXT_POINTER +extern char *yytext; #endif -char yywrap (); int -main () +main (void) { -return yywrap (); - ; - return 0; + return ! yylex () + ! yywrap (); } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" +{ (ac_try="$LEX conftest.l" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 + (eval "$LEX conftest.l") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in + (exit $ac_status); } +{ echo "$as_me:$LINENO: checking lex output file root" >&5 +echo $ECHO_N "checking lex output file root... $ECHO_C" >&6; } +if test "${ac_cv_prog_lex_root+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + +if test -f lex.yy.c; then + ac_cv_prog_lex_root=lex.yy +elif test -f lexyy.c; then + ac_cv_prog_lex_root=lexyy +else + { { echo "$as_me:$LINENO: error: cannot find output from $LEX; giving up" >&5 +echo "$as_me: error: cannot find output from $LEX; giving up" >&2;} + { (exit 1); exit 1; }; } +fi +fi +{ echo "$as_me:$LINENO: result: $ac_cv_prog_lex_root" >&5 +echo "${ECHO_T}$ac_cv_prog_lex_root" >&6; } +LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root + +if test -z "${LEXLIB+set}"; then + { echo "$as_me:$LINENO: checking lex library" >&5 +echo $ECHO_N "checking lex library... $ECHO_C" >&6; } +if test "${ac_cv_lib_lex+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + ac_save_LIBS=$LIBS + ac_cv_lib_lex='none needed' + for ac_lib in '' -lfl -ll; do + LIBS="$ac_lib $ac_save_LIBS" + cat >conftest.$ac_ext <<_ACEOF +`cat $LEX_OUTPUT_ROOT.c` +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_fl_yywrap=yes + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_lex=$ac_lib else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_fl_yywrap=no + fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + test "$ac_cv_lib_lex" != 'none needed' && break + done + LIBS=$ac_save_LIBS + +fi +{ echo "$as_me:$LINENO: result: $ac_cv_lib_lex" >&5 +echo "${ECHO_T}$ac_cv_lib_lex" >&6; } + test "$ac_cv_lib_lex" != 'none needed' && LEXLIB=$ac_cv_lib_lex fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_fl_yywrap" >&5 -echo "${ECHO_T}$ac_cv_lib_fl_yywrap" >&6; } -if test $ac_cv_lib_fl_yywrap = yes; then - LEXLIB="-lfl" -else - { echo "$as_me:$LINENO: checking for yywrap in -ll" >&5 -echo $ECHO_N "checking for yywrap in -ll... $ECHO_C" >&6; } -if test "${ac_cv_lib_l_yywrap+set}" = set; then + + +{ echo "$as_me:$LINENO: checking whether yytext is a pointer" >&5 +echo $ECHO_N "checking whether yytext is a pointer... $ECHO_C" >&6; } +if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ll $LIBS" + # POSIX says lex can declare yytext either as a pointer or an array; the +# default is implementation-dependent. Figure out which it is, since +# not all implementations provide the %pointer and %array declarations. +ac_cv_prog_lex_yytext_pointer=no +ac_save_LIBS=$LIBS +LIBS="$LEXLIB $ac_save_LIBS" cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char yywrap (); -int -main () -{ -return yywrap (); - ; - return 0; -} +#define YYTEXT_POINTER 1 +`cat $LEX_OUTPUT_ROOT.c` _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (ac_try="$ac_link" @@ -6484,147 +6135,22 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_l_yywrap=yes + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_prog_lex_yytext_pointer=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_l_yywrap=no + fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_l_yywrap" >&5 -echo "${ECHO_T}$ac_cv_lib_l_yywrap" >&6; } -if test $ac_cv_lib_l_yywrap = yes; then - LEXLIB="-ll" -fi - -fi - -fi - -if test "x$LEX" != "x:"; then - { echo "$as_me:$LINENO: checking lex output file root" >&5 -echo $ECHO_N "checking lex output file root... $ECHO_C" >&6; } -if test "${ac_cv_prog_lex_root+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # The minimal lex program is just a single line: %%. But some broken lexes -# (Solaris, I think it was) want two %% lines, so accommodate them. -cat >conftest.l <<_ACEOF -%% -%% -_ACEOF -{ (ac_try="$LEX conftest.l" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$LEX conftest.l") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -if test -f lex.yy.c; then - ac_cv_prog_lex_root=lex.yy -elif test -f lexyy.c; then - ac_cv_prog_lex_root=lexyy -else - { { echo "$as_me:$LINENO: error: cannot find output from $LEX; giving up" >&5 -echo "$as_me: error: cannot find output from $LEX; giving up" >&2;} - { (exit 1); exit 1; }; } -fi -fi -{ echo "$as_me:$LINENO: result: $ac_cv_prog_lex_root" >&5 -echo "${ECHO_T}$ac_cv_prog_lex_root" >&6; } -rm -f conftest.l -LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root - -{ echo "$as_me:$LINENO: checking whether yytext is a pointer" >&5 -echo $ECHO_N "checking whether yytext is a pointer... $ECHO_C" >&6; } -if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # POSIX says lex can declare yytext either as a pointer or an array; the -# default is implementation-dependent. Figure out which it is, since -# not all implementations provide the %pointer and %array declarations. -ac_cv_prog_lex_yytext_pointer=no -echo 'extern char *yytext;' >>$LEX_OUTPUT_ROOT.c -ac_save_LIBS=$LIBS -LIBS="$LIBS $LEXLIB" -cat >conftest.$ac_ext <<_ACEOF -`cat $LEX_OUTPUT_ROOT.c` -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_prog_lex_yytext_pointer=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_save_LIBS -rm -f "${LEX_OUTPUT_ROOT}.c" fi { echo "$as_me:$LINENO: result: $ac_cv_prog_lex_yytext_pointer" >&5 @@ -6636,6 +6162,7 @@ _ACEOF fi +rm -f conftest.l $LEX_OUTPUT_ROOT.c fi @@ -6674,7 +6201,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_YACC="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6821,7 +6348,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_CMP="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6862,7 +6389,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_CP="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6903,7 +6430,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_DATE="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6944,7 +6471,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_FIND="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6985,7 +6512,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_GREP="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7026,7 +6553,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_MKDIR="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7067,7 +6594,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_MV="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7107,7 +6634,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7147,7 +6674,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_RANLIB="ranlib" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7204,7 +6731,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_RM="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7245,7 +6772,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_SED="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7286,7 +6813,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_TAR="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7327,7 +6854,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_BINPWD="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7369,7 +6896,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_GRAPHVIZ="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7425,7 +6952,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_DOT="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7483,7 +7010,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_GV="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7542,7 +7069,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_DOTTY="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7600,7 +7127,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7684,7 +7211,7 @@ # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -7747,7 +7274,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_BZIP2="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7787,7 +7314,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_DOXYGEN="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7827,7 +7354,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_GROFF="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7867,7 +7394,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_GZIP="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7907,7 +7434,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_POD2HTML="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7947,7 +7474,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_POD2MAN="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7987,7 +7514,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_RUNTEST="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8060,7 +7587,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_TCLSH="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8117,7 +7644,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_ZIP="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8159,7 +7686,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_OCAMLC="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8204,7 +7731,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_OCAMLOPT="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8249,7 +7776,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_OCAMLDEP="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8294,7 +7821,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_OCAMLDOC="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8319,6 +7846,51 @@ test -n "$OCAMLDOC" && break done +for ac_prog in gas as +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_GAS+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $GAS in + [\\/]* | ?:[\\/]*) + ac_cv_path_GAS="$GAS" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_GAS="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + ;; +esac +fi +GAS=$ac_cv_path_GAS +if test -n "$GAS"; then + { echo "$as_me:$LINENO: result: $GAS" >&5 +echo "${ECHO_T}$GAS" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + + test -n "$GAS" && break +done + { echo "$as_me:$LINENO: checking for compiler -Wl,-R option" >&5 echo $ECHO_N "checking for compiler -Wl,-R option... $ECHO_C" >&6; } @@ -8361,27 +7933,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then llvm_cv_link_use_r=yes else echo "$as_me: failed program was:" >&5 @@ -8390,7 +7946,7 @@ llvm_cv_link_use_r=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext CFLAGS="$oldcflags" ac_ext=c @@ -8433,10 +7989,10 @@ #ifndef __cplusplus /* Ultrix mips cc rejects this. */ typedef int charset[2]; - const charset x; + const charset cs; /* SunOS 4.1.1 cc rejects this. */ - char const *const *ccp; - char **p; + char const *const *pcpcc; + char **ppc; /* NEC SVR4.0.2 mips cc rejects this. */ struct point {int x, y;}; static struct point const zero = {0,0}; @@ -8445,11 +8001,11 @@ an arm of an if-expression whose if-part is not a constant expression */ const char *g = "string"; - ccp = &g + (g ? g-g : 0); + pcpcc = &g + (g ? g-g : 0); /* HPUX 7.0 cc rejects these. */ - ++ccp; - p = (char**) ccp; - ccp = (char const *const *) p; + ++pcpcc; + ppc = (char**) pcpcc; + pcpcc = (char const *const *) ppc; { /* SCO 3.2v4 cc rejects this. */ char *t; char const *s = 0 ? (char *) 0 : (char const *) 0; @@ -8476,7 +8032,7 @@ const int foo = 10; if (!foo) return 0; } - return !x[0] && !zero.x; + return !cs[0] && !zero.x; #endif ; @@ -8496,27 +8052,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_c_const=yes else echo "$as_me: failed program was:" >&5 @@ -8581,27 +8120,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 @@ -8674,27 +8196,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_search_opendir=$ac_res else echo "$as_me: failed program was:" >&5 @@ -8703,7 +8209,7 @@ fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext if test "${ac_cv_search_opendir+set}" = set; then break @@ -8774,27 +8280,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_search_opendir=$ac_res else echo "$as_me: failed program was:" >&5 @@ -8803,7 +8293,7 @@ fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext if test "${ac_cv_search_opendir+set}" = set; then break @@ -8866,27 +8356,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 @@ -8922,17 +8395,10 @@ 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 - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -9002,9 +8468,7 @@ fi - - -if test x"${enable_ltdl_install-no}" != xno; then + if test x"${enable_ltdl_install-no}" != xno; then INSTALL_LTDL_TRUE= INSTALL_LTDL_FALSE='#' else @@ -9012,9 +8476,7 @@ INSTALL_LTDL_FALSE= fi - - -if test x"${enable_ltdl_convenience-no}" != xno; then + if test x"${enable_ltdl_convenience-no}" != xno; then CONVENIENCE_LTDL_TRUE= CONVENIENCE_LTDL_FALSE='#' else @@ -10026,27 +9488,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_func_shl_load=yes else echo "$as_me: failed program was:" >&5 @@ -10055,7 +9501,7 @@ ac_cv_func_shl_load=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi { echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 @@ -10109,27 +9555,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_dld_shl_load=yes else echo "$as_me: failed program was:" >&5 @@ -10138,7 +9568,7 @@ ac_cv_lib_dld_shl_load=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi @@ -10194,27 +9624,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_dl_dlopen=yes else echo "$as_me: failed program was:" >&5 @@ -10223,7 +9637,7 @@ ac_cv_lib_dl_dlopen=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi @@ -10268,27 +9682,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then cat >>confdefs.h <<\_ACEOF #define HAVE_LIBDL 1 @@ -10340,27 +9738,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_svld_dlopen=yes else echo "$as_me: failed program was:" >&5 @@ -10369,7 +9751,7 @@ ac_cv_lib_svld_dlopen=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi @@ -10425,27 +9807,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_dld_dld_link=yes else echo "$as_me: failed program was:" >&5 @@ -10454,7 +9820,7 @@ ac_cv_lib_dld_dld_link=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi @@ -10531,27 +9897,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_func__dyld_func_lookup=yes else echo "$as_me: failed program was:" >&5 @@ -10560,7 +9910,7 @@ ac_cv_func__dyld_func_lookup=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi { echo "$as_me:$LINENO: result: $ac_cv_func__dyld_func_lookup" >&5 @@ -10582,7 +9932,7 @@ fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi @@ -10665,27 +10015,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 @@ -10694,7 +10028,7 @@ eval "$as_ac_var=no" fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi ac_res=`eval echo '${'$as_ac_var'}'` @@ -10781,7 +10115,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 @@ -11066,17 +10383,10 @@ 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 - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -11181,27 +10491,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_type_error_t=yes else echo "$as_me: failed program was:" >&5 @@ -11301,27 +10594,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 @@ -11330,7 +10607,7 @@ eval "$as_ac_var=no" fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi ac_res=`eval echo '${'$as_ac_var'}'` @@ -11410,27 +10687,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 @@ -11466,17 +10726,10 @@ 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 - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -11582,27 +10835,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 @@ -11638,17 +10874,10 @@ 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 - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -11752,27 +10981,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 @@ -11808,17 +11020,10 @@ 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 - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -11951,27 +11156,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 @@ -11980,7 +11169,7 @@ eval "$as_ac_var=no" fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi ac_res=`eval echo '${'$as_ac_var'}'` @@ -12062,27 +11251,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 @@ -12091,7 +11264,7 @@ eval "$as_ac_var=no" fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi ac_res=`eval echo '${'$as_ac_var'}'` @@ -12173,27 +11346,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 @@ -12202,7 +11359,7 @@ eval "$as_ac_var=no" fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi ac_res=`eval echo '${'$as_ac_var'}'` @@ -12284,27 +11441,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 @@ -12313,7 +11454,7 @@ eval "$as_ac_var=no" fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi ac_res=`eval echo '${'$as_ac_var'}'` @@ -12396,27 +11537,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 @@ -12425,7 +11550,7 @@ eval "$as_ac_var=no" fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi ac_res=`eval echo '${'$as_ac_var'}'` @@ -12925,7 +12050,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 12928 "configure"' > conftest.$ac_ext + echo '#line 12053 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -13049,27 +12174,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then lt_cv_cc_needs_belf=yes else echo "$as_me: failed program was:" >&5 @@ -13078,7 +12187,7 @@ lt_cv_cc_needs_belf=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -13173,17 +12282,10 @@ 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_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then : else echo "$as_me: failed program was:" >&5 @@ -13217,17 +12319,10 @@ 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_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then # Broken: success on invalid input. continue else @@ -13292,17 +12387,10 @@ 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_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then : else echo "$as_me: failed program was:" >&5 @@ -13336,17 +12424,10 @@ 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_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then # Broken: success on invalid input. continue else @@ -13387,7 +12468,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 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn + for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn 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 @@ -13405,7 +12486,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_F77="$ac_tool_prefix$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -13431,7 +12512,7 @@ fi if test -z "$F77"; then ac_ct_F77=$F77 - for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn + for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -13449,7 +12530,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_F77="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -13556,27 +12637,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_f77_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 @@ -13619,27 +12683,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_f77_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_prog_f77_g=yes else echo "$as_me: failed program was:" >&5 @@ -14094,7 +13141,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_AR="${ac_tool_prefix}ar" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -14134,7 +13181,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_AR="ar" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -14190,7 +13237,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -14230,7 +13277,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_RANLIB="ranlib" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -14286,7 +13333,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -14326,7 +13373,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_STRIP="strip" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -14618,6 +13665,10 @@ $rm conftest* +## CAVEAT EMPTOR: +## There is no encapsulation within the following macros, do not change +## the running order or otherwise move them around unless you know exactly +## what you are doing... lt_prog_compiler_no_builtin_flag= @@ -14643,11 +13694,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14646: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13697: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14650: \$? = $ac_status" >&5 + echo "$as_me:13701: \$? = $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 other than the usual output. @@ -14911,11 +13962,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14914: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13965: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14918: \$? = $ac_status" >&5 + echo "$as_me:13969: \$? = $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 other than the usual output. @@ -15015,11 +14066,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15018: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14069: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15022: \$? = $ac_status" >&5 + echo "$as_me:14073: \$? = $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 @@ -15495,27 +14546,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } }'` @@ -15529,7 +14564,7 @@ fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -15570,27 +14605,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } }'` @@ -15604,7 +14623,7 @@ fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -16852,27 +15871,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_dl_dlopen=yes else echo "$as_me: failed program was:" >&5 @@ -16881,7 +15884,7 @@ ac_cv_lib_dl_dlopen=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi @@ -16963,27 +15966,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_func_shl_load=yes else echo "$as_me: failed program was:" >&5 @@ -16992,7 +15979,7 @@ ac_cv_func_shl_load=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi { echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 @@ -17042,27 +16029,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_dld_shl_load=yes else echo "$as_me: failed program was:" >&5 @@ -17071,7 +16042,7 @@ ac_cv_lib_dld_shl_load=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi @@ -17143,27 +16114,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_func_dlopen=yes else echo "$as_me: failed program was:" >&5 @@ -17172,7 +16127,7 @@ ac_cv_func_dlopen=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi { echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 @@ -17222,27 +16177,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_dl_dlopen=yes else echo "$as_me: failed program was:" >&5 @@ -17251,7 +16190,7 @@ ac_cv_lib_dl_dlopen=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi @@ -17302,27 +16241,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_svld_dlopen=yes else echo "$as_me: failed program was:" >&5 @@ -17331,7 +16254,7 @@ ac_cv_lib_svld_dlopen=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi @@ -17382,27 +16305,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_dld_dld_link=yes else echo "$as_me: failed program was:" >&5 @@ -17411,7 +16318,7 @@ ac_cv_lib_dld_dld_link=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi @@ -17467,7 +16374,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } }'` @@ -18688,7 +17579,7 @@ fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -18730,27 +17621,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } }'` @@ -18764,7 +17639,7 @@ fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -19502,6 +18377,10 @@ GCC_CXX="$GXX" LD_CXX="$LD" +## CAVEAT EMPTOR: +## There is no encapsulation within the following macros, do not change +## the running order or otherwise move them around unless you know exactly +## what you are doing... cat > conftest.$ac_ext <&5) + (eval echo "\"\$as_me:18817: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:19942: \$? = $ac_status" >&5 + echo "$as_me:18821: \$? = $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 other than the usual output. @@ -20039,11 +18918,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:20042: $lt_compile\"" >&5) + (eval echo "\"\$as_me:18921: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:20046: \$? = $ac_status" >&5 + echo "$as_me:18925: \$? = $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 @@ -21609,11 +20488,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:21612: $lt_compile\"" >&5) + (eval echo "\"\$as_me:20491: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:21616: \$? = $ac_status" >&5 + echo "$as_me:20495: \$? = $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 other than the usual output. @@ -21713,11 +20592,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:21716: $lt_compile\"" >&5) + (eval echo "\"\$as_me:20595: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:21720: \$? = $ac_status" >&5 + echo "$as_me:20599: \$? = $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 @@ -22183,27 +21062,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_f77_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } }'` @@ -22217,7 +21080,7 @@ fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -22248,27 +21111,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_f77_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } }'` @@ -22282,7 +21129,7 @@ fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -23923,6 +22770,10 @@ old_archive_cmds_GCJ=$old_archive_cmds +## CAVEAT EMPTOR: +## There is no encapsulation within the following macros, do not change +## the running order or otherwise move them around unless you know exactly +## what you are doing... lt_prog_compiler_no_builtin_flag_GCJ= @@ -23948,11 +22799,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:23951: $lt_compile\"" >&5) + (eval echo "\"\$as_me:22802: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:23955: \$? = $ac_status" >&5 + echo "$as_me:22806: \$? = $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 other than the usual output. @@ -24216,11 +23067,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:24219: $lt_compile\"" >&5) + (eval echo "\"\$as_me:23070: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:24223: \$? = $ac_status" >&5 + echo "$as_me:23074: \$? = $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 other than the usual output. @@ -24320,11 +23171,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:24323: $lt_compile\"" >&5) + (eval echo "\"\$as_me:23174: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:24327: \$? = $ac_status" >&5 + echo "$as_me:23178: \$? = $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 @@ -24800,27 +23651,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } }'` @@ -24834,7 +23669,7 @@ fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -24875,27 +23710,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } }'` @@ -24909,7 +23728,7 @@ fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -27049,7 +25868,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_LLVMGCC="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -27089,7 +25908,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_LLVMGXX="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -27173,27 +25992,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then : else echo "$as_me: failed program was:" >&5 @@ -27261,27 +26063,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_elf_elf_begin=yes else echo "$as_me: failed program was:" >&5 @@ -27290,7 +26076,7 @@ ac_cv_lib_elf_elf_begin=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi @@ -27348,27 +26134,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_m_sin=yes else echo "$as_me: failed program was:" >&5 @@ -27377,7 +26147,7 @@ ac_cv_lib_m_sin=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi @@ -27430,27 +26200,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_imagehlp_main=yes else echo "$as_me: failed program was:" >&5 @@ -27459,7 +26213,7 @@ ac_cv_lib_imagehlp_main=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi @@ -27511,27 +26265,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_psapi_main=yes else echo "$as_me: failed program was:" >&5 @@ -27540,7 +26278,7 @@ ac_cv_lib_psapi_main=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi @@ -27605,27 +26343,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_search_dlopen=$ac_res else echo "$as_me: failed program was:" >&5 @@ -27634,7 +26356,7 @@ fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext if test "${ac_cv_search_dlopen+set}" = set; then break @@ -27712,27 +26434,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_search_mallinfo=$ac_res else echo "$as_me: failed program was:" >&5 @@ -27741,7 +26447,7 @@ fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext if test "${ac_cv_search_mallinfo+set}" = set; then break @@ -27812,27 +26518,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_pthread_pthread_mutex_init=yes else echo "$as_me: failed program was:" >&5 @@ -27841,7 +26531,7 @@ ac_cv_lib_pthread_pthread_mutex_init=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi @@ -27904,27 +26594,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_search_pthread_mutex_lock=$ac_res else echo "$as_me: failed program was:" >&5 @@ -27933,7 +26607,7 @@ fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext if test "${ac_cv_search_pthread_mutex_lock+set}" = set; then break @@ -28014,27 +26688,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_udis86_ud_init=yes else echo "$as_me: failed program was:" >&5 @@ -28043,7 +26701,7 @@ ac_cv_lib_udis86_ud_init=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi @@ -28120,27 +26778,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 @@ -28213,27 +26854,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_search_opendir=$ac_res else echo "$as_me: failed program was:" >&5 @@ -28242,7 +26867,7 @@ fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext if test "${ac_cv_search_opendir+set}" = set; then break @@ -28313,27 +26938,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_search_opendir=$ac_res else echo "$as_me: failed program was:" >&5 @@ -28342,7 +26951,7 @@ fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext if test "${ac_cv_search_opendir+set}" = set; then break @@ -28407,27 +27016,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_header_mmap_anon=yes else echo "$as_me: failed program was:" >&5 @@ -28470,38 +27062,48 @@ #include #if defined S_ISBLK && defined S_IFDIR -# if S_ISBLK (S_IFDIR) -You lose. -# endif +extern char c1[S_ISBLK (S_IFDIR) ? -1 : 1]; #endif #if defined S_ISBLK && defined S_IFCHR -# if S_ISBLK (S_IFCHR) -You lose. -# endif +extern char c2[S_ISBLK (S_IFCHR) ? -1 : 1]; #endif #if defined S_ISLNK && defined S_IFREG -# if S_ISLNK (S_IFREG) -You lose. -# endif +extern char c3[S_ISLNK (S_IFREG) ? -1 : 1]; #endif #if defined S_ISSOCK && defined S_IFREG -# if S_ISSOCK (S_IFREG) -You lose. -# endif +extern char c4[S_ISSOCK (S_IFREG) ? -1 : 1]; #endif _ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "You lose" >/dev/null 2>&1; then - ac_cv_header_stat_broken=yes -else +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_header_stat_broken=no +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_header_stat_broken=yes fi -rm -f conftest* +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi { echo "$as_me:$LINENO: result: $ac_cv_header_stat_broken" >&5 echo "${ECHO_T}$ac_cv_header_stat_broken" >&6; } @@ -28550,27 +27152,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_header_stdc=yes else echo "$as_me: failed program was:" >&5 @@ -28747,27 +27332,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_header_sys_wait_h=yes else echo "$as_me: failed program was:" >&5 @@ -28825,27 +27393,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_header_time=yes else echo "$as_me: failed program was:" >&5 @@ -28911,27 +27462,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 @@ -28967,17 +27501,10 @@ 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 - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -29085,27 +27612,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 @@ -29141,17 +27651,10 @@ 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 - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -29254,27 +27757,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 @@ -29310,17 +27796,10 @@ 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 - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -29426,27 +27905,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 @@ -29482,17 +27944,10 @@ 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 - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -29597,27 +28052,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 @@ -29653,17 +28091,10 @@ 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 - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -29767,27 +28198,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 @@ -29823,17 +28237,10 @@ 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 - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -30022,27 +28429,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_type_pid_t=yes else echo "$as_me: failed program was:" >&5 @@ -30102,27 +28492,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_type_size_t=yes else echo "$as_me: failed program was:" >&5 @@ -30180,27 +28553,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_type_signal=int else echo "$as_me: failed program was:" >&5 @@ -30236,7 +28592,9 @@ int main () { -struct tm *tp; tp->tm_sec; +struct tm tm; + int *p = &tm.tm_sec; + return !p; ; return 0; } @@ -30254,27 +28612,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_struct_tm=time.h else echo "$as_me: failed program was:" >&5 @@ -30332,27 +28673,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_type_int64_t=yes else echo "$as_me: failed program was:" >&5 @@ -30415,27 +28739,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_type_uint64_t=yes else echo "$as_me: failed program was:" >&5 @@ -30493,27 +28800,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_type_u_int64_t=yes else echo "$as_me: failed program was:" >&5 @@ -30616,27 +28906,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 @@ -30645,7 +28919,7 @@ eval "$as_ac_var=no" fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi ac_res=`eval echo '${'$as_ac_var'}'` @@ -30729,27 +29003,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 @@ -30758,7 +29016,7 @@ eval "$as_ac_var=no" fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi ac_res=`eval echo '${'$as_ac_var'}'` @@ -30843,27 +29101,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 @@ -30872,7 +29114,7 @@ eval "$as_ac_var=no" fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi ac_res=`eval echo '${'$as_ac_var'}'` @@ -30955,27 +29197,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 @@ -30984,7 +29210,7 @@ eval "$as_ac_var=no" fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi ac_res=`eval echo '${'$as_ac_var'}'` @@ -31071,27 +29297,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 @@ -31100,7 +29310,7 @@ eval "$as_ac_var=no" fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi ac_res=`eval echo '${'$as_ac_var'}'` @@ -31184,27 +29394,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 @@ -31213,7 +29407,7 @@ eval "$as_ac_var=no" fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi ac_res=`eval echo '${'$as_ac_var'}'` @@ -31297,27 +29491,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 @@ -31326,7 +29504,7 @@ eval "$as_ac_var=no" fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi ac_res=`eval echo '${'$as_ac_var'}'` @@ -31470,27 +29648,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_working_alloca_h=yes else echo "$as_me: failed program was:" >&5 @@ -31499,7 +29661,7 @@ ac_cv_working_alloca_h=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi { echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5 @@ -31530,7 +29692,7 @@ # include # define alloca _alloca # else -# if HAVE_ALLOCA_H +# ifdef HAVE_ALLOCA_H # include # else # ifdef _AIX @@ -31566,27 +29728,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_func_alloca_works=yes else echo "$as_me: failed program was:" >&5 @@ -31595,7 +29741,7 @@ ac_cv_func_alloca_works=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi { echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5 @@ -31715,27 +29861,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 @@ -31744,7 +29874,7 @@ eval "$as_ac_var=no" fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi ac_res=`eval echo '${'$as_ac_var'}'` @@ -31881,27 +30011,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_func_rand48=yes else echo "$as_me: failed program was:" >&5 @@ -31969,27 +30082,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_cxx_namespaces=yes else echo "$as_me: failed program was:" >&5 @@ -32060,27 +30156,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_cxx_have_std_ext_hash_map=yes else echo "$as_me: failed program was:" >&5 @@ -32157,27 +30236,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_cxx_have_gnu_ext_hash_map=yes else echo "$as_me: failed program was:" >&5 @@ -32251,27 +30313,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_cxx_have_global_hash_map=yes else echo "$as_me: failed program was:" >&5 @@ -32348,27 +30393,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_cxx_have_std_ext_hash_set=yes else echo "$as_me: failed program was:" >&5 @@ -32445,27 +30473,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_cxx_have_gnu_ext_hash_set=yes else echo "$as_me: failed program was:" >&5 @@ -32539,27 +30550,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_cxx_have_global_hash_set=yes else echo "$as_me: failed program was:" >&5 @@ -32636,27 +30630,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_cxx_have_std_iterator=yes else echo "$as_me: failed program was:" >&5 @@ -32734,27 +30711,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_cxx_have_bi_iterator=yes else echo "$as_me: failed program was:" >&5 @@ -32832,27 +30792,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_cxx_have_fwd_iterator=yes else echo "$as_me: failed program was:" >&5 @@ -32927,27 +30870,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_func_isnan_in_math_h=yes else echo "$as_me: failed program was:" >&5 @@ -33015,27 +30941,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_func_isnan_in_cmath=yes else echo "$as_me: failed program was:" >&5 @@ -33102,27 +31011,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_func_std_isnan_in_cmath=yes else echo "$as_me: failed program was:" >&5 @@ -33190,27 +31082,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_func_isinf_in_math_h=yes else echo "$as_me: failed program was:" >&5 @@ -33277,27 +31152,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_func_isinf_in_cmath=yes else echo "$as_me: failed program was:" >&5 @@ -33364,27 +31222,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_func_std_isinf_in_cmath=yes else echo "$as_me: failed program was:" >&5 @@ -33451,27 +31292,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_func_finite_in_ieeefp_h=yes else echo "$as_me: failed program was:" >&5 @@ -33542,27 +31366,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 @@ -33598,17 +31405,10 @@ 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 - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -33739,27 +31539,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 @@ -33768,7 +31552,7 @@ eval "$as_ac_var=no" fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi ac_res=`eval echo '${'$as_ac_var'}'` @@ -33825,21 +31609,21 @@ #include #include -#if !STDC_HEADERS && !HAVE_STDLIB_H +#if !defined STDC_HEADERS && !defined HAVE_STDLIB_H char *malloc (); #endif /* This mess was copied from the GNU getpagesize.h. */ -#if !HAVE_GETPAGESIZE +#ifndef HAVE_GETPAGESIZE /* Assume that all systems that can run configure have sys/param.h. */ -# if !HAVE_SYS_PARAM_H +# ifndef HAVE_SYS_PARAM_H # define HAVE_SYS_PARAM_H 1 # endif # ifdef _SC_PAGESIZE # define getpagesize() sysconf(_SC_PAGESIZE) # else /* no _SC_PAGESIZE */ -# if HAVE_SYS_PARAM_H +# ifdef HAVE_SYS_PARAM_H # include # ifdef EXEC_PAGESIZE # define getpagesize() EXEC_PAGESIZE @@ -34162,27 +31946,11 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 @@ -34191,7 +31959,7 @@ eval "$as_ac_var=no" fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi ac_res=`eval echo '${'$as_ac_var'}'` @@ -34441,27 +32209,10 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then llvm_cv_cxx_visibility_inlines_hidden=yes else echo "$as_me: failed program was:" >&5 @@ -34688,7 +32439,8 @@ ## M4sh Initialization. ## ## --------------------- ## -# Be Bourne compatible +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: @@ -34697,10 +32449,13 @@ alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh + + # PATH needs CR @@ -34924,19 +32679,28 @@ as_mkdir_p=false fi -# Find out whether ``test -x'' works. Don't use a zero-byte file, as -# systems may use methods other than mode bits to determine executability. -cat >conf$$.file <<_ASEOF -#! /bin/sh -exit 0 -_ASEOF -chmod +x conf$$.file -if test -x conf$$.file >/dev/null 2>&1; then - as_executable_p="test -x" +if test -x / >/dev/null 2>&1; then + as_test_x='test -x' else - as_executable_p=: + if ls -dL / >/dev/null 2>&1; then + as_ls_L_option=L + else + as_ls_L_option= + fi + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then + test -d "$1/."; + else + case $1 in + -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' fi -rm -f conf$$.file +as_executable_p=$as_test_x # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -34952,7 +32716,7 @@ # values after options handling. ac_log=" This file was extended by llvm $as_me 2.5svn, which was -generated by GNU Autoconf 2.60. Invocation command line was +generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -34981,7 +32745,7 @@ Usage: $0 [OPTIONS] [FILE]... -h, --help print this help, then exit - -V, --version print version number, then exit + -V, --version print version number and configuration settings, 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 @@ -35005,7 +32769,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ llvm config.status 2.5svn -configured by $0, generated by GNU Autoconf 2.60, +configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" Copyright (C) 2006 Free Software Foundation, Inc. @@ -35291,8 +33055,8 @@ CXXFLAGS!$CXXFLAGS$ac_delim ac_ct_CXX!$ac_ct_CXX$ac_delim LEX!$LEX$ac_delim -LEXLIB!$LEXLIB$ac_delim LEX_OUTPUT_ROOT!$LEX_OUTPUT_ROOT$ac_delim +LEXLIB!$LEXLIB$ac_delim FLEX!$FLEX$ac_delim YACC!$YACC$ac_delim YFLAGS!$YFLAGS$ac_delim @@ -35374,6 +33138,7 @@ OCAMLOPT!$OCAMLOPT$ac_delim OCAMLDEP!$OCAMLDEP$ac_delim OCAMLDOC!$OCAMLDOC$ac_delim +GAS!$GAS$ac_delim INSTALL_LTDL_TRUE!$INSTALL_LTDL_TRUE$ac_delim INSTALL_LTDL_FALSE!$INSTALL_LTDL_FALSE$ac_delim CONVENIENCE_LTDL_TRUE!$CONVENIENCE_LTDL_TRUE$ac_delim @@ -35420,7 +33185,7 @@ LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 79; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 80; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 @@ -35927,7 +33692,12 @@ case $ac_arg in *\'*) ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac - ac_sub_configure_args="$ac_arg $ac_sub_configure_args" + ac_sub_configure_args="'$ac_arg' $ac_sub_configure_args" + + # Pass --silent + if test "$silent" = yes; then + ac_sub_configure_args="--silent $ac_sub_configure_args" + fi ac_popdir=`pwd` for ac_dir in : $subdirs; do test "x$ac_dir" = x: && continue From baldrick at free.fr Wed Oct 22 06:24:13 2008 From: baldrick at free.fr (Duncan Sands) Date: Wed, 22 Oct 2008 11:24:13 -0000 Subject: [llvm-commits] [llvm] r57972 - /llvm/trunk/lib/Target/X86/X86ISelLowering.cpp Message-ID: <200810221124.m9MBODEp004285@zion.cs.uiuc.edu> Author: baldrick Date: Wed Oct 22 06:24:12 2008 New Revision: 57972 URL: http://llvm.org/viewvc/llvm-project?rev=57972&view=rev Log: Get this working with LegalizeTypes: (1) don't assume that i64 has been turned into a BUILD_PAIR node (when called from LegalizeTypes this hasn't happened yet) and don't use a vector shuffle mask with an illegal element type. Modified: llvm/trunk/lib/Target/X86/X86ISelLowering.cpp Modified: llvm/trunk/lib/Target/X86/X86ISelLowering.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86ISelLowering.cpp?rev=57972&r1=57971&r2=57972&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/X86ISelLowering.cpp (original) +++ llvm/trunk/lib/Target/X86/X86ISelLowering.cpp Wed Oct 22 06:24:12 2008 @@ -4760,15 +4760,19 @@ SDValue UnpcklMask = DAG.getNode(ISD::BUILD_VECTOR, MVT::v4i32, &MaskVec[0], MaskVec.size()); SmallVector MaskVec2; - MaskVec2.push_back(DAG.getConstant(1, MVT::i64)); - MaskVec2.push_back(DAG.getConstant(0, MVT::i64)); - SDValue ShufMask = DAG.getNode(ISD::BUILD_VECTOR, MVT::v2i64, &MaskVec2[0], + MaskVec2.push_back(DAG.getConstant(1, MVT::i32)); + MaskVec2.push_back(DAG.getConstant(0, MVT::i32)); + SDValue ShufMask = DAG.getNode(ISD::BUILD_VECTOR, MVT::v2i32, &MaskVec2[0], MaskVec2.size()); SDValue XR1 = DAG.getNode(ISD::SCALAR_TO_VECTOR, MVT::v4i32, - Op.getOperand(0).getOperand(1)); + DAG.getNode(ISD::EXTRACT_ELEMENT, MVT::i32, + Op.getOperand(0), + DAG.getIntPtrConstant(1))); SDValue XR2 = DAG.getNode(ISD::SCALAR_TO_VECTOR, MVT::v4i32, - Op.getOperand(0).getOperand(0)); + DAG.getNode(ISD::EXTRACT_ELEMENT, MVT::i32, + Op.getOperand(0), + DAG.getIntPtrConstant(0))); SDValue Unpck1 = DAG.getNode(ISD::VECTOR_SHUFFLE, MVT::v4i32, XR1, XR2, UnpcklMask); SDValue CLod0 = DAG.getLoad(MVT::v4i32, DAG.getEntryNode(), CPIdx0, From baldrick at free.fr Wed Oct 22 06:49:10 2008 From: baldrick at free.fr (Duncan Sands) Date: Wed, 22 Oct 2008 11:49:10 -0000 Subject: [llvm-commits] [llvm] r57973 - in /llvm/trunk/lib/CodeGen/SelectionDAG: LegalizeFloatTypes.cpp LegalizeTypes.h Message-ID: <200810221149.m9MBnAQA005036@zion.cs.uiuc.edu> Author: baldrick Date: Wed Oct 22 06:49:09 2008 New Revision: 57973 URL: http://llvm.org/viewvc/llvm-project?rev=57973&view=rev Log: LegalizeTypes soft-float support for fpow. Modified: llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeFloatTypes.cpp llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeTypes.h Modified: llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeFloatTypes.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeFloatTypes.cpp?rev=57973&r1=57972&r2=57973&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeFloatTypes.cpp (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeFloatTypes.cpp Wed Oct 22 06:49:09 2008 @@ -66,6 +66,7 @@ case ISD::FMUL: R = SoftenFloatRes_FMUL(N); break; case ISD::FP_EXTEND: R = SoftenFloatRes_FP_EXTEND(N); break; case ISD::FP_ROUND: R = SoftenFloatRes_FP_ROUND(N); break; + case ISD::FPOW: R = SoftenFloatRes_FPOW(N); break; case ISD::FPOWI: R = SoftenFloatRes_FPOWI(N); break; case ISD::FSUB: R = SoftenFloatRes_FSUB(N); break; case ISD::LOAD: R = SoftenFloatRes_LOAD(N); break; @@ -162,7 +163,7 @@ SDValue DAGTypeLegalizer::SoftenFloatRes_FDIV(SDNode *N) { MVT NVT = TLI.getTypeToTransformTo(N->getValueType(0)); SDValue Ops[2] = { GetSoftenedFloat(N->getOperand(0)), - GetSoftenedFloat(N->getOperand(1)) }; + GetSoftenedFloat(N->getOperand(1)) }; return MakeLibCall(GetFPLibCall(N->getValueType(0), RTLIB::DIV_F32, RTLIB::DIV_F64, @@ -199,6 +200,18 @@ return MakeLibCall(LC, NVT, &Op, 1, false); } +SDValue DAGTypeLegalizer::SoftenFloatRes_FPOW(SDNode *N) { + MVT NVT = TLI.getTypeToTransformTo(N->getValueType(0)); + SDValue Ops[2] = { GetSoftenedFloat(N->getOperand(0)), + GetSoftenedFloat(N->getOperand(1)) }; + return MakeLibCall(GetFPLibCall(N->getValueType(0), + RTLIB::POW_F32, + RTLIB::POW_F64, + RTLIB::POW_F80, + RTLIB::POW_PPCF128), + NVT, Ops, 2, false); +} + SDValue DAGTypeLegalizer::SoftenFloatRes_FPOWI(SDNode *N) { MVT NVT = TLI.getTypeToTransformTo(N->getValueType(0)); SDValue Ops[2] = { GetSoftenedFloat(N->getOperand(0)), N->getOperand(1) }; Modified: llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeTypes.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeTypes.h?rev=57973&r1=57972&r2=57973&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeTypes.h (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeTypes.h Wed Oct 22 06:49:09 2008 @@ -343,6 +343,7 @@ SDValue SoftenFloatRes_FMUL(SDNode *N); SDValue SoftenFloatRes_FP_EXTEND(SDNode *N); SDValue SoftenFloatRes_FP_ROUND(SDNode *N); + SDValue SoftenFloatRes_FPOW(SDNode *N); SDValue SoftenFloatRes_FPOWI(SDNode *N); SDValue SoftenFloatRes_FSUB(SDNode *N); SDValue SoftenFloatRes_LOAD(SDNode *N); From gordonhenriksen at mac.com Wed Oct 22 07:40:40 2008 From: gordonhenriksen at mac.com (Gordon Henriksen) Date: Wed, 22 Oct 2008 12:40:40 -0000 Subject: [llvm-commits] [llvm] r57974 - /llvm/trunk/autoconf/configure.ac Message-ID: <200810221240.m9MCee5n006822@zion.cs.uiuc.edu> Author: gordon Date: Wed Oct 22 07:40:40 2008 New Revision: 57974 URL: http://llvm.org/viewvc/llvm-project?rev=57974&view=rev Log: [PR2886] Don't look for ocaml's .opt executables; something in the autoconf/test machinery doesn't handle the period properly. Modified: llvm/trunk/autoconf/configure.ac Modified: llvm/trunk/autoconf/configure.ac URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/autoconf/configure.ac?rev=57974&r1=57973&r2=57974&view=diff ============================================================================== --- llvm/trunk/autoconf/configure.ac (original) +++ llvm/trunk/autoconf/configure.ac Wed Oct 22 07:40:40 2008 @@ -610,10 +610,10 @@ AC_PATH_PROG(RUNTEST, [runtest]) DJ_AC_PATH_TCLSH AC_PATH_PROG(ZIP, [zip]) -AC_PATH_PROGS(OCAMLC, [ocamlc.opt ocamlc]) -AC_PATH_PROGS(OCAMLOPT, [ocamlopt.opt ocamlopt]) -AC_PATH_PROGS(OCAMLDEP, [ocamldep.opt ocamldep]) -AC_PATH_PROGS(OCAMLDOC, [ocamldoc.opt ocamldoc]) +AC_PATH_PROGS(OCAMLC, [ocamlc]) +AC_PATH_PROGS(OCAMLOPT, [ocamlopt]) +AC_PATH_PROGS(OCAMLDEP, [ocamldep]) +AC_PATH_PROGS(OCAMLDOC, [ocamldoc]) AC_PATH_PROGS(GAS, [gas as]) dnl Determine if the linker supports the -R option. From gordonhenriksen at mac.com Wed Oct 22 07:40:55 2008 From: gordonhenriksen at mac.com (Gordon Henriksen) Date: Wed, 22 Oct 2008 12:40:55 -0000 Subject: [llvm-commits] [llvm] r57975 - /llvm/trunk/configure Message-ID: <200810221240.m9MCeupV006841@zion.cs.uiuc.edu> Author: gordon Date: Wed Oct 22 07:40:55 2008 New Revision: 57975 URL: http://llvm.org/viewvc/llvm-project?rev=57975&view=rev Log: Regenerate. Modified: llvm/trunk/configure Modified: llvm/trunk/configure URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/configure?rev=57975&r1=57974&r2=57975&view=diff ============================================================================== --- llvm/trunk/configure (original) +++ llvm/trunk/configure Wed Oct 22 07:40:55 2008 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for llvm 2.5svn. +# Generated by GNU Autoconf 2.60 for llvm 2.5svn. # # Report bugs to . # @@ -14,8 +14,7 @@ ## M4sh Initialization. ## ## --------------------- ## -# Be more Bourne compatible -DUALCASE=1; export DUALCASE # for MKS sh +# Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: @@ -24,13 +23,10 @@ alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; -esac - + case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac fi - - +BIN_SH=xpg4; export BIN_SH # for Tru64 +DUALCASE=1; export DUALCASE # for MKS sh # PATH needs CR @@ -223,7 +219,7 @@ else as_candidate_shells= as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -241,6 +237,7 @@ # Try only shells that exist, to save several forks. if { test -f "$as_shell" || test -f "$as_shell.exe"; } && { ("$as_shell") 2> /dev/null <<\_ASEOF +# Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: @@ -249,12 +246,10 @@ alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; -esac - + case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac fi - +BIN_SH=xpg4; export BIN_SH # for Tru64 +DUALCASE=1; export DUALCASE # for MKS sh : _ASEOF @@ -262,6 +257,7 @@ CONFIG_SHELL=$as_shell as_have_required=yes if { "$as_shell" 2> /dev/null <<\_ASEOF +# Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: @@ -270,12 +266,10 @@ alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; -esac - + case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac fi - +BIN_SH=xpg4; export BIN_SH # for Tru64 +DUALCASE=1; export DUALCASE # for MKS sh : (as_func_return () { @@ -522,28 +516,19 @@ as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' +# Find out whether ``test -x'' works. Don't use a zero-byte file, as +# systems may use methods other than mode bits to determine executability. +cat >conf$$.file <<_ASEOF +#! /bin/sh +exit 0 +_ASEOF +chmod +x conf$$.file +if test -x conf$$.file >/dev/null 2>&1; then + as_executable_p="test -x" else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' + as_executable_p=: fi -as_executable_p=$as_test_x +rm -f conf$$.file # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -738,36 +723,36 @@ # Factoring default headers for most tests. ac_includes_default="\ #include -#ifdef HAVE_SYS_TYPES_H +#if HAVE_SYS_TYPES_H # include #endif -#ifdef HAVE_SYS_STAT_H +#if HAVE_SYS_STAT_H # include #endif -#ifdef STDC_HEADERS +#if STDC_HEADERS # include # include #else -# ifdef HAVE_STDLIB_H +# if HAVE_STDLIB_H # include # endif #endif -#ifdef HAVE_STRING_H -# if !defined STDC_HEADERS && defined HAVE_MEMORY_H +#if HAVE_STRING_H +# if !STDC_HEADERS && HAVE_MEMORY_H # include # endif # include #endif -#ifdef HAVE_STRINGS_H +#if HAVE_STRINGS_H # include #endif -#ifdef HAVE_INTTYPES_H +#if HAVE_INTTYPES_H # include #endif -#ifdef HAVE_STDINT_H +#if HAVE_STDINT_H # include #endif -#ifdef HAVE_UNISTD_H +#if HAVE_UNISTD_H # include #endif" @@ -861,8 +846,8 @@ CXXFLAGS ac_ct_CXX LEX -LEX_OUTPUT_ROOT LEXLIB +LEX_OUTPUT_ROOT FLEX YACC YFLAGS @@ -955,7 +940,6 @@ CC CFLAGS LDFLAGS -LIBS CPPFLAGS CPP CXX @@ -1082,10 +1066,10 @@ -disable-* | --disable-*) ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && + expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid feature name: $ac_feature" >&2 { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` + ac_feature=`echo $ac_feature | sed 's/-/_/g'` eval enable_$ac_feature=no ;; -docdir | --docdir | --docdi | --doc | --do) @@ -1101,10 +1085,10 @@ -enable-* | --enable-*) ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && + expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid feature name: $ac_feature" >&2 { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` + ac_feature=`echo $ac_feature | sed 's/-/_/g'` eval enable_$ac_feature=\$ac_optarg ;; -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ @@ -1298,19 +1282,19 @@ -with-* | --with-*) ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && + expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid package name: $ac_package" >&2 { (exit 1); exit 1; }; } - ac_package=`echo $ac_package | sed 's/[-.]/_/g'` + ac_package=`echo $ac_package| sed 's/-/_/g'` eval with_$ac_package=\$ac_optarg ;; -without-* | --without-*) ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && + expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid package name: $ac_package" >&2 { (exit 1); exit 1; }; } - ac_package=`echo $ac_package | sed 's/[-.]/_/g'` + ac_package=`echo $ac_package | sed 's/-/_/g'` eval with_$ac_package=no ;; --x) @@ -1602,7 +1586,6 @@ CFLAGS C compiler flags LDFLAGS linker flags, e.g. -L if you have libraries in a nonstandard directory - LIBS libraries to pass to the linker, e.g. -l CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if you have headers in a nonstandard directory CPP C preprocessor @@ -1682,7 +1665,7 @@ if $ac_init_version; then cat <<\_ACEOF llvm configure 2.5svn -generated by GNU Autoconf 2.61 +generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. @@ -1698,7 +1681,7 @@ running configure, to aid debugging if configure makes a mistake. It was created by llvm $as_me 2.5svn, which was -generated by GNU Autoconf 2.61. Invocation command line was +generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -2442,7 +2425,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}gcc" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2482,7 +2465,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="gcc" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2539,7 +2522,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}cc" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2580,7 +2563,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -2638,7 +2621,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2682,7 +2665,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2823,7 +2806,7 @@ # in a Makefile. We should not override ac_cv_exeext if it was cached, # so that the user can short-circuit this test for compilers unknown to # Autoconf. -for ac_file in $ac_files '' +for ac_file in $ac_files do test -f "$ac_file" || continue case $ac_file in @@ -2851,12 +2834,6 @@ test "$ac_cv_exeext" = no && ac_cv_exeext= else - ac_file='' -fi - -{ echo "$as_me:$LINENO: result: $ac_file" >&5 -echo "${ECHO_T}$ac_file" >&6; } -if test -z "$ac_file"; then echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -2868,6 +2845,8 @@ fi ac_exeext=$ac_cv_exeext +{ echo "$as_me:$LINENO: result: $ac_file" >&5 +echo "${ECHO_T}$ac_file" >&6; } # Check that the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. @@ -3045,10 +3024,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 @@ -3103,10 +3099,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_prog_cc_g=yes else echo "$as_me: failed program was:" >&5 @@ -3141,10 +3154,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then : else echo "$as_me: failed program was:" >&5 @@ -3180,10 +3210,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_prog_cc_g=yes else echo "$as_me: failed program was:" >&5 @@ -3299,10 +3346,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_prog_cc_c89=$ac_arg else echo "$as_me: failed program was:" >&5 @@ -3392,10 +3456,17 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then : else echo "$as_me: failed program was:" >&5 @@ -3429,10 +3500,17 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then # Broken: success on invalid input. continue else @@ -3497,10 +3575,17 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then : else echo "$as_me: failed program was:" >&5 @@ -3534,10 +3619,17 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then # Broken: success on invalid input. continue else @@ -3592,7 +3684,7 @@ for ac_prog in grep ggrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue + { test -f "$ac_path_GREP" && $as_executable_p "$ac_path_GREP"; } || continue # Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP case `"$ac_path_GREP" --version 2>&1` in @@ -3674,7 +3766,7 @@ for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue + { test -f "$ac_path_EGREP" && $as_executable_p "$ac_path_EGREP"; } || continue # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in @@ -3770,10 +3862,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 @@ -3949,10 +4058,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 @@ -3994,8 +4120,7 @@ int main () { -#if ! (defined BYTE_ORDER && defined BIG_ENDIAN && defined LITTLE_ENDIAN \ - && BYTE_ORDER && BIG_ENDIAN && LITTLE_ENDIAN) +#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN bogus endian macros #endif @@ -4016,10 +4141,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then # It does; now see whether it defined to BIG_ENDIAN or not. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -4054,10 +4196,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_c_bigendian=yes else echo "$as_me: failed program was:" >&5 @@ -4108,10 +4267,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then ac_cv_c_bigendian=yes fi @@ -4241,7 +4417,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_BUILD_CC="${ac_build_prefix}gcc" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4279,7 +4455,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_BUILD_CC="gcc" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4318,7 +4494,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -4408,7 +4584,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_BUILD_CXX="${ac_build_prefix}g++" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4446,7 +4622,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_BUILD_CXX="g++" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4485,7 +4661,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/c++"; then ac_prog_rejected=yes continue @@ -4934,10 +5110,17 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then : else echo "$as_me: failed program was:" >&5 @@ -4971,10 +5154,17 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then # Broken: success on invalid input. continue else @@ -5039,10 +5229,17 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then : else echo "$as_me: failed program was:" >&5 @@ -5076,10 +5273,17 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then # Broken: success on invalid input. continue else @@ -5136,7 +5340,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5180,7 +5384,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5298,10 +5502,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 @@ -5356,10 +5577,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_prog_cc_g=yes else echo "$as_me: failed program was:" >&5 @@ -5394,10 +5632,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then : else echo "$as_me: failed program was:" >&5 @@ -5433,10 +5688,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_prog_cc_g=yes else echo "$as_me: failed program was:" >&5 @@ -5552,10 +5824,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_prog_cc_c89=$ac_arg else echo "$as_me: failed program was:" >&5 @@ -5620,7 +5909,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5664,7 +5953,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CXX="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5777,10 +6066,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 @@ -5835,10 +6141,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_prog_cxx_g=yes else echo "$as_me: failed program was:" >&5 @@ -5873,10 +6196,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then : else echo "$as_me: failed program was:" >&5 @@ -5912,10 +6252,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_prog_cxx_g=yes else echo "$as_me: failed program was:" >&5 @@ -5979,7 +6336,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_LEX="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6004,70 +6361,37 @@ done test -n "$LEX" || LEX=":" -if test "x$LEX" != "x:"; then - cat >conftest.l <<_ACEOF -%% -a { ECHO; } -b { REJECT; } -c { yymore (); } -d { yyless (1); } -e { yyless (input () != 0); } -f { unput (yytext[0]); } -. { BEGIN INITIAL; } -%% -#ifdef YYTEXT_POINTER -extern char *yytext; +if test -z "$LEXLIB" +then + { echo "$as_me:$LINENO: checking for yywrap in -lfl" >&5 +echo $ECHO_N "checking for yywrap in -lfl... $ECHO_C" >&6; } +if test "${ac_cv_lib_fl_yywrap+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lfl $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" #endif +char yywrap (); int -main (void) +main () { - return ! yylex () + ! yywrap (); +return yywrap (); + ; + return 0; } _ACEOF -{ (ac_try="$LEX conftest.l" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$LEX conftest.l") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ echo "$as_me:$LINENO: checking lex output file root" >&5 -echo $ECHO_N "checking lex output file root... $ECHO_C" >&6; } -if test "${ac_cv_prog_lex_root+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - -if test -f lex.yy.c; then - ac_cv_prog_lex_root=lex.yy -elif test -f lexyy.c; then - ac_cv_prog_lex_root=lexyy -else - { { echo "$as_me:$LINENO: error: cannot find output from $LEX; giving up" >&5 -echo "$as_me: error: cannot find output from $LEX; giving up" >&2;} - { (exit 1); exit 1; }; } -fi -fi -{ echo "$as_me:$LINENO: result: $ac_cv_prog_lex_root" >&5 -echo "${ECHO_T}$ac_cv_prog_lex_root" >&6; } -LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root - -if test -z "${LEXLIB+set}"; then - { echo "$as_me:$LINENO: checking lex library" >&5 -echo $ECHO_N "checking lex library... $ECHO_C" >&6; } -if test "${ac_cv_lib_lex+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - ac_save_LIBS=$LIBS - ac_cv_lib_lex='none needed' - for ac_lib in '' -lfl -ll; do - LIBS="$ac_lib $ac_save_LIBS" - cat >conftest.$ac_ext <<_ACEOF -`cat $LEX_OUTPUT_ROOT.c` -_ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (ac_try="$ac_link" case "(($ac_try" in @@ -6081,46 +6405,72 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_lex=$ac_lib + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_fl_yywrap=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - + ac_cv_lib_fl_yywrap=no fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - test "$ac_cv_lib_lex" != 'none needed' && break - done - LIBS=$ac_save_LIBS - -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_lex" >&5 -echo "${ECHO_T}$ac_cv_lib_lex" >&6; } - test "$ac_cv_lib_lex" != 'none needed' && LEXLIB=$ac_cv_lib_lex +LIBS=$ac_check_lib_save_LIBS fi - - -{ echo "$as_me:$LINENO: checking whether yytext is a pointer" >&5 -echo $ECHO_N "checking whether yytext is a pointer... $ECHO_C" >&6; } -if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_fl_yywrap" >&5 +echo "${ECHO_T}$ac_cv_lib_fl_yywrap" >&6; } +if test $ac_cv_lib_fl_yywrap = yes; then + LEXLIB="-lfl" +else + { echo "$as_me:$LINENO: checking for yywrap in -ll" >&5 +echo $ECHO_N "checking for yywrap in -ll... $ECHO_C" >&6; } +if test "${ac_cv_lib_l_yywrap+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - # POSIX says lex can declare yytext either as a pointer or an array; the -# default is implementation-dependent. Figure out which it is, since -# not all implementations provide the %pointer and %array declarations. -ac_cv_prog_lex_yytext_pointer=no -ac_save_LIBS=$LIBS -LIBS="$LEXLIB $ac_save_LIBS" + ac_check_lib_save_LIBS=$LIBS +LIBS="-ll $LIBS" cat >conftest.$ac_ext <<_ACEOF -#define YYTEXT_POINTER 1 -`cat $LEX_OUTPUT_ROOT.c` +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char yywrap (); +int +main () +{ +return yywrap (); + ; + return 0; +} _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (ac_try="$ac_link" @@ -6135,22 +6485,147 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_prog_lex_yytext_pointer=yes + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_l_yywrap=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - + ac_cv_lib_l_yywrap=no fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_save_LIBS +LIBS=$ac_check_lib_save_LIBS +fi +{ echo "$as_me:$LINENO: result: $ac_cv_lib_l_yywrap" >&5 +echo "${ECHO_T}$ac_cv_lib_l_yywrap" >&6; } +if test $ac_cv_lib_l_yywrap = yes; then + LEXLIB="-ll" +fi + +fi + +fi + +if test "x$LEX" != "x:"; then + { echo "$as_me:$LINENO: checking lex output file root" >&5 +echo $ECHO_N "checking lex output file root... $ECHO_C" >&6; } +if test "${ac_cv_prog_lex_root+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + # The minimal lex program is just a single line: %%. But some broken lexes +# (Solaris, I think it was) want two %% lines, so accommodate them. +cat >conftest.l <<_ACEOF +%% +%% +_ACEOF +{ (ac_try="$LEX conftest.l" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$LEX conftest.l") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +if test -f lex.yy.c; then + ac_cv_prog_lex_root=lex.yy +elif test -f lexyy.c; then + ac_cv_prog_lex_root=lexyy +else + { { echo "$as_me:$LINENO: error: cannot find output from $LEX; giving up" >&5 +echo "$as_me: error: cannot find output from $LEX; giving up" >&2;} + { (exit 1); exit 1; }; } +fi +fi +{ echo "$as_me:$LINENO: result: $ac_cv_prog_lex_root" >&5 +echo "${ECHO_T}$ac_cv_prog_lex_root" >&6; } +rm -f conftest.l +LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root + +{ echo "$as_me:$LINENO: checking whether yytext is a pointer" >&5 +echo $ECHO_N "checking whether yytext is a pointer... $ECHO_C" >&6; } +if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + # POSIX says lex can declare yytext either as a pointer or an array; the +# default is implementation-dependent. Figure out which it is, since +# not all implementations provide the %pointer and %array declarations. +ac_cv_prog_lex_yytext_pointer=no +echo 'extern char *yytext;' >>$LEX_OUTPUT_ROOT.c +ac_save_LIBS=$LIBS +LIBS="$LIBS $LEXLIB" +cat >conftest.$ac_ext <<_ACEOF +`cat $LEX_OUTPUT_ROOT.c` +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_prog_lex_yytext_pointer=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_save_LIBS +rm -f "${LEX_OUTPUT_ROOT}.c" fi { echo "$as_me:$LINENO: result: $ac_cv_prog_lex_yytext_pointer" >&5 @@ -6162,7 +6637,6 @@ _ACEOF fi -rm -f conftest.l $LEX_OUTPUT_ROOT.c fi @@ -6201,7 +6675,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_YACC="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6348,7 +6822,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_CMP="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6389,7 +6863,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_CP="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6430,7 +6904,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_DATE="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6471,7 +6945,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_FIND="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6512,7 +6986,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_GREP="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6553,7 +7027,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_MKDIR="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6594,7 +7068,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_MV="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6634,7 +7108,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6674,7 +7148,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_RANLIB="ranlib" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6731,7 +7205,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_RM="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6772,7 +7246,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_SED="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6813,7 +7287,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_TAR="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6854,7 +7328,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_BINPWD="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6896,7 +7370,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_GRAPHVIZ="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6952,7 +7426,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_DOT="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7010,7 +7484,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_GV="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7069,7 +7543,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_DOTTY="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7127,7 +7601,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7211,7 +7685,7 @@ # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -7274,7 +7748,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_BZIP2="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7314,7 +7788,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_DOXYGEN="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7354,7 +7828,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_GROFF="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7394,7 +7868,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_GZIP="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7434,7 +7908,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_POD2HTML="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7474,7 +7948,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_POD2MAN="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7514,7 +7988,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_RUNTEST="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7587,7 +8061,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_TCLSH="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7644,7 +8118,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_ZIP="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7666,7 +8140,7 @@ fi -for ac_prog in ocamlc.opt ocamlc +for ac_prog in ocamlc do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -7686,7 +8160,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_OCAMLC="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7711,7 +8185,7 @@ test -n "$OCAMLC" && break done -for ac_prog in ocamlopt.opt ocamlopt +for ac_prog in ocamlopt do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -7731,7 +8205,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_OCAMLOPT="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7756,7 +8230,7 @@ test -n "$OCAMLOPT" && break done -for ac_prog in ocamldep.opt ocamldep +for ac_prog in ocamldep do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -7776,7 +8250,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_OCAMLDEP="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7801,7 +8275,7 @@ test -n "$OCAMLDEP" && break done -for ac_prog in ocamldoc.opt ocamldoc +for ac_prog in ocamldoc do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -7821,7 +8295,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_OCAMLDOC="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7866,7 +8340,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_GAS="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7933,11 +8407,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then llvm_cv_link_use_r=yes else echo "$as_me: failed program was:" >&5 @@ -7946,7 +8436,7 @@ llvm_cv_link_use_r=no fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext CFLAGS="$oldcflags" ac_ext=c @@ -7989,10 +8479,10 @@ #ifndef __cplusplus /* Ultrix mips cc rejects this. */ typedef int charset[2]; - const charset cs; + const charset x; /* SunOS 4.1.1 cc rejects this. */ - char const *const *pcpcc; - char **ppc; + char const *const *ccp; + char **p; /* NEC SVR4.0.2 mips cc rejects this. */ struct point {int x, y;}; static struct point const zero = {0,0}; @@ -8001,11 +8491,11 @@ an arm of an if-expression whose if-part is not a constant expression */ const char *g = "string"; - pcpcc = &g + (g ? g-g : 0); + ccp = &g + (g ? g-g : 0); /* HPUX 7.0 cc rejects these. */ - ++pcpcc; - ppc = (char**) pcpcc; - pcpcc = (char const *const *) ppc; + ++ccp; + p = (char**) ccp; + ccp = (char const *const *) p; { /* SCO 3.2v4 cc rejects this. */ char *t; char const *s = 0 ? (char *) 0 : (char const *) 0; @@ -8032,7 +8522,7 @@ const int foo = 10; if (!foo) return 0; } - return !cs[0] && !zero.x; + return !x[0] && !zero.x; #endif ; @@ -8052,10 +8542,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_c_const=yes else echo "$as_me: failed program was:" >&5 @@ -8120,10 +8627,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 @@ -8196,11 +8720,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_search_opendir=$ac_res else echo "$as_me: failed program was:" >&5 @@ -8209,7 +8749,7 @@ fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext if test "${ac_cv_search_opendir+set}" = set; then break @@ -8280,11 +8820,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_search_opendir=$ac_res else echo "$as_me: failed program was:" >&5 @@ -8293,7 +8849,7 @@ fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext if test "${ac_cv_search_opendir+set}" = set; then break @@ -8356,10 +8912,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 @@ -8395,10 +8968,17 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -8468,7 +9048,9 @@ fi - if test x"${enable_ltdl_install-no}" != xno; then + + +if test x"${enable_ltdl_install-no}" != xno; then INSTALL_LTDL_TRUE= INSTALL_LTDL_FALSE='#' else @@ -8476,7 +9058,9 @@ INSTALL_LTDL_FALSE= fi - if test x"${enable_ltdl_convenience-no}" != xno; then + + +if test x"${enable_ltdl_convenience-no}" != xno; then CONVENIENCE_LTDL_TRUE= CONVENIENCE_LTDL_FALSE='#' else @@ -9488,11 +10072,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_func_shl_load=yes else echo "$as_me: failed program was:" >&5 @@ -9501,7 +10101,7 @@ ac_cv_func_shl_load=no fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi { echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 @@ -9555,11 +10155,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_lib_dld_shl_load=yes else echo "$as_me: failed program was:" >&5 @@ -9568,7 +10184,7 @@ ac_cv_lib_dld_shl_load=no fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi @@ -9624,11 +10240,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_lib_dl_dlopen=yes else echo "$as_me: failed program was:" >&5 @@ -9637,7 +10269,7 @@ ac_cv_lib_dl_dlopen=no fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi @@ -9682,11 +10314,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cat >>confdefs.h <<\_ACEOF #define HAVE_LIBDL 1 @@ -9738,11 +10386,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_lib_svld_dlopen=yes else echo "$as_me: failed program was:" >&5 @@ -9751,7 +10415,7 @@ ac_cv_lib_svld_dlopen=no fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi @@ -9807,11 +10471,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_lib_dld_dld_link=yes else echo "$as_me: failed program was:" >&5 @@ -9820,7 +10500,7 @@ ac_cv_lib_dld_dld_link=no fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi @@ -9897,11 +10577,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_func__dyld_func_lookup=yes else echo "$as_me: failed program was:" >&5 @@ -9910,7 +10606,7 @@ ac_cv_func__dyld_func_lookup=no fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi { echo "$as_me:$LINENO: result: $ac_cv_func__dyld_func_lookup" >&5 @@ -9932,7 +10628,7 @@ fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi @@ -10015,11 +10711,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 @@ -10028,7 +10740,7 @@ eval "$as_ac_var=no" fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi ac_res=`eval echo '${'$as_ac_var'}'` @@ -10115,7 +10827,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 @@ -10383,10 +11112,17 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -10491,10 +11227,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_type_error_t=yes else echo "$as_me: failed program was:" >&5 @@ -10594,11 +11347,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 @@ -10607,7 +11376,7 @@ eval "$as_ac_var=no" fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi ac_res=`eval echo '${'$as_ac_var'}'` @@ -10687,10 +11456,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 @@ -10726,10 +11512,17 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -10835,10 +11628,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 @@ -10874,10 +11684,17 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -10981,10 +11798,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 @@ -11020,10 +11854,17 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -11156,11 +11997,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 @@ -11169,7 +12026,7 @@ eval "$as_ac_var=no" fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi ac_res=`eval echo '${'$as_ac_var'}'` @@ -11251,11 +12108,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 @@ -11264,7 +12137,7 @@ eval "$as_ac_var=no" fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi ac_res=`eval echo '${'$as_ac_var'}'` @@ -11346,11 +12219,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 @@ -11359,7 +12248,7 @@ eval "$as_ac_var=no" fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi ac_res=`eval echo '${'$as_ac_var'}'` @@ -11441,20 +12330,36 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + eval "$as_ac_var=no" fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi ac_res=`eval echo '${'$as_ac_var'}'` @@ -11537,11 +12442,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 @@ -11550,7 +12471,7 @@ eval "$as_ac_var=no" fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi ac_res=`eval echo '${'$as_ac_var'}'` @@ -12050,7 +12971,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 12053 "configure"' > conftest.$ac_ext + echo '#line 12974 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -12174,11 +13095,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then lt_cv_cc_needs_belf=yes else echo "$as_me: failed program was:" >&5 @@ -12187,7 +13124,7 @@ lt_cv_cc_needs_belf=no fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -12282,10 +13219,17 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then : else echo "$as_me: failed program was:" >&5 @@ -12319,10 +13263,17 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then # Broken: success on invalid input. continue else @@ -12387,10 +13338,17 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then : else echo "$as_me: failed program was:" >&5 @@ -12424,10 +13382,17 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then # Broken: success on invalid input. continue else @@ -12468,7 +13433,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 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn + for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn 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 @@ -12486,7 +13451,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_F77="$ac_tool_prefix$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -12512,7 +13477,7 @@ fi if test -z "$F77"; then ac_ct_F77=$F77 - for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn + for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -12530,7 +13495,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_F77="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -12637,10 +13602,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_f77_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 @@ -12683,10 +13665,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_f77_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_prog_f77_g=yes else echo "$as_me: failed program was:" >&5 @@ -13141,7 +14140,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_AR="${ac_tool_prefix}ar" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -13181,7 +14180,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_AR="ar" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -13237,7 +14236,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -13277,7 +14276,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_RANLIB="ranlib" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -13333,7 +14332,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -13373,7 +14372,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_STRIP="strip" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -13665,10 +14664,6 @@ $rm conftest* -## CAVEAT EMPTOR: -## There is no encapsulation within the following macros, do not change -## the running order or otherwise move them around unless you know exactly -## what you are doing... lt_prog_compiler_no_builtin_flag= @@ -13694,11 +14689,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13697: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14692: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13701: \$? = $ac_status" >&5 + echo "$as_me:14696: \$? = $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 other than the usual output. @@ -13962,11 +14957,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13965: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14960: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13969: \$? = $ac_status" >&5 + echo "$as_me:14964: \$? = $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 other than the usual output. @@ -14066,11 +15061,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14069: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15064: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14073: \$? = $ac_status" >&5 + echo "$as_me:15068: \$? = $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 @@ -14546,11 +15541,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } }'` @@ -14564,7 +15575,7 @@ fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -14605,11 +15616,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } }'` @@ -14623,7 +15650,7 @@ fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -15871,11 +16898,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_lib_dl_dlopen=yes else echo "$as_me: failed program was:" >&5 @@ -15884,7 +16927,7 @@ ac_cv_lib_dl_dlopen=no fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi @@ -15966,11 +17009,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_func_shl_load=yes else echo "$as_me: failed program was:" >&5 @@ -15979,7 +17038,7 @@ ac_cv_func_shl_load=no fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi { echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 @@ -16029,11 +17088,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_lib_dld_shl_load=yes else echo "$as_me: failed program was:" >&5 @@ -16042,7 +17117,7 @@ ac_cv_lib_dld_shl_load=no fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi @@ -16114,11 +17189,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_func_dlopen=yes else echo "$as_me: failed program was:" >&5 @@ -16127,7 +17218,7 @@ ac_cv_func_dlopen=no fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi { echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 @@ -16177,11 +17268,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_lib_dl_dlopen=yes else echo "$as_me: failed program was:" >&5 @@ -16190,7 +17297,7 @@ ac_cv_lib_dl_dlopen=no fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi @@ -16241,11 +17348,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_lib_svld_dlopen=yes else echo "$as_me: failed program was:" >&5 @@ -16254,7 +17377,7 @@ ac_cv_lib_svld_dlopen=no fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi @@ -16305,11 +17428,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_lib_dld_dld_link=yes else echo "$as_me: failed program was:" >&5 @@ -16318,7 +17457,7 @@ ac_cv_lib_dld_dld_link=no fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi @@ -16374,7 +17513,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } }'` @@ -17579,7 +18734,7 @@ fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -17621,11 +18776,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } }'` @@ -17639,7 +18810,7 @@ fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -18377,10 +19548,6 @@ GCC_CXX="$GXX" LD_CXX="$LD" -## CAVEAT EMPTOR: -## There is no encapsulation within the following macros, do not change -## the running order or otherwise move them around unless you know exactly -## what you are doing... cat > conftest.$ac_ext <&5) + (eval echo "\"\$as_me:19984: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:18821: \$? = $ac_status" >&5 + echo "$as_me:19988: \$? = $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 other than the usual output. @@ -18918,11 +20085,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:18921: $lt_compile\"" >&5) + (eval echo "\"\$as_me:20088: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:18925: \$? = $ac_status" >&5 + echo "$as_me:20092: \$? = $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 @@ -20488,11 +21655,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:20491: $lt_compile\"" >&5) + (eval echo "\"\$as_me:21658: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:20495: \$? = $ac_status" >&5 + echo "$as_me:21662: \$? = $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 other than the usual output. @@ -20592,11 +21759,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:20595: $lt_compile\"" >&5) + (eval echo "\"\$as_me:21762: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:20599: \$? = $ac_status" >&5 + echo "$as_me:21766: \$? = $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 @@ -21062,11 +22229,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_f77_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } }'` @@ -21080,7 +22263,7 @@ fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -21111,11 +22294,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_f77_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } }'` @@ -21129,7 +22328,7 @@ fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -22770,10 +23969,6 @@ old_archive_cmds_GCJ=$old_archive_cmds -## CAVEAT EMPTOR: -## There is no encapsulation within the following macros, do not change -## the running order or otherwise move them around unless you know exactly -## what you are doing... lt_prog_compiler_no_builtin_flag_GCJ= @@ -22799,11 +23994,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:22802: $lt_compile\"" >&5) + (eval echo "\"\$as_me:23997: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:22806: \$? = $ac_status" >&5 + echo "$as_me:24001: \$? = $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 other than the usual output. @@ -23067,11 +24262,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:23070: $lt_compile\"" >&5) + (eval echo "\"\$as_me:24265: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:23074: \$? = $ac_status" >&5 + echo "$as_me:24269: \$? = $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 other than the usual output. @@ -23171,11 +24366,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:23174: $lt_compile\"" >&5) + (eval echo "\"\$as_me:24369: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:23178: \$? = $ac_status" >&5 + echo "$as_me:24373: \$? = $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 @@ -23651,11 +24846,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } }'` @@ -23669,7 +24880,7 @@ fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -23710,11 +24921,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } }'` @@ -23728,7 +24955,7 @@ fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -25868,7 +27095,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_LLVMGCC="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -25908,7 +27135,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_LLVMGXX="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -25992,10 +27219,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then : else echo "$as_me: failed program was:" >&5 @@ -26063,11 +27307,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_lib_elf_elf_begin=yes else echo "$as_me: failed program was:" >&5 @@ -26076,7 +27336,7 @@ ac_cv_lib_elf_elf_begin=no fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi @@ -26134,11 +27394,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_lib_m_sin=yes else echo "$as_me: failed program was:" >&5 @@ -26147,7 +27423,7 @@ ac_cv_lib_m_sin=no fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi @@ -26200,11 +27476,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_lib_imagehlp_main=yes else echo "$as_me: failed program was:" >&5 @@ -26213,7 +27505,7 @@ ac_cv_lib_imagehlp_main=no fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi @@ -26265,11 +27557,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_lib_psapi_main=yes else echo "$as_me: failed program was:" >&5 @@ -26278,7 +27586,7 @@ ac_cv_lib_psapi_main=no fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi @@ -26343,11 +27651,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_search_dlopen=$ac_res else echo "$as_me: failed program was:" >&5 @@ -26356,7 +27680,7 @@ fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext if test "${ac_cv_search_dlopen+set}" = set; then break @@ -26434,11 +27758,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_search_mallinfo=$ac_res else echo "$as_me: failed program was:" >&5 @@ -26447,7 +27787,7 @@ fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext if test "${ac_cv_search_mallinfo+set}" = set; then break @@ -26518,11 +27858,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_lib_pthread_pthread_mutex_init=yes else echo "$as_me: failed program was:" >&5 @@ -26531,7 +27887,7 @@ ac_cv_lib_pthread_pthread_mutex_init=no fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi @@ -26594,27 +27950,43 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_search_pthread_mutex_lock=$ac_res -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext - if test "${ac_cv_search_pthread_mutex_lock+set}" = set; then - break -fi -done -if test "${ac_cv_search_pthread_mutex_lock+set}" = set; then - : + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_search_pthread_mutex_lock=$ac_res +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if test "${ac_cv_search_pthread_mutex_lock+set}" = set; then + break +fi +done +if test "${ac_cv_search_pthread_mutex_lock+set}" = set; then + : else ac_cv_search_pthread_mutex_lock=no fi @@ -26688,11 +28060,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_lib_udis86_ud_init=yes else echo "$as_me: failed program was:" >&5 @@ -26701,7 +28089,7 @@ ac_cv_lib_udis86_ud_init=no fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi @@ -26778,10 +28166,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 @@ -26854,11 +28259,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_search_opendir=$ac_res else echo "$as_me: failed program was:" >&5 @@ -26867,7 +28288,7 @@ fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext if test "${ac_cv_search_opendir+set}" = set; then break @@ -26938,11 +28359,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_search_opendir=$ac_res else echo "$as_me: failed program was:" >&5 @@ -26951,7 +28388,7 @@ fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext if test "${ac_cv_search_opendir+set}" = set; then break @@ -27016,10 +28453,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_header_mmap_anon=yes else echo "$as_me: failed program was:" >&5 @@ -27062,48 +28516,38 @@ #include #if defined S_ISBLK && defined S_IFDIR -extern char c1[S_ISBLK (S_IFDIR) ? -1 : 1]; +# if S_ISBLK (S_IFDIR) +You lose. +# endif #endif #if defined S_ISBLK && defined S_IFCHR -extern char c2[S_ISBLK (S_IFCHR) ? -1 : 1]; +# if S_ISBLK (S_IFCHR) +You lose. +# endif #endif #if defined S_ISLNK && defined S_IFREG -extern char c3[S_ISLNK (S_IFREG) ? -1 : 1]; +# if S_ISLNK (S_IFREG) +You lose. +# endif #endif #if defined S_ISSOCK && defined S_IFREG -extern char c4[S_ISSOCK (S_IFREG) ? -1 : 1]; +# if S_ISSOCK (S_IFREG) +You lose. +# endif #endif _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_header_stat_broken=no +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "You lose" >/dev/null 2>&1; then + ac_cv_header_stat_broken=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_header_stat_broken=yes + ac_cv_header_stat_broken=no fi +rm -f conftest* -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi { echo "$as_me:$LINENO: result: $ac_cv_header_stat_broken" >&5 echo "${ECHO_T}$ac_cv_header_stat_broken" >&6; } @@ -27152,10 +28596,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 @@ -27332,10 +28793,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_header_sys_wait_h=yes else echo "$as_me: failed program was:" >&5 @@ -27393,10 +28871,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_header_time=yes else echo "$as_me: failed program was:" >&5 @@ -27462,10 +28957,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 @@ -27501,10 +29013,17 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -27612,10 +29131,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 @@ -27651,10 +29187,17 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -27757,10 +29300,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 @@ -27796,10 +29356,17 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -27905,10 +29472,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 @@ -27944,10 +29528,17 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -28052,10 +29643,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 @@ -28091,10 +29699,17 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -28198,10 +29813,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 @@ -28237,10 +29869,17 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -28429,10 +30068,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_type_pid_t=yes else echo "$as_me: failed program was:" >&5 @@ -28492,10 +30148,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_type_size_t=yes else echo "$as_me: failed program was:" >&5 @@ -28553,10 +30226,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_type_signal=int else echo "$as_me: failed program was:" >&5 @@ -28592,9 +30282,7 @@ int main () { -struct tm tm; - int *p = &tm.tm_sec; - return !p; +struct tm *tp; tp->tm_sec; ; return 0; } @@ -28612,10 +30300,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_struct_tm=time.h else echo "$as_me: failed program was:" >&5 @@ -28673,10 +30378,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_type_int64_t=yes else echo "$as_me: failed program was:" >&5 @@ -28739,10 +30461,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_type_uint64_t=yes else echo "$as_me: failed program was:" >&5 @@ -28800,10 +30539,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_type_u_int64_t=yes else echo "$as_me: failed program was:" >&5 @@ -28906,11 +30662,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 @@ -28919,7 +30691,7 @@ eval "$as_ac_var=no" fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi ac_res=`eval echo '${'$as_ac_var'}'` @@ -29003,11 +30775,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 @@ -29016,7 +30804,7 @@ eval "$as_ac_var=no" fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi ac_res=`eval echo '${'$as_ac_var'}'` @@ -29101,11 +30889,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 @@ -29114,7 +30918,7 @@ eval "$as_ac_var=no" fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi ac_res=`eval echo '${'$as_ac_var'}'` @@ -29197,11 +31001,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 @@ -29210,7 +31030,7 @@ eval "$as_ac_var=no" fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi ac_res=`eval echo '${'$as_ac_var'}'` @@ -29297,11 +31117,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 @@ -29310,7 +31146,7 @@ eval "$as_ac_var=no" fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi ac_res=`eval echo '${'$as_ac_var'}'` @@ -29394,11 +31230,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 @@ -29407,7 +31259,7 @@ eval "$as_ac_var=no" fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi ac_res=`eval echo '${'$as_ac_var'}'` @@ -29491,11 +31343,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 @@ -29504,7 +31372,7 @@ eval "$as_ac_var=no" fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi ac_res=`eval echo '${'$as_ac_var'}'` @@ -29648,11 +31516,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_working_alloca_h=yes else echo "$as_me: failed program was:" >&5 @@ -29661,7 +31545,7 @@ ac_cv_working_alloca_h=no fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi { echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5 @@ -29692,7 +31576,7 @@ # include # define alloca _alloca # else -# ifdef HAVE_ALLOCA_H +# if HAVE_ALLOCA_H # include # else # ifdef _AIX @@ -29728,11 +31612,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_func_alloca_works=yes else echo "$as_me: failed program was:" >&5 @@ -29741,7 +31641,7 @@ ac_cv_func_alloca_works=no fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi { echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5 @@ -29861,11 +31761,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 @@ -29874,7 +31790,7 @@ eval "$as_ac_var=no" fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi ac_res=`eval echo '${'$as_ac_var'}'` @@ -30011,10 +31927,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_func_rand48=yes else echo "$as_me: failed program was:" >&5 @@ -30082,10 +32015,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_cxx_namespaces=yes else echo "$as_me: failed program was:" >&5 @@ -30156,10 +32106,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_cxx_have_std_ext_hash_map=yes else echo "$as_me: failed program was:" >&5 @@ -30236,10 +32203,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_cxx_have_gnu_ext_hash_map=yes else echo "$as_me: failed program was:" >&5 @@ -30313,10 +32297,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_cxx_have_global_hash_map=yes else echo "$as_me: failed program was:" >&5 @@ -30393,10 +32394,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_cxx_have_std_ext_hash_set=yes else echo "$as_me: failed program was:" >&5 @@ -30473,10 +32491,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_cxx_have_gnu_ext_hash_set=yes else echo "$as_me: failed program was:" >&5 @@ -30550,10 +32585,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_cxx_have_global_hash_set=yes else echo "$as_me: failed program was:" >&5 @@ -30630,10 +32682,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_cxx_have_std_iterator=yes else echo "$as_me: failed program was:" >&5 @@ -30711,10 +32780,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_cxx_have_bi_iterator=yes else echo "$as_me: failed program was:" >&5 @@ -30792,10 +32878,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_cxx_have_fwd_iterator=yes else echo "$as_me: failed program was:" >&5 @@ -30870,10 +32973,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_func_isnan_in_math_h=yes else echo "$as_me: failed program was:" >&5 @@ -30941,10 +33061,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_func_isnan_in_cmath=yes else echo "$as_me: failed program was:" >&5 @@ -31011,10 +33148,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_func_std_isnan_in_cmath=yes else echo "$as_me: failed program was:" >&5 @@ -31082,10 +33236,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_func_isinf_in_math_h=yes else echo "$as_me: failed program was:" >&5 @@ -31152,10 +33323,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_func_isinf_in_cmath=yes else echo "$as_me: failed program was:" >&5 @@ -31222,10 +33410,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_func_std_isinf_in_cmath=yes else echo "$as_me: failed program was:" >&5 @@ -31292,10 +33497,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_func_finite_in_ieeefp_h=yes else echo "$as_me: failed program was:" >&5 @@ -31366,10 +33588,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 @@ -31405,10 +33644,17 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -31539,11 +33785,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 @@ -31552,7 +33814,7 @@ eval "$as_ac_var=no" fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi ac_res=`eval echo '${'$as_ac_var'}'` @@ -31609,21 +33871,21 @@ #include #include -#if !defined STDC_HEADERS && !defined HAVE_STDLIB_H +#if !STDC_HEADERS && !HAVE_STDLIB_H char *malloc (); #endif /* This mess was copied from the GNU getpagesize.h. */ -#ifndef HAVE_GETPAGESIZE +#if !HAVE_GETPAGESIZE /* Assume that all systems that can run configure have sys/param.h. */ -# ifndef HAVE_SYS_PARAM_H +# if !HAVE_SYS_PARAM_H # define HAVE_SYS_PARAM_H 1 # endif # ifdef _SC_PAGESIZE # define getpagesize() sysconf(_SC_PAGESIZE) # else /* no _SC_PAGESIZE */ -# ifdef HAVE_SYS_PARAM_H +# if HAVE_SYS_PARAM_H # include # ifdef EXEC_PAGESIZE # define getpagesize() EXEC_PAGESIZE @@ -31946,11 +34208,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 @@ -31959,7 +34237,7 @@ eval "$as_ac_var=no" fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi ac_res=`eval echo '${'$as_ac_var'}'` @@ -32209,10 +34487,27 @@ rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then llvm_cv_cxx_visibility_inlines_hidden=yes else echo "$as_me: failed program was:" >&5 @@ -32439,8 +34734,7 @@ ## M4sh Initialization. ## ## --------------------- ## -# Be more Bourne compatible -DUALCASE=1; export DUALCASE # for MKS sh +# Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: @@ -32449,13 +34743,10 @@ alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; -esac - + case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac fi - - +BIN_SH=xpg4; export BIN_SH # for Tru64 +DUALCASE=1; export DUALCASE # for MKS sh # PATH needs CR @@ -32679,28 +34970,19 @@ as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' +# Find out whether ``test -x'' works. Don't use a zero-byte file, as +# systems may use methods other than mode bits to determine executability. +cat >conf$$.file <<_ASEOF +#! /bin/sh +exit 0 +_ASEOF +chmod +x conf$$.file +if test -x conf$$.file >/dev/null 2>&1; then + as_executable_p="test -x" else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' + as_executable_p=: fi -as_executable_p=$as_test_x +rm -f conf$$.file # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -32716,7 +34998,7 @@ # values after options handling. ac_log=" This file was extended by llvm $as_me 2.5svn, which was -generated by GNU Autoconf 2.61. Invocation command line was +generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -32745,7 +35027,7 @@ Usage: $0 [OPTIONS] [FILE]... -h, --help print this help, then exit - -V, --version print version number and configuration settings, 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 @@ -32769,7 +35051,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ llvm config.status 2.5svn -configured by $0, generated by GNU Autoconf 2.61, +configured by $0, generated by GNU Autoconf 2.60, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" Copyright (C) 2006 Free Software Foundation, Inc. @@ -33055,8 +35337,8 @@ CXXFLAGS!$CXXFLAGS$ac_delim ac_ct_CXX!$ac_ct_CXX$ac_delim LEX!$LEX$ac_delim -LEX_OUTPUT_ROOT!$LEX_OUTPUT_ROOT$ac_delim LEXLIB!$LEXLIB$ac_delim +LEX_OUTPUT_ROOT!$LEX_OUTPUT_ROOT$ac_delim FLEX!$FLEX$ac_delim YACC!$YACC$ac_delim YFLAGS!$YFLAGS$ac_delim @@ -33692,12 +35974,7 @@ case $ac_arg in *\'*) ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac - ac_sub_configure_args="'$ac_arg' $ac_sub_configure_args" - - # Pass --silent - if test "$silent" = yes; then - ac_sub_configure_args="--silent $ac_sub_configure_args" - fi + ac_sub_configure_args="$ac_arg $ac_sub_configure_args" ac_popdir=`pwd` for ac_dir in : $subdirs; do test "x$ac_dir" = x: && continue From gordonhenriksen at mac.com Wed Oct 22 07:41:55 2008 From: gordonhenriksen at mac.com (Gordon Henriksen) Date: Wed, 22 Oct 2008 12:41:55 -0000 Subject: [llvm-commits] [llvm] r57976 - in /llvm/trunk/test/Bindings/Ocaml: analysis.ml bitreader.ml bitwriter.ml executionengine.ml scalar_opts.ml target.ml vmcore.ml Message-ID: <200810221241.m9MCftrs006884@zion.cs.uiuc.edu> Author: gordon Date: Wed Oct 22 07:41:54 2008 New Revision: 57976 URL: http://llvm.org/viewvc/llvm-project?rev=57976&view=rev Log: [PR2886] Ignore stderr from ocamlc since it prints unresolvable warnings on some platforms. Modified: llvm/trunk/test/Bindings/Ocaml/analysis.ml llvm/trunk/test/Bindings/Ocaml/bitreader.ml llvm/trunk/test/Bindings/Ocaml/bitwriter.ml llvm/trunk/test/Bindings/Ocaml/executionengine.ml llvm/trunk/test/Bindings/Ocaml/scalar_opts.ml llvm/trunk/test/Bindings/Ocaml/target.ml llvm/trunk/test/Bindings/Ocaml/vmcore.ml Modified: llvm/trunk/test/Bindings/Ocaml/analysis.ml URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Bindings/Ocaml/analysis.ml?rev=57976&r1=57975&r2=57976&view=diff ============================================================================== --- llvm/trunk/test/Bindings/Ocaml/analysis.ml (original) +++ llvm/trunk/test/Bindings/Ocaml/analysis.ml Wed Oct 22 07:41:54 2008 @@ -1,4 +1,4 @@ -(* RUN: %ocamlc -warn-error A llvm.cma llvm_analysis.cma %s -o %t +(* RUN: %ocamlc -warn-error A llvm.cma llvm_analysis.cma %s -o %t 2> /dev/null * RUN: ./%t %t.bc *) Modified: llvm/trunk/test/Bindings/Ocaml/bitreader.ml URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Bindings/Ocaml/bitreader.ml?rev=57976&r1=57975&r2=57976&view=diff ============================================================================== --- llvm/trunk/test/Bindings/Ocaml/bitreader.ml (original) +++ llvm/trunk/test/Bindings/Ocaml/bitreader.ml Wed Oct 22 07:41:54 2008 @@ -1,4 +1,4 @@ -(* RUN: %ocamlc -warn-error A llvm.cma llvm_bitreader.cma llvm_bitwriter.cma %s -o %t +(* RUN: %ocamlc -warn-error A llvm.cma llvm_bitreader.cma llvm_bitwriter.cma %s -o %t 2> /dev/null * RUN: ./%t %t.bc * RUN: llvm-dis < %t.bc | grep caml_int_ty *) Modified: llvm/trunk/test/Bindings/Ocaml/bitwriter.ml URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Bindings/Ocaml/bitwriter.ml?rev=57976&r1=57975&r2=57976&view=diff ============================================================================== --- llvm/trunk/test/Bindings/Ocaml/bitwriter.ml (original) +++ llvm/trunk/test/Bindings/Ocaml/bitwriter.ml Wed Oct 22 07:41:54 2008 @@ -1,4 +1,4 @@ -(* RUN: %ocamlc -warn-error A llvm.cma llvm_bitwriter.cma %s -o %t +(* RUN: %ocamlc -warn-error A llvm.cma llvm_bitwriter.cma %s -o %t 2> /dev/null * RUN: ./%t %t.bc * RUN: llvm-dis < %t.bc | grep caml_int_ty *) Modified: llvm/trunk/test/Bindings/Ocaml/executionengine.ml URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Bindings/Ocaml/executionengine.ml?rev=57976&r1=57975&r2=57976&view=diff ============================================================================== --- llvm/trunk/test/Bindings/Ocaml/executionengine.ml (original) +++ llvm/trunk/test/Bindings/Ocaml/executionengine.ml Wed Oct 22 07:41:54 2008 @@ -1,4 +1,4 @@ -(* RUN: %ocamlc -warn-error A llvm.cma llvm_target.cma llvm_executionengine.cma %s -o %t +(* RUN: %ocamlc -warn-error A llvm.cma llvm_target.cma llvm_executionengine.cma %s -o %t 2> /dev/null * RUN: ./%t %t.bc *) Modified: llvm/trunk/test/Bindings/Ocaml/scalar_opts.ml URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Bindings/Ocaml/scalar_opts.ml?rev=57976&r1=57975&r2=57976&view=diff ============================================================================== --- llvm/trunk/test/Bindings/Ocaml/scalar_opts.ml (original) +++ llvm/trunk/test/Bindings/Ocaml/scalar_opts.ml Wed Oct 22 07:41:54 2008 @@ -1,4 +1,4 @@ -(* RUN: %ocamlc -warn-error A llvm.cma llvm_scalar_opts.cma llvm_target.cma %s -o %t +(* RUN: %ocamlc -warn-error A llvm.cma llvm_scalar_opts.cma llvm_target.cma %s -o %t 2> /dev/null *) (* Note: It takes several seconds for ocamlc to link an executable with Modified: llvm/trunk/test/Bindings/Ocaml/target.ml URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Bindings/Ocaml/target.ml?rev=57976&r1=57975&r2=57976&view=diff ============================================================================== --- llvm/trunk/test/Bindings/Ocaml/target.ml (original) +++ llvm/trunk/test/Bindings/Ocaml/target.ml Wed Oct 22 07:41:54 2008 @@ -1,4 +1,4 @@ -(* RUN: %ocamlc -warn-error A llvm.cma llvm_target.cma %s -o %t +(* RUN: %ocamlc -warn-error A llvm.cma llvm_target.cma %s -o %t 2> /dev/null *) (* Note: It takes several seconds for ocamlc to link an executable with Modified: llvm/trunk/test/Bindings/Ocaml/vmcore.ml URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Bindings/Ocaml/vmcore.ml?rev=57976&r1=57975&r2=57976&view=diff ============================================================================== --- llvm/trunk/test/Bindings/Ocaml/vmcore.ml (original) +++ llvm/trunk/test/Bindings/Ocaml/vmcore.ml Wed Oct 22 07:41:54 2008 @@ -1,4 +1,4 @@ -(* RUN: %ocamlc -warn-error A llvm.cma llvm_analysis.cma llvm_bitwriter.cma %s -o %t +(* RUN: %ocamlc -warn-error A llvm.cma llvm_analysis.cma llvm_bitwriter.cma %s -o %t 2> /dev/null * RUN: ./%t %t.bc * RUN: llvm-dis < %t.bc > %t.ll *) From alenhar2 at cs.uiuc.edu Wed Oct 22 11:13:28 2008 From: alenhar2 at cs.uiuc.edu (Andrew Lenharth) Date: Wed, 22 Oct 2008 16:13:28 -0000 Subject: [llvm-commits] [poolalloc] r57982 - /poolalloc/trunk/lib/DSA/StdLibPass.cpp Message-ID: <200810221613.m9MGDS9E014912@zion.cs.uiuc.edu> Author: alenhar2 Date: Wed Oct 22 11:13:27 2008 New Revision: 57982 URL: http://llvm.org/viewvc/llvm-project?rev=57982&view=rev Log: some additional stdlib funcs Modified: poolalloc/trunk/lib/DSA/StdLibPass.cpp Modified: poolalloc/trunk/lib/DSA/StdLibPass.cpp URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/DSA/StdLibPass.cpp?rev=57982&r1=57981&r2=57982&view=diff ============================================================================== --- poolalloc/trunk/lib/DSA/StdLibPass.cpp (original) +++ poolalloc/trunk/lib/DSA/StdLibPass.cpp Wed Oct 22 11:13:27 2008 @@ -89,6 +89,7 @@ {"atoll", {NRET_YARGS, NRET_NARGS, NRET_NARGS, false, false, false}}, {"atoq", {NRET_YARGS, NRET_NARGS, NRET_NARGS, false, false, false}}, + {"memcmp", {NRET_YARGS, NRET_NARGS, NRET_NARGS, false, false, false}}, {"strcmp", {NRET_YARGS, NRET_NARGS, NRET_NARGS, false, false, false}}, {"wcscmp", {NRET_YARGS, NRET_NARGS, NRET_NARGS, false, false, false}}, {"strncmp", {NRET_YARGS, NRET_NARGS, NRET_NARGS, false, false, false}}, @@ -111,13 +112,22 @@ {"strcat", {YRET_YARGS, YRET_YARGS, NRET_NARGS, true, true, true}}, {"strncat", {YRET_YARGS, YRET_YARGS, NRET_NARGS, true, true, true}}, + {"strcpy", {YRET_YARGS, YRET_YARGS, NRET_NARGS, true, true, true}}, + {"wcscpy", {YRET_YARGS, YRET_YARGS, NRET_NARGS, true, true, true}}, + {"strcpy", {YRET_YARGS, YRET_YARGS, NRET_NARGS, true, true, true}}, + {"wcsncpy", {YRET_YARGS, YRET_YARGS, NRET_NARGS, true, true, true}}, + {"fwrite", {NRET_YARGS, NRET_NYARGS, NRET_NARGS, false, false, false}}, {"fread", {NRET_NYARGS, NRET_YARGS, NRET_NARGS, false, false, false}}, {"fflush", {NRET_YARGS, NRET_YARGS, NRET_NARGS, false, false, false}}, {"fclose", {NRET_YARGS, NRET_YARGS, NRET_NARGS, false, false, false}}, {"fopen", {NRET_YARGS, YRET_NARGS, YRET_NARGS, false, false, false}}, - + {"fileno", {NRET_YARGS, NRET_NARGS, NRET_NARGS, false, false, false}}, + {"unlink", {NRET_YARGS, NRET_NARGS, NRET_NARGS, false, false, false}}, + + {"perror", {NRET_YARGS, NRET_NARGS, NRET_NARGS, false, false, false}}, + #if 0 {"remove", {false, false, false, true, false, false, false, false, false}}, {"unlink", {false, false, false, true, false, false, false, false, false}}, From alenhar2 at cs.uiuc.edu Wed Oct 22 11:13:58 2008 From: alenhar2 at cs.uiuc.edu (Andrew Lenharth) Date: Wed, 22 Oct 2008 16:13:58 -0000 Subject: [llvm-commits] [poolalloc] r57983 - /poolalloc/trunk/lib/DSA/Local.cpp Message-ID: <200810221613.m9MGDxls014939@zion.cs.uiuc.edu> Author: alenhar2 Date: Wed Oct 22 11:13:58 2008 New Revision: 57983 URL: http://llvm.org/viewvc/llvm-project?rev=57983&view=rev Log: It really helps if ALL the fields of globals are added to the globals graph Modified: poolalloc/trunk/lib/DSA/Local.cpp Modified: poolalloc/trunk/lib/DSA/Local.cpp URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/DSA/Local.cpp?rev=57983&r1=57982&r2=57983&view=diff ============================================================================== --- poolalloc/trunk/lib/DSA/Local.cpp (original) +++ poolalloc/trunk/lib/DSA/Local.cpp Wed Oct 22 11:13:58 2008 @@ -271,11 +271,14 @@ } void GraphBuilder::visitSelectInst(SelectInst &SI) { - if (!isa(SI.getType())) return; // Only pointer Selects + if (!isa(SI.getType())) + return; // Only pointer Selects DSNodeHandle &Dest = G.getNodeForValue(&SI); - Dest.mergeWith(getValueDest(*SI.getOperand(1))); - Dest.mergeWith(getValueDest(*SI.getOperand(2))); + DSNodeHandle S1 = getValueDest(*SI.getOperand(1)); + DSNodeHandle S2 = getValueDest(*SI.getOperand(2)); + Dest.mergeWith(S1); + Dest.mergeWith(S2); } void GraphBuilder::visitLoadInst(LoadInst &LI) { @@ -700,13 +703,14 @@ DSNode *NHN = NH.getNode(); NHN->mergeTypeInfo(Ty, NH.getOffset()); - if (Ty->isFirstClassType()) { - if (isa(Ty)) - // Avoid adding edges from null, or processing non-"pointer" stores - NH.addEdgeTo(getValueDest(*C)); + if (isa(Ty)) { + // Avoid adding edges from null, or processing non-"pointer" stores + NH.addEdgeTo(getValueDest(*C)); return; } + if (Ty->isIntOrIntVector() || Ty->isFPOrFPVector()) return; + const TargetData &TD = NH.getNode()->getTargetData(); if (ConstantArray *CA = dyn_cast(C)) { From jlerouge at apple.com Wed Oct 22 11:30:41 2008 From: jlerouge at apple.com (Julien Lerouge) Date: Wed, 22 Oct 2008 16:30:41 -0000 Subject: [llvm-commits] [llvm] r57984 - /llvm/trunk/lib/Support/PluginLoader.cpp Message-ID: <200810221630.m9MGUflI015478@zion.cs.uiuc.edu> Author: jlerouge Date: Wed Oct 22 11:30:41 2008 New Revision: 57984 URL: http://llvm.org/viewvc/llvm-project?rev=57984&view=rev Log: Fix for PR2881: fix a small leak exposed by valgrind, using a ManagedStatic. Modified: llvm/trunk/lib/Support/PluginLoader.cpp Modified: llvm/trunk/lib/Support/PluginLoader.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/PluginLoader.cpp?rev=57984&r1=57983&r2=57984&view=diff ============================================================================== --- llvm/trunk/lib/Support/PluginLoader.cpp (original) +++ llvm/trunk/lib/Support/PluginLoader.cpp Wed Oct 22 11:30:41 2008 @@ -12,6 +12,7 @@ //===----------------------------------------------------------------------===// #define DONT_GET_PLUGIN_LOADER_OPTION +#include "llvm/Support/ManagedStatic.h" #include "llvm/Support/PluginLoader.h" #include "llvm/Support/Streams.h" #include "llvm/System/DynamicLibrary.h" @@ -19,12 +20,9 @@ #include using namespace llvm; -static std::vector *Plugins; +static ManagedStatic > Plugins; void PluginLoader::operator=(const std::string &Filename) { - if (!Plugins) - Plugins = new std::vector(); - std::string Error; if (sys::DynamicLibrary::LoadLibraryPermanently(Filename.c_str(), &Error)) { cerr << "Error opening '" << Filename << "': " << Error @@ -35,10 +33,11 @@ } unsigned PluginLoader::getNumPlugins() { - return Plugins ? Plugins->size() : 0; + return Plugins.isConstructed() ? Plugins->size() : 0; } std::string &PluginLoader::getPlugin(unsigned num) { - assert(Plugins && num < Plugins->size() && "Asking for an out of bounds plugin"); + assert(Plugins.isConstructed() && num < Plugins->size() && + "Asking for an out of bounds plugin"); return (*Plugins)[num]; } From alenhar2 at cs.uiuc.edu Wed Oct 22 11:38:54 2008 From: alenhar2 at cs.uiuc.edu (Andrew Lenharth) Date: Wed, 22 Oct 2008 16:38:54 -0000 Subject: [llvm-commits] [poolalloc] r57985 - /poolalloc/trunk/lib/DSA/BottomUpClosure.cpp Message-ID: <200810221638.m9MGcsmB015714@zion.cs.uiuc.edu> Author: alenhar2 Date: Wed Oct 22 11:38:54 2008 New Revision: 57985 URL: http://llvm.org/viewvc/llvm-project?rev=57985&view=rev Log: fix infinate loop Modified: poolalloc/trunk/lib/DSA/BottomUpClosure.cpp Modified: poolalloc/trunk/lib/DSA/BottomUpClosure.cpp URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/DSA/BottomUpClosure.cpp?rev=57985&r1=57984&r2=57985&view=diff ============================================================================== --- poolalloc/trunk/lib/DSA/BottomUpClosure.cpp (original) +++ poolalloc/trunk/lib/DSA/BottomUpClosure.cpp Wed Oct 22 11:38:54 2008 @@ -574,7 +574,12 @@ } void BUDataStructures::inlineUnresolved(DSGraph* Graph) { - for (DSGraph::afc_iterator aii = Graph->afc_begin(), aee = Graph->afc_end(); + + // Move our call site list into TempFCs so that inline call sites go into the + // new call site list and doesn't invalidate our iterators! + std::list TempFCs = Graph->getAuxFunctionCalls(); + + for (DSGraph::afc_iterator aii = TempFCs.begin(), aee = TempFCs.end(); aii != aee; ++aii) { std::vector CalledFuncs; DSCallSite CS = *aii; @@ -673,11 +678,12 @@ GI = IndCallGraph.first; // Merge the unified graph into this graph now. - DOUT << " Inlining multi callee graph " - << "[" << GI->getGraphSize() << "+" - << GI->getAuxFunctionCalls().size() << "] into '" - << Graph->getFunctionNames() << "' [" << Graph->getGraphSize() <<"+" - << Graph->getAuxFunctionCalls().size() << "]\n"; + DEBUG( + DOUT << " Inlining multi callee graph " + << "[" << GI->getGraphSize() << "+" + << GI->getAuxFunctionCalls().size() << "] into '" + << Graph->getFunctionNames() << "' [" << Graph->getGraphSize() <<"+" + << Graph->getAuxFunctionCalls().size() << "]\n"; ); Graph->mergeInGraph(CS, IndCallGraph.second, *GI, DSGraph::StripAllocaBit | From criswell at uiuc.edu Wed Oct 22 11:43:08 2008 From: criswell at uiuc.edu (John Criswell) Date: Wed, 22 Oct 2008 16:43:08 -0000 Subject: [llvm-commits] [poolalloc] r57986 - /poolalloc/trunk/lib/DSA/CallTargets.cpp Message-ID: <200810221643.m9MGh8hx015879@zion.cs.uiuc.edu> Author: criswell Date: Wed Oct 22 11:43:08 2008 New Revision: 57986 URL: http://llvm.org/viewvc/llvm-project?rev=57986&view=rev Log: Make CallTargets use Equivalence Call Top-Down DSA instead of regular Top-Down DSA. This prevents it from invalidating EQ-TD, which, in turn, makes SAFECode a lot happier. Note that we lose some precision with this change. Modified: poolalloc/trunk/lib/DSA/CallTargets.cpp Modified: poolalloc/trunk/lib/DSA/CallTargets.cpp URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/DSA/CallTargets.cpp?rev=57986&r1=57985&r2=57986&view=diff ============================================================================== --- poolalloc/trunk/lib/DSA/CallTargets.cpp (original) +++ poolalloc/trunk/lib/DSA/CallTargets.cpp Wed Oct 22 11:43:08 2008 @@ -42,7 +42,7 @@ void CallTargetFinder::findIndTargets(Module &M) { - TDDataStructures* T = &getAnalysis(); + EQTDDataStructures* T = &getAnalysis(); for (Module::iterator I = M.begin(), E = M.end(); I != E; ++I) if (!I->isDeclaration()) for (Function::iterator F = I->begin(), FE = I->end(); F != FE; ++F) @@ -106,7 +106,7 @@ void CallTargetFinder::getAnalysisUsage(AnalysisUsage &AU) const { AU.setPreservesAll(); - AU.addRequired(); + AU.addRequired(); } std::vector::iterator CallTargetFinder::begin(CallSite cs) { From clattner at apple.com Wed Oct 22 12:23:22 2008 From: clattner at apple.com (Chris Lattner) Date: Wed, 22 Oct 2008 10:23:22 -0700 Subject: [llvm-commits] [llvm] r57925 - in /llvm/trunk: lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp test/CodeGen/X86/pr2924.ll In-Reply-To: <7aa9f8a40810220115v487c513ci764df9b5b5fcb947@mail.gmail.com> References: <200810212000.m9LK0h2U028185@zion.cs.uiuc.edu> <7aa9f8a40810220115v487c513ci764df9b5b5fcb947@mail.gmail.com> Message-ID: <5DC7C5AE-B73C-4A03-8AEF-7141F5F71425@apple.com> On Oct 22, 2008, at 1:15 AM, Tomas Lindquist Olsen wrote: > On Tue, Oct 21, 2008 at 10:00 PM, Dan Gohman wrote: > Author: djg > Date: Tue Oct 21 15:00:42 2008 > New Revision: 57925 > > URL: http://llvm.org/viewvc/llvm-project?rev=57925&view=rev > Log: > Fix SelectionDAGBuild lowering of Select instructions to > handle first-class aggregate values. Also, fix a bug in > the Ret handling for empty aggregates. > > Added: > llvm/trunk/test/CodeGen/X86/pr2924.ll > Modified: > llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp > > > Any chance this will make it into the 2.4 branch ? If you have an example of C code that worked with llvm-gcc in 2.3 but that fails with llvm-gcc in 2.4, then it would be a regression and yes we would want to pull it in. Otherwise unfortunately we shouldn't pull it in. -Chris -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20081022/bacbb974/attachment.html From dalej at apple.com Wed Oct 22 12:26:07 2008 From: dalej at apple.com (Dale Johannesen) Date: Wed, 22 Oct 2008 17:26:07 -0000 Subject: [llvm-commits] [llvm] r57987 - /llvm/trunk/lib/Target/X86/X86ISelLowering.cpp Message-ID: <200810221726.m9MHQ7Ao017284@zion.cs.uiuc.edu> Author: johannes Date: Wed Oct 22 12:26:06 2008 New Revision: 57987 URL: http://llvm.org/viewvc/llvm-project?rev=57987&view=rev Log: Remove allocation of unused stack slot. Modified: llvm/trunk/lib/Target/X86/X86ISelLowering.cpp Modified: llvm/trunk/lib/Target/X86/X86ISelLowering.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86ISelLowering.cpp?rev=57987&r1=57986&r2=57987&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/X86ISelLowering.cpp (original) +++ llvm/trunk/lib/Target/X86/X86ISelLowering.cpp Wed Oct 22 12:26:06 2008 @@ -4731,12 +4731,6 @@ } */ - // Get a XMM-vector-sized stack slot. - unsigned Size = 128/8; - MachineFunction &MF = DAG.getMachineFunction(); - int SSFI = MF.getFrameInfo()->CreateStackObject(Size, Size); - SDValue StackSlot = DAG.getFrameIndex(SSFI, getPointerTy()); - // Build some magic constants. std::vectorCV0; CV0.push_back(ConstantInt::get(APInt(32, 0x45300000))); From daniel at zuster.org Wed Oct 22 12:39:14 2008 From: daniel at zuster.org (Daniel Dunbar) Date: Wed, 22 Oct 2008 17:39:14 -0000 Subject: [llvm-commits] [llvm] r57989 - in /llvm/trunk: include/llvm/Bitcode/ReaderWriter.h lib/Bitcode/Writer/BitcodeWriter.cpp lib/Bitcode/Writer/BitcodeWriterPass.cpp Message-ID: <200810221739.m9MHdE2d017690@zion.cs.uiuc.edu> Author: ddunbar Date: Wed Oct 22 12:39:14 2008 New Revision: 57989 URL: http://llvm.org/viewvc/llvm-project?rev=57989&view=rev Log: Add raw_ostream versions of WriteBitcodeToFile and BitcodeWriterPass. - The old versions are still hanging around, but should be migrated away from. Modified: llvm/trunk/include/llvm/Bitcode/ReaderWriter.h llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp llvm/trunk/lib/Bitcode/Writer/BitcodeWriterPass.cpp Modified: llvm/trunk/include/llvm/Bitcode/ReaderWriter.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Bitcode/ReaderWriter.h?rev=57989&r1=57988&r2=57989&view=diff ============================================================================== --- llvm/trunk/include/llvm/Bitcode/ReaderWriter.h (original) +++ llvm/trunk/include/llvm/Bitcode/ReaderWriter.h Wed Oct 22 12:39:14 2008 @@ -22,6 +22,7 @@ class ModuleProvider; class MemoryBuffer; class ModulePass; + class raw_ostream; /// getBitcodeModuleProvider - Read the header of the specified bitcode buffer /// and prepare for lazy deserialization of function bodies. If successful, @@ -40,9 +41,17 @@ /// stream. void WriteBitcodeToFile(const Module *M, std::ostream &Out); + /// WriteBitcodeToFile - Write the specified module to the specified + /// raw output stream. + void WriteBitcodeToFile(const Module *M, raw_ostream &Out); + /// CreateBitcodeWriterPass - Create and return a pass that writes the module /// to the specified ostream. ModulePass *CreateBitcodeWriterPass(std::ostream &Str); + + /// createBitcodeWriterPass - Create and return a pass that writes the module + /// to the specified ostream. + ModulePass *createBitcodeWriterPass(raw_ostream &Str); } // End llvm namespace #endif Modified: llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp?rev=57989&r1=57988&r2=57989&view=diff ============================================================================== --- llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp (original) +++ llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp Wed Oct 22 12:39:14 2008 @@ -24,6 +24,7 @@ #include "llvm/ValueSymbolTable.h" #include "llvm/Support/MathExtras.h" #include "llvm/Support/Streams.h" +#include "llvm/Support/raw_ostream.h" #include "llvm/System/Program.h" using namespace llvm; @@ -1330,6 +1331,13 @@ /// WriteBitcodeToFile - Write the specified module to the specified output /// stream. void llvm::WriteBitcodeToFile(const Module *M, std::ostream &Out) { + raw_os_ostream RawOut(Out); + WriteBitcodeToFile(M, RawOut); +} + +/// WriteBitcodeToFile - Write the specified module to the specified output +/// stream. +void llvm::WriteBitcodeToFile(const Module *M, raw_ostream &Out) { std::vector Buffer; BitstreamWriter Stream(Buffer); @@ -1356,7 +1364,7 @@ // If writing to stdout, set binary mode. - if (llvm::cout == Out) + if (&llvm::outs() == &Out) sys::Program::ChangeStdoutToBinary(); // Write the generated bitstream to "Out". Modified: llvm/trunk/lib/Bitcode/Writer/BitcodeWriterPass.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/Writer/BitcodeWriterPass.cpp?rev=57989&r1=57988&r2=57989&view=diff ============================================================================== --- llvm/trunk/lib/Bitcode/Writer/BitcodeWriterPass.cpp (original) +++ llvm/trunk/lib/Bitcode/Writer/BitcodeWriterPass.cpp Wed Oct 22 12:39:14 2008 @@ -17,16 +17,24 @@ namespace { class WriteBitcodePass : public ModulePass { - std::ostream &Out; // ostream to print on + // FIXME: Kill off std::ostream + std::ostream *Out; + raw_ostream *RawOut; // raw_ostream to print on public: - static char ID; // Pass identifcation, replacement for typeid + static char ID; // Pass identification, replacement for typeid explicit WriteBitcodePass(std::ostream &o) - : ModulePass(&ID), Out(o) {} + : ModulePass(&ID), Out(&o), RawOut(0) {} + explicit WriteBitcodePass(raw_ostream &o) + : ModulePass(&ID), Out(0), RawOut(&o) {} const char *getPassName() const { return "Bitcode Writer"; } bool runOnModule(Module &M) { - WriteBitcodeToFile(&M, Out); + if (Out) { + WriteBitcodeToFile(&M, *Out); + } else { + WriteBitcodeToFile(&M, *RawOut); + } return false; } }; @@ -41,3 +49,8 @@ } +/// createBitcodeWriterPass - Create and return a pass that writes the module +/// to the specified ostream. +ModulePass *llvm::createBitcodeWriterPass(raw_ostream &Str) { + return new WriteBitcodePass(Str); +} From tomas.l.olsen at gmail.com Wed Oct 22 12:40:07 2008 From: tomas.l.olsen at gmail.com (Tomas Lindquist Olsen) Date: Wed, 22 Oct 2008 19:40:07 +0200 Subject: [llvm-commits] [llvm] r57925 - in /llvm/trunk: lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp test/CodeGen/X86/pr2924.ll In-Reply-To: <5DC7C5AE-B73C-4A03-8AEF-7141F5F71425@apple.com> References: <200810212000.m9LK0h2U028185@zion.cs.uiuc.edu> <7aa9f8a40810220115v487c513ci764df9b5b5fcb947@mail.gmail.com> <5DC7C5AE-B73C-4A03-8AEF-7141F5F71425@apple.com> Message-ID: <7aa9f8a40810221040le686004ja4e70227fb503495@mail.gmail.com> On Wed, Oct 22, 2008 at 7:23 PM, Chris Lattner wrote: > > On Oct 22, 2008, at 1:15 AM, Tomas Lindquist Olsen wrote: > > On Tue, Oct 21, 2008 at 10:00 PM, Dan Gohman wrote: > >> Author: djg >> Date: Tue Oct 21 15:00:42 2008 >> New Revision: 57925 >> >> URL: http://llvm.org/viewvc/llvm-project?rev=57925&view=rev >> Log: >> Fix SelectionDAGBuild lowering of Select instructions to >> handle first-class aggregate values. Also, fix a bug in >> the Ret handling for empty aggregates. >> >> Added: >> llvm/trunk/test/CodeGen/X86/pr2924.ll >> Modified: >> llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp >> >> > Any chance this will make it into the 2.4 branch ? > > > If you have an example of C code that worked with llvm-gcc in 2.3 but that > fails with llvm-gcc in 2.4, then it would be a regression and yes we would > want to pull it in. Otherwise unfortunately we shouldn't pull it in. > > -Chris > > _______________________________________________ > llvm-commits mailing list > llvm-commits at cs.uiuc.edu > http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits > > Ok :( I don't have llvm-gcc, this code is generated by my D compiler. Using first class aggregates only started working after this fix (at least when doing optimizations, which is what produces the select inst) Sounds like we won't be able to support the 2.4 release. Oh well... If I do find some time for it, what kind of C/C++ code would I write to generate something that produces first class aggregates ? -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20081022/2b7a9761/attachment.html From baldrick at free.fr Wed Oct 22 13:14:34 2008 From: baldrick at free.fr (Duncan Sands) Date: Wed, 22 Oct 2008 18:14:34 -0000 Subject: [llvm-commits] [llvm-gcc-4.2] r57992 - /llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp Message-ID: <200810221814.m9MIEY6K018726@zion.cs.uiuc.edu> Author: baldrick Date: Wed Oct 22 13:14:32 2008 New Revision: 57992 URL: http://llvm.org/viewvc/llvm-project?rev=57992&view=rev Log: Prevent tramp3d-v4 from crashing llvm-gcc on x86-64 linux. It might be better to teach the struct type convertor to always create an LLVM field that starts at the same byte as each gcc field. However this fix is less risky, since it only kicks in when llvm-gcc would otherwise have crashed. Modified: llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp Modified: llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp?rev=57992&r1=57991&r2=57992&view=diff ============================================================================== --- llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp (original) +++ llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp Wed Oct 22 13:14:32 2008 @@ -6017,7 +6017,39 @@ const StructLayout *SL = TD.getStructLayout(cast(StructTy)); BitStart -= SL->getElementOffset(MemberIndex) * 8; } - + + // Type conversion does not ensure that there is always an LLVM field + // starting at the same byte as the gcc field. Correct for this now. + // An example of how this can occur is: + // Field A: offset 0, length 1 + // Field B: offset 4, length 4 (4 byte alignment) + // Field C: offset 6 + // Since field C overlaps field B, we delete field B and replace it with + // padding: + // LLVM A: offset 0, length 1 + // LLVM B: offset 1, length 5 (1 byte alignment) - padding array + // LLVM C: offset 6 + // A COMPONENT_REF for gcc field B will get LLVM field B which has + // offset 1 not 4. + unsigned ByteStart = BitStart/8; + if (ByteStart && !isBitfield(FieldDecl)) { + const Type *ContainingType = + cast(StructTy)->getTypeAtIndex(MemberIndex); + Value *Offset = ConstantInt::get(TD.getIntPtrType(), ByteStart); + + const ArrayType *ATy = dyn_cast(ContainingType); + if (ATy && ATy->getElementType() == Type::Int8Ty) { + // Only known case: the LLVM field is an array of bytes. + FieldPtr = Builder.CreateGEP(FieldPtr, Offset); + } else { + // Do pointer arithmetic. + FieldPtr = Builder.CreatePtrToInt(FieldPtr, Offset->getType()); + FieldPtr = Builder.CreateAdd(FieldPtr, Offset); + FieldPtr = Builder.CreateIntToPtr(FieldPtr, + PointerType::getUnqual(Type::Int8Ty)); + } + BitStart -= ByteStart * 8; + } } else { Value *Offset = Emit(field_offset, 0); From dpatel at apple.com Wed Oct 22 13:27:01 2008 From: dpatel at apple.com (Devang Patel) Date: Wed, 22 Oct 2008 11:27:01 -0700 Subject: [llvm-commits] [llvm-gcc-4.2] r57992 - /llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp In-Reply-To: <200810221814.m9MIEY6K018726@zion.cs.uiuc.edu> References: <200810221814.m9MIEY6K018726@zion.cs.uiuc.edu> Message-ID: <6F553805-9B78-4D82-8C2C-CD02631C586C@apple.com> On Oct 22, 2008, at 11:14 AM, Duncan Sands wrote: > + // Type conversion does not ensure that there is always an LLVM > field > + // starting at the same byte as the gcc field. Correct for > this now. > + // An example of how this can occur is: > + // Field A: offset 0, length 1 > + // Field B: offset 4, length 4 (4 byte alignment) > + // Field C: offset 6 > + // Since field C overlaps field B, we delete field B and > replace it with > + // padding: > + // LLVM A: offset 0, length 1 > + // LLVM B: offset 1, length 5 (1 byte alignment) - padding > array > + // LLVM C: offset 6 So, in this case "Field B" will be represented by 3rd llvm field ? If so then is it 4 byte aligned ? > > + // A COMPONENT_REF for gcc field B will get LLVM field B which > has > + // offset 1 not 4. - Devang From jlerouge at apple.com Wed Oct 22 13:47:14 2008 From: jlerouge at apple.com (Julien Lerouge) Date: Wed, 22 Oct 2008 18:47:14 -0000 Subject: [llvm-commits] [test-suite] r57994 - /test-suite/trunk/MultiSource/Benchmarks/MallocBench/gs/Makefile Message-ID: <200810221847.m9MIlEdY020310@zion.cs.uiuc.edu> Author: jlerouge Date: Wed Oct 22 13:47:14 2008 New Revision: 57994 URL: http://llvm.org/viewvc/llvm-project?rev=57994&view=rev Log: Make this test work if objdir != srcdir. Modified: test-suite/trunk/MultiSource/Benchmarks/MallocBench/gs/Makefile Modified: test-suite/trunk/MultiSource/Benchmarks/MallocBench/gs/Makefile URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/MallocBench/gs/Makefile?rev=57994&r1=57993&r2=57994&view=diff ============================================================================== --- test-suite/trunk/MultiSource/Benchmarks/MallocBench/gs/Makefile (original) +++ test-suite/trunk/MultiSource/Benchmarks/MallocBench/gs/Makefile Wed Oct 22 13:47:14 2008 @@ -2,7 +2,8 @@ PROG = gs LIBS += -lm LDFLAGS += -lm -CPPFLAGS += -DNOMEMOPT -DGS_LIB_DEFAULT=\"$(shell pwd):$(shell pwd)/fonts\" +CPPFLAGS += -DNOMEMOPT \ + -DGS_LIB_DEFAULT=\"$(PROJ_SRC_DIR):$(PROJ_SRC_DIR)/fonts\" # # This is to work around a bug where having a function prototype that is From kremenek at apple.com Wed Oct 22 15:56:22 2008 From: kremenek at apple.com (Ted Kremenek) Date: Wed, 22 Oct 2008 20:56:22 -0000 Subject: [llvm-commits] [llvm] r57998 - /llvm/tags/checker/checker-115/ Message-ID: <200810222056.m9MKuMDN024121@zion.cs.uiuc.edu> Author: kremenek Date: Wed Oct 22 15:56:22 2008 New Revision: 57998 URL: http://llvm.org/viewvc/llvm-project?rev=57998&view=rev Log: Tagging checker-115. Added: llvm/tags/checker/checker-115/ - copied from r57997, llvm/trunk/ From tonic at nondot.org Wed Oct 22 16:43:34 2008 From: tonic at nondot.org (Tanya Lattner) Date: Wed, 22 Oct 2008 21:43:34 -0000 Subject: [llvm-commits] [llvm] r58003 - /llvm/branches/release_24/lib/Target/CBackend/CBackend.cpp Message-ID: <200810222143.m9MLhZLB025718@zion.cs.uiuc.edu> Author: tbrethou Date: Wed Oct 22 16:43:33 2008 New Revision: 58003 URL: http://llvm.org/viewvc/llvm-project?rev=58003&view=rev Log: Rename bitcastToAPInt to convertToAPInt. Modified: llvm/branches/release_24/lib/Target/CBackend/CBackend.cpp Modified: llvm/branches/release_24/lib/Target/CBackend/CBackend.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_24/lib/Target/CBackend/CBackend.cpp?rev=58003&r1=58002&r2=58003&view=diff ============================================================================== --- llvm/branches/release_24/lib/Target/CBackend/CBackend.cpp (original) +++ llvm/branches/release_24/lib/Target/CBackend/CBackend.cpp Wed Oct 22 16:43:33 2008 @@ -2060,20 +2060,20 @@ if (FPC->getType() == Type::DoubleTy) { double Val = FPC->getValueAPF().convertToDouble(); - uint64_t i = FPC->getValueAPF().bitcastToAPInt().getZExtValue(); + uint64_t i = FPC->getValueAPF().convertToAPInt().getZExtValue(); Out << "static const ConstantDoubleTy FPConstant" << FPCounter++ << " = 0x" << utohexstr(i) << "ULL; /* " << Val << " */\n"; } else if (FPC->getType() == Type::FloatTy) { float Val = FPC->getValueAPF().convertToFloat(); - uint32_t i = (uint32_t)FPC->getValueAPF().bitcastToAPInt(). + uint32_t i = (uint32_t)FPC->getValueAPF().convertToAPInt(). getZExtValue(); Out << "static const ConstantFloatTy FPConstant" << FPCounter++ << " = 0x" << utohexstr(i) << "U; /* " << Val << " */\n"; } else if (FPC->getType() == Type::X86_FP80Ty) { // api needed to prevent premature destruction - APInt api = FPC->getValueAPF().bitcastToAPInt(); + APInt api = FPC->getValueAPF().convertToAPInt(); const uint64_t *p = api.getRawData(); Out << "static const ConstantFP80Ty FPConstant" << FPCounter++ << " = { 0x" @@ -2081,7 +2081,7 @@ << "ULL, 0x" << utohexstr((uint16_t)(p[0] >> 48)) << ",{0,0,0}" << "}; /* Long double constant */\n"; } else if (FPC->getType() == Type::PPC_FP128Ty) { - APInt api = FPC->getValueAPF().bitcastToAPInt(); + APInt api = FPC->getValueAPF().convertToAPInt(); const uint64_t *p = api.getRawData(); Out << "static const ConstantFP128Ty FPConstant" << FPCounter++ << " = { 0x" From tonic at nondot.org Wed Oct 22 16:46:49 2008 From: tonic at nondot.org (Tanya Lattner) Date: Wed, 22 Oct 2008 21:46:49 -0000 Subject: [llvm-commits] [llvm] r58004 - /llvm/branches/release_24/lib/Target/CBackend/CBackend.cpp Message-ID: <200810222146.m9MLkne9025821@zion.cs.uiuc.edu> Author: tbrethou Date: Wed Oct 22 16:46:49 2008 New Revision: 58004 URL: http://llvm.org/viewvc/llvm-project?rev=58004&view=rev Log: Fix build error. Modified: llvm/branches/release_24/lib/Target/CBackend/CBackend.cpp Modified: llvm/branches/release_24/lib/Target/CBackend/CBackend.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_24/lib/Target/CBackend/CBackend.cpp?rev=58004&r1=58003&r2=58004&view=diff ============================================================================== --- llvm/branches/release_24/lib/Target/CBackend/CBackend.cpp (original) +++ llvm/branches/release_24/lib/Target/CBackend/CBackend.cpp Wed Oct 22 16:46:49 2008 @@ -1142,8 +1142,7 @@ // This is not awesome, but it at least makes the CBE output somewhat // useful. APFloat Tmp = FPC->getValueAPF(); - bool LosesInfo; - Tmp.convert(APFloat::IEEEdouble, APFloat::rmTowardZero, &LosesInfo); + Tmp.convert(APFloat::IEEEdouble, APFloat::rmTowardZero); V = Tmp.convertToDouble(); } From grosbach at apple.com Wed Oct 22 17:27:51 2008 From: grosbach at apple.com (Jim Grosbach) Date: Wed, 22 Oct 2008 22:27:51 -0000 Subject: [llvm-commits] [llvm] r58006 - /llvm/trunk/lib/Target/ARM/ARMJITInfo.cpp Message-ID: <200810222227.m9MMRp0d027125@zion.cs.uiuc.edu> Author: grosbach Date: Wed Oct 22 17:27:51 2008 New Revision: 58006 URL: http://llvm.org/viewvc/llvm-project?rev=58006&view=rev Log: remove extraneous #ifdef's Modified: llvm/trunk/lib/Target/ARM/ARMJITInfo.cpp Modified: llvm/trunk/lib/Target/ARM/ARMJITInfo.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMJITInfo.cpp?rev=58006&r1=58005&r2=58006&view=diff ============================================================================== --- llvm/trunk/lib/Target/ARM/ARMJITInfo.cpp (original) +++ llvm/trunk/lib/Target/ARM/ARMJITInfo.cpp Wed Oct 22 17:27:51 2008 @@ -110,24 +110,20 @@ // stub with: // ldr pc, [pc,#-4] // -#if defined(__APPLE__) bool ok = sys::Memory::setRangeWritable ((void*)StubAddr, 8); if (!ok) { cerr << "ERROR: Unable to mark stub writable\n"; abort(); } -#endif *(intptr_t *)StubAddr = 0xe51ff004; *(intptr_t *)(StubAddr+4) = NewVal; -#if defined(__APPLE__) ok = sys::Memory::setRangeExecutable ((void*)StubAddr, 8); if (!ok) { cerr << "ERROR: Unable to mark stub executable\n"; abort(); } -#endif } TargetJITInfo::LazyResolverFn From kremenek at apple.com Wed Oct 22 18:16:52 2008 From: kremenek at apple.com (Ted Kremenek) Date: Wed, 22 Oct 2008 23:16:52 -0000 Subject: [llvm-commits] [llvm] r58009 - /llvm/trunk/include/llvm/ADT/StringExtras.h Message-ID: <200810222316.m9MNGqH4028565@zion.cs.uiuc.edu> Author: kremenek Date: Wed Oct 22 18:16:52 2008 New Revision: 58009 URL: http://llvm.org/viewvc/llvm-project?rev=58009&view=rev Log: Fix incorrect testing for the end of the both strings in CStrInCStrNoCase. This could cause a read-out-of-bounds error if s2 is smaller than s1. Modified: llvm/trunk/include/llvm/ADT/StringExtras.h Modified: llvm/trunk/include/llvm/ADT/StringExtras.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ADT/StringExtras.h?rev=58009&r1=58008&r2=58009&view=diff ============================================================================== --- llvm/trunk/include/llvm/ADT/StringExtras.h (original) +++ llvm/trunk/include/llvm/ADT/StringExtras.h Wed Oct 22 18:16:52 2008 @@ -159,7 +159,7 @@ const char *I1=s1, *I2=s2; - while (*I1 != '\0' || *I2 != '\0' ) + while (*I1 != '\0' && *I2 != '\0' ) if (tolower(*I1) != tolower(*I2)) { // No match. Start over. ++s1; I1 = s1; I2 = s2; } From daniel at zuster.org Wed Oct 22 18:32:42 2008 From: daniel at zuster.org (Daniel Dunbar) Date: Wed, 22 Oct 2008 23:32:42 -0000 Subject: [llvm-commits] [llvm] r58010 - in /llvm/trunk: include/llvm/Transforms/Scalar.h lib/Transforms/Scalar/IndVarSimplify.cpp lib/Transforms/Scalar/LICM.cpp lib/Transforms/Scalar/LoopDeletion.cpp lib/Transforms/Scalar/LoopIndexSplit.cpp lib/Transforms/Scalar/LoopRotation.cpp lib/Transforms/Scalar/LoopStrengthReduce.cpp lib/Transforms/Scalar/LoopUnroll.cpp lib/Transforms/Scalar/LoopUnswitch.cpp lib/Transforms/Utils/LCSSA.cpp Message-ID: <200810222332.m9MNWg74028972@zion.cs.uiuc.edu> Author: ddunbar Date: Wed Oct 22 18:32:42 2008 New Revision: 58010 URL: http://llvm.org/viewvc/llvm-project?rev=58010&view=rev Log: Change create*Pass factory functions to return Pass* instead of LoopPass*. - Although less precise, this means they can be used in clients without RTTI (who would otherwise need to include LoopPass.h, which eventually includes things using dynamic_cast). This was the simplest solution that presented itself, but I am happy to use a better one if available. Modified: llvm/trunk/include/llvm/Transforms/Scalar.h llvm/trunk/lib/Transforms/Scalar/IndVarSimplify.cpp llvm/trunk/lib/Transforms/Scalar/LICM.cpp llvm/trunk/lib/Transforms/Scalar/LoopDeletion.cpp llvm/trunk/lib/Transforms/Scalar/LoopIndexSplit.cpp llvm/trunk/lib/Transforms/Scalar/LoopRotation.cpp llvm/trunk/lib/Transforms/Scalar/LoopStrengthReduce.cpp llvm/trunk/lib/Transforms/Scalar/LoopUnroll.cpp llvm/trunk/lib/Transforms/Scalar/LoopUnswitch.cpp llvm/trunk/lib/Transforms/Utils/LCSSA.cpp Modified: llvm/trunk/include/llvm/Transforms/Scalar.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Transforms/Scalar.h?rev=58010&r1=58009&r2=58010&view=diff ============================================================================== --- llvm/trunk/include/llvm/Transforms/Scalar.h (original) +++ llvm/trunk/include/llvm/Transforms/Scalar.h Wed Oct 22 18:32:42 2008 @@ -18,7 +18,6 @@ namespace llvm { class FunctionPass; -class LoopPass; class Pass; class GetElementPtrInst; class PassInfo; @@ -81,7 +80,7 @@ // InductionVariableSimplify - Transform induction variables in a program to all // use a single canonical induction variable per loop. // -LoopPass *createIndVarSimplifyPass(); +Pass *createIndVarSimplifyPass(); //===----------------------------------------------------------------------===// // @@ -101,7 +100,7 @@ // // LICM - This pass is a loop invariant code motion and memory promotion pass. // -LoopPass *createLICMPass(); +Pass *createLICMPass(); //===----------------------------------------------------------------------===// // @@ -110,32 +109,32 @@ // optional parameter used to consult the target machine whether certain // transformations are profitable. // -LoopPass *createLoopStrengthReducePass(const TargetLowering *TLI = 0); +Pass *createLoopStrengthReducePass(const TargetLowering *TLI = 0); //===----------------------------------------------------------------------===// // // LoopUnswitch - This pass is a simple loop unswitching pass. // -LoopPass *createLoopUnswitchPass(bool OptimizeForSize = false); +Pass *createLoopUnswitchPass(bool OptimizeForSize = false); //===----------------------------------------------------------------------===// // // LoopUnroll - This pass is a simple loop unrolling pass. // -LoopPass *createLoopUnrollPass(); +Pass *createLoopUnrollPass(); //===----------------------------------------------------------------------===// // // LoopRotate - This pass is a simple loop rotating pass. // -LoopPass *createLoopRotatePass(); +Pass *createLoopRotatePass(); //===----------------------------------------------------------------------===// // // LoopIndexSplit - This pass divides loop's iteration range by spliting loop // such that each individual loop is executed efficiently. // -LoopPass *createLoopIndexSplitPass(); +Pass *createLoopIndexSplitPass(); //===----------------------------------------------------------------------===// // @@ -274,7 +273,7 @@ // LCSSA - This pass inserts phi nodes at loop boundaries to simplify other loop // optimizations. // -LoopPass *createLCSSAPass(); +Pass *createLCSSAPass(); extern const PassInfo *const LCSSAID; //===----------------------------------------------------------------------===// @@ -310,7 +309,7 @@ // LoopDeletion - This pass performs DCE of non-infinite loops that it // can prove are dead. // -LoopPass *createLoopDeletionPass(); +Pass *createLoopDeletionPass(); //===----------------------------------------------------------------------===// // Modified: llvm/trunk/lib/Transforms/Scalar/IndVarSimplify.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/IndVarSimplify.cpp?rev=58010&r1=58009&r2=58010&view=diff ============================================================================== --- llvm/trunk/lib/Transforms/Scalar/IndVarSimplify.cpp (original) +++ llvm/trunk/lib/Transforms/Scalar/IndVarSimplify.cpp Wed Oct 22 18:32:42 2008 @@ -102,7 +102,7 @@ static RegisterPass X("indvars", "Canonicalize Induction Variables"); -LoopPass *llvm::createIndVarSimplifyPass() { +Pass *llvm::createIndVarSimplifyPass() { return new IndVarSimplify(); } Modified: llvm/trunk/lib/Transforms/Scalar/LICM.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/LICM.cpp?rev=58010&r1=58009&r2=58010&view=diff ============================================================================== --- llvm/trunk/lib/Transforms/Scalar/LICM.cpp (original) +++ llvm/trunk/lib/Transforms/Scalar/LICM.cpp Wed Oct 22 18:32:42 2008 @@ -230,7 +230,7 @@ char LICM::ID = 0; static RegisterPass X("licm", "Loop Invariant Code Motion"); -LoopPass *llvm::createLICMPass() { return new LICM(); } +Pass *llvm::createLICMPass() { return new LICM(); } /// Hoist expressions out of the specified loop. Note, alias info for inner /// loop is not preserved so it is not a good idea to run LICM multiple Modified: llvm/trunk/lib/Transforms/Scalar/LoopDeletion.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/LoopDeletion.cpp?rev=58010&r1=58009&r2=58010&view=diff ============================================================================== --- llvm/trunk/lib/Transforms/Scalar/LoopDeletion.cpp (original) +++ llvm/trunk/lib/Transforms/Scalar/LoopDeletion.cpp Wed Oct 22 18:32:42 2008 @@ -60,7 +60,7 @@ char LoopDeletion::ID = 0; static RegisterPass X("loop-deletion", "Delete dead loops"); -LoopPass* llvm::createLoopDeletionPass() { +Pass* llvm::createLoopDeletionPass() { return new LoopDeletion(); } Modified: llvm/trunk/lib/Transforms/Scalar/LoopIndexSplit.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/LoopIndexSplit.cpp?rev=58010&r1=58009&r2=58010&view=diff ============================================================================== --- llvm/trunk/lib/Transforms/Scalar/LoopIndexSplit.cpp (original) +++ llvm/trunk/lib/Transforms/Scalar/LoopIndexSplit.cpp Wed Oct 22 18:32:42 2008 @@ -205,7 +205,7 @@ static RegisterPass X("loop-index-split", "Index Split Loops"); -LoopPass *llvm::createLoopIndexSplitPass() { +Pass *llvm::createLoopIndexSplitPass() { return new LoopIndexSplit(); } Modified: llvm/trunk/lib/Transforms/Scalar/LoopRotation.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/LoopRotation.cpp?rev=58010&r1=58009&r2=58010&view=diff ============================================================================== --- llvm/trunk/lib/Transforms/Scalar/LoopRotation.cpp (original) +++ llvm/trunk/lib/Transforms/Scalar/LoopRotation.cpp Wed Oct 22 18:32:42 2008 @@ -107,7 +107,7 @@ char LoopRotate::ID = 0; static RegisterPass X("loop-rotate", "Rotate Loops"); -LoopPass *llvm::createLoopRotatePass() { return new LoopRotate(); } +Pass *llvm::createLoopRotatePass() { return new LoopRotate(); } /// Rotate Loop L as many times as possible. Return true if /// loop is rotated at least once. Modified: llvm/trunk/lib/Transforms/Scalar/LoopStrengthReduce.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/LoopStrengthReduce.cpp?rev=58010&r1=58009&r2=58010&view=diff ============================================================================== --- llvm/trunk/lib/Transforms/Scalar/LoopStrengthReduce.cpp (original) +++ llvm/trunk/lib/Transforms/Scalar/LoopStrengthReduce.cpp Wed Oct 22 18:32:42 2008 @@ -213,7 +213,7 @@ static RegisterPass X("loop-reduce", "Loop Strength Reduction"); -LoopPass *llvm::createLoopStrengthReducePass(const TargetLowering *TLI) { +Pass *llvm::createLoopStrengthReducePass(const TargetLowering *TLI) { return new LoopStrengthReduce(TLI); } Modified: llvm/trunk/lib/Transforms/Scalar/LoopUnroll.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/LoopUnroll.cpp?rev=58010&r1=58009&r2=58010&view=diff ============================================================================== --- llvm/trunk/lib/Transforms/Scalar/LoopUnroll.cpp (original) +++ llvm/trunk/lib/Transforms/Scalar/LoopUnroll.cpp Wed Oct 22 18:32:42 2008 @@ -73,7 +73,7 @@ char LoopUnroll::ID = 0; static RegisterPass X("loop-unroll", "Unroll loops"); -LoopPass *llvm::createLoopUnrollPass() { return new LoopUnroll(); } +Pass *llvm::createLoopUnrollPass() { return new LoopUnroll(); } /// ApproximateLoopSize - Approximate the size of the loop. static unsigned ApproximateLoopSize(const Loop *L) { Modified: llvm/trunk/lib/Transforms/Scalar/LoopUnswitch.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/LoopUnswitch.cpp?rev=58010&r1=58009&r2=58010&view=diff ============================================================================== --- llvm/trunk/lib/Transforms/Scalar/LoopUnswitch.cpp (original) +++ llvm/trunk/lib/Transforms/Scalar/LoopUnswitch.cpp Wed Oct 22 18:32:42 2008 @@ -154,7 +154,7 @@ char LoopUnswitch::ID = 0; static RegisterPass X("loop-unswitch", "Unswitch loops"); -LoopPass *llvm::createLoopUnswitchPass(bool Os) { +Pass *llvm::createLoopUnswitchPass(bool Os) { return new LoopUnswitch(Os); } Modified: llvm/trunk/lib/Transforms/Utils/LCSSA.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/LCSSA.cpp?rev=58010&r1=58009&r2=58010&view=diff ============================================================================== --- llvm/trunk/lib/Transforms/Utils/LCSSA.cpp (original) +++ llvm/trunk/lib/Transforms/Utils/LCSSA.cpp Wed Oct 22 18:32:42 2008 @@ -99,7 +99,7 @@ char LCSSA::ID = 0; static RegisterPass X("lcssa", "Loop-Closed SSA Form Pass"); -LoopPass *llvm::createLCSSAPass() { return new LCSSA(); } +Pass *llvm::createLCSSAPass() { return new LCSSA(); } const PassInfo *const llvm::LCSSAID = &X; /// runOnFunction - Process all loops in the function, inner-most out. From kremenek at apple.com Wed Oct 22 18:56:47 2008 From: kremenek at apple.com (Ted Kremenek) Date: Wed, 22 Oct 2008 23:56:47 -0000 Subject: [llvm-commits] [llvm] r58013 - /llvm/tags/checker/checker-116/ Message-ID: <200810222356.m9MNumMi029858@zion.cs.uiuc.edu> Author: kremenek Date: Wed Oct 22 18:56:47 2008 New Revision: 58013 URL: http://llvm.org/viewvc/llvm-project?rev=58013&view=rev Log: Tagging checker-116. Added: llvm/tags/checker/checker-116/ - copied from r58012, llvm/trunk/ From sabre at nondot.org Wed Oct 22 19:24:51 2008 From: sabre at nondot.org (Chris Lattner) Date: Thu, 23 Oct 2008 00:24:51 -0000 Subject: [llvm-commits] [llvm] r58016 - /llvm/trunk/test/FrontendC/2004-02-13-Memset.c Message-ID: <200810230024.m9N0OpCc030622@zion.cs.uiuc.edu> Author: lattner Date: Wed Oct 22 19:24:51 2008 New Revision: 58016 URL: http://llvm.org/viewvc/llvm-project?rev=58016&view=rev Log: make this test not depend on how the system header defines memset. Modified: llvm/trunk/test/FrontendC/2004-02-13-Memset.c Modified: llvm/trunk/test/FrontendC/2004-02-13-Memset.c URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/FrontendC/2004-02-13-Memset.c?rev=58016&r1=58015&r2=58016&view=diff ============================================================================== --- llvm/trunk/test/FrontendC/2004-02-13-Memset.c (original) +++ llvm/trunk/test/FrontendC/2004-02-13-Memset.c Wed Oct 22 19:24:51 2008 @@ -1,6 +1,7 @@ // RUN: %llvmgcc -xc %s -c -o - | llvm-dis | grep llvm.memset | count 3 -#include +void *memset(void*, int, long); +void bzero(void*, int); void test(int* X, char *Y) { memset(X, 4, 1000); From clattner at apple.com Wed Oct 22 19:40:58 2008 From: clattner at apple.com (Chris Lattner) Date: Wed, 22 Oct 2008 17:40:58 -0700 Subject: [llvm-commits] [llvm] r57925 - in /llvm/trunk: lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp test/CodeGen/X86/pr2924.ll In-Reply-To: <7aa9f8a40810221040le686004ja4e70227fb503495@mail.gmail.com> References: <200810212000.m9LK0h2U028185@zion.cs.uiuc.edu> <7aa9f8a40810220115v487c513ci764df9b5b5fcb947@mail.gmail.com> <5DC7C5AE-B73C-4A03-8AEF-7141F5F71425@apple.com> <7aa9f8a40810221040le686004ja4e70227fb503495@mail.gmail.com> Message-ID: <9BF32898-1836-4F10-8213-69760D10BC9F@apple.com> On Oct 22, 2008, at 10:40 AM, Tomas Lindquist Olsen wrote: > > If you have an example of C code that worked with llvm-gcc in 2.3 > but that fails with llvm-gcc in 2.4, then it would be a regression > and yes we would want to pull it in. Otherwise unfortunately we > shouldn't pull it in. I don't have llvm-gcc, this code is generated by my D compiler. > > Using first class aggregates only started working after this fix (at > least when doing optimizations, which is what produces the select > inst) > > Sounds like we won't be able to support the 2.4 release. Oh well... Why? It is trivial to support. Any time you would make a FCA select instruction, just produce a sequence of 'extract values' select between the extracted values, then use 'insertvalue' to recreate the result. > > > If I do find some time for it, what kind of C/C++ code would I write > to generate something that produces first class aggregates ? X86-64 return values. It would be *very very hard* to do this -Chris From daniel at zuster.org Wed Oct 22 20:11:54 2008 From: daniel at zuster.org (Daniel Dunbar) Date: Thu, 23 Oct 2008 01:11:54 -0000 Subject: [llvm-commits] [llvm-gcc-4.2] r58018 - /llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp Message-ID: <200810230111.m9N1BsSI031928@zion.cs.uiuc.edu> Author: ddunbar Date: Wed Oct 22 20:11:54 2008 New Revision: 58018 URL: http://llvm.org/viewvc/llvm-project?rev=58018&view=rev Log: Simplify running of always inliner pass. - Fixes theoretical bug where module was scanned for always inline attribute before emission of all functions was complete. - PerModule passes are now always being run. Modified: llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp Modified: llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp?rev=58018&r1=58017&r2=58018&view=diff ============================================================================== --- llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp (original) +++ llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp Wed Oct 22 20:11:54 2008 @@ -379,19 +379,8 @@ // FIXME: AT -O0/O1, we should stream out functions at a time. PerModulePasses = new PassManager(); PerModulePasses->add(new TargetData(*TheTarget->getTargetData())); - bool HasPerModulePasses = false; - bool NeedAlwaysInliner = false; - // Check if AlwaysInliner is needed to handle functions that are - // marked as always_inline. - for (Module::iterator I = TheModule->begin(), E = TheModule->end(); - I != E; ++I) - if (I->hasFnAttr(Attribute::AlwaysInline)) { - NeedAlwaysInliner = true; - break; - } if (optimize > 0 && !DisableLLVMOptimizations) { - HasPerModulePasses = true; PassManager *PM = PerModulePasses; if (flag_unit_at_a_time) PM->add(createRaiseAllocationsPass()); // call %malloc -> malloc inst @@ -412,7 +401,7 @@ } if (flag_inline_trees > 1) // respect -fno-inline-functions PM->add(createFunctionInliningPass()); // Inline small functions - else if (NeedAlwaysInliner) + else PM->add(createAlwaysInlinerPass()); // Inline always_inline functions if (optimize > 2) PM->add(createArgumentPromotionPass()); // Scalarize uninlined fn args @@ -456,21 +445,18 @@ if (optimize > 1 && flag_unit_at_a_time) PM->add(createConstantMergePass()); // Merge dup global constants - } - - if (!HasPerModulePasses && NeedAlwaysInliner) + } else { PerModulePasses->add(createAlwaysInlinerPass()); + } if (emit_llvm_bc) { // Emit an LLVM .bc file to the output. This is used when passed // -emit-llvm -c to the GCC driver. PerModulePasses->add(CreateBitcodeWriterPass(*AsmOutStream)); - HasPerModulePasses = true; } else if (emit_llvm) { // Emit an LLVM .ll file to the output. This is used when passed // -emit-llvm -S to the GCC driver. PerModulePasses->add(createPrintModulePass(AsmOutRawStream)); - HasPerModulePasses = true; } else { FunctionPassManager *PM; @@ -478,7 +464,7 @@ // as a separate "pass" after that happens. // FIXME: This is disabled right now until bugs can be worked out. Reenable // this for fast -O0 compiles! - if (HasPerModulePasses || 1) { + if (1) { CodeGenPasses = PM = new FunctionPassManager(new ExistingModuleProvider(TheModule)); PM->add(new TargetData(*TheTarget->getTargetData())); @@ -514,10 +500,6 @@ delete PerFunctionPasses; PerFunctionPasses = 0; } - if (!HasPerModulePasses) { - delete PerModulePasses; - PerModulePasses = 0; - } } From alenhar2 at cs.uiuc.edu Wed Oct 22 20:15:05 2008 From: alenhar2 at cs.uiuc.edu (Andrew Lenharth) Date: Thu, 23 Oct 2008 01:15:05 -0000 Subject: [llvm-commits] [poolalloc] r58019 - in /poolalloc/trunk: lib/AssistDS/ lib/AssistDS/FuncSpec.cpp lib/AssistDS/IndCloner.cpp lib/AssistDS/Makefile lib/DSA/StdLibPass.cpp lib/Makefile test/TEST.poolalloc.Makefile Message-ID: <200810230115.m9N1F5q5032022@zion.cs.uiuc.edu> Author: alenhar2 Date: Wed Oct 22 20:15:04 2008 New Revision: 58019 URL: http://llvm.org/viewvc/llvm-project?rev=58019&view=rev Log: Some random helper passes for DSA (esp TD) Added: poolalloc/trunk/lib/AssistDS/ poolalloc/trunk/lib/AssistDS/FuncSpec.cpp poolalloc/trunk/lib/AssistDS/IndCloner.cpp poolalloc/trunk/lib/AssistDS/Makefile Modified: poolalloc/trunk/lib/DSA/StdLibPass.cpp poolalloc/trunk/lib/Makefile poolalloc/trunk/test/TEST.poolalloc.Makefile Added: poolalloc/trunk/lib/AssistDS/FuncSpec.cpp URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/AssistDS/FuncSpec.cpp?rev=58019&view=auto ============================================================================== --- poolalloc/trunk/lib/AssistDS/FuncSpec.cpp (added) +++ poolalloc/trunk/lib/AssistDS/FuncSpec.cpp Wed Oct 22 20:15:04 2008 @@ -0,0 +1,87 @@ +//===-- FuncSpec.cpp - Clone Functions With Constant Function Ptr Args ----===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +#define DEBUG_TYPE "funcspec" + +#include "llvm/Instructions.h" +#include "llvm/Module.h" +#include "llvm/Pass.h" +#include "llvm/Transforms/Utils/Cloning.h" +#include "llvm/ADT/Statistic.h" +#include +#include +#include + +using namespace llvm; + +STATISTIC(numCloned, "Number of Functions Cloned"); +STATISTIC(numReplaced, "Number of Calls Replaced"); + +namespace { + class FuncSpec : public ModulePass { + public: + static char ID; + FuncSpec() : ModulePass(&ID) {} + bool runOnModule(Module& M) { + std::map > > cloneSites; + std::map > >, Function* > toClone; + + for (Module::iterator I = M.begin(); I != M.end(); ++I) + if (!I->isDeclaration() && !I->mayBeOverridden()) { + std::vector FPArgs; + for (Function::arg_iterator ii = I->arg_begin(), ee = I->arg_end(); + ii != ee; ++ii) + if (const PointerType* Ty = dyn_cast(ii->getType())) { + if (isa(Ty->getElementType())) { + FPArgs.push_back(ii->getArgNo()); + cerr << "Eligable: " << I->getName() << "\n"; + } + } else if (isa(ii->getType())) { + FPArgs.push_back(ii->getArgNo()); + cerr << "Eligable: " << I->getName() << "\n"; + } + for(Value::use_iterator ui = I->use_begin(), ue = I->use_end(); + ui != ue; ++ui) + if (CallInst* CI = dyn_cast(ui)) { + std::vector > Consts; + for (unsigned x = 0; x < FPArgs.size(); ++x) + if (Constant* C = dyn_cast(ui->getOperand(x + 1))) { + Consts.push_back(std::make_pair(x, C)); + CI->dump(); + } + if (!Consts.empty()) { + cloneSites[CI] = Consts; + toClone[std::make_pair(I, Consts)] = 0; + } + } + } + + numCloned += toClone.size(); + + for (std::map > >, Function* >::iterator I = toClone.begin(), E = toClone.end(); I != E; ++I) { + Function* DirectF = CloneFunction(I->first.first); + DirectF->setName(I->first.first->getName() + "_SPEC"); + DirectF->setLinkage(GlobalValue::InternalLinkage); + I->first.first->getParent()->getFunctionList().push_back(DirectF); + I->second = DirectF; + } + + for (std::map > >::iterator ii = cloneSites.begin(), ee = cloneSites.end(); ii != ee; ++ii) { + ii->first->setOperand(0, toClone[std::make_pair(cast(ii->first->getOperand(0)), ii->second)]); + ++numReplaced; + } + + return true; + } + }; +} + +char FuncSpec::ID = 0; +static RegisterPass +X("funcspec", "Specialize for Funnction Pointers"); Added: poolalloc/trunk/lib/AssistDS/IndCloner.cpp URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/AssistDS/IndCloner.cpp?rev=58019&view=auto ============================================================================== --- poolalloc/trunk/lib/AssistDS/IndCloner.cpp (added) +++ poolalloc/trunk/lib/AssistDS/IndCloner.cpp Wed Oct 22 20:15:04 2008 @@ -0,0 +1,61 @@ +//===-- IndClonder.cpp - Clone Indirect Called Functions ------------------===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +#define DEBUG_TYPE "indclone" + +#include "llvm/Instructions.h" +#include "llvm/Module.h" +#include "llvm/Pass.h" +#include "llvm/Transforms/Utils/Cloning.h" +#include "llvm/ADT/Statistic.h" +#include + +using namespace llvm; + +STATISTIC(numCloned, "Number of Functions Cloned"); +STATISTIC(numReplaced, "Number of Calls Replaced"); + +namespace { + class IndClone : public ModulePass { + public: + static char ID; + IndClone() : ModulePass(&ID) {} + bool runOnModule(Module& M) { + std::set toClone; + for (Module::iterator I = M.begin(); I != M.end(); ++I) + if (!I->isDeclaration() && !I->mayBeOverridden()) + for(Value::use_iterator ui = I->use_begin(), ue = I->use_end(); + ui != ue; ++ui) + if (!isa(ui)) { + toClone.insert(I); + } + numCloned += toClone.size(); + for (std::set::iterator I = toClone.begin(), + E = toClone.end(); I != E; ++I) { + Function* DirectF = CloneFunction(*I); + DirectF->setName((*I)->getName() + "_DIRECT"); + DirectF->setLinkage(GlobalValue::InternalLinkage); + (*I)->getParent()->getFunctionList().push_back(DirectF); + for(Value::use_iterator ui = (*I)->use_begin(), ue = (*I)->use_end(); + ui != ue; ++ui) + if (CallInst* CI = dyn_cast(ui)) + if (CI->getOperand(0) == *I) { + ++numReplaced; + CI->setOperand(0, DirectF); + } + } + + return true; + } + }; +} + +char IndClone::ID = 0; +static RegisterPass +X("indclone", "Indirect call cloning"); Added: poolalloc/trunk/lib/AssistDS/Makefile URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/AssistDS/Makefile?rev=58019&view=auto ============================================================================== --- poolalloc/trunk/lib/AssistDS/Makefile (added) +++ poolalloc/trunk/lib/AssistDS/Makefile Wed Oct 22 20:15:04 2008 @@ -0,0 +1,16 @@ +##===- lib/AssistDS/Makefile -------------------------------*- Makefile -*-===## +# +# The LLVM Compiler Infrastructure +# +# This file was developed by the LLVM research group and is distributed under +# the University of Illinois Open Source License. See LICENSE.TXT for details. +# +##===----------------------------------------------------------------------===## + +LEVEL = ../.. +SHARED_LIBRARY=1 +LIBRARYNAME = AssistDS + +include $(LEVEL)/Makefile.common + +CFlags += -Wno-deprecated Modified: poolalloc/trunk/lib/DSA/StdLibPass.cpp URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/DSA/StdLibPass.cpp?rev=58019&r1=58018&r2=58019&view=diff ============================================================================== --- poolalloc/trunk/lib/DSA/StdLibPass.cpp (original) +++ poolalloc/trunk/lib/DSA/StdLibPass.cpp Wed Oct 22 20:15:04 2008 @@ -195,6 +195,24 @@ if (!I->isDeclaration()) getOrCreateGraph(&*I); + //Trust the readnone annotation + for (Module::iterator I = M.begin(), E = M.end(); I != E; ++I) + if (I->isDeclaration() && I->doesNotAccessMemory() && !isa(I->getReturnType())) + eraseCallsTo(I); + + //Useless external + for (Module::iterator I = M.begin(), E = M.end(); I != E; ++I) + if (I->isDeclaration() && !I->isVarArg() && !isa(I->getReturnType())) { + bool hasPtr = false; + for (Function::arg_iterator ii = I->arg_begin(), ee = I->arg_end(); ii != ee; ++ii) + if (isa(ii->getType())) { + hasPtr = true; + break; + } + if (!hasPtr) + eraseCallsTo(I); + } + //Functions we handle by summary for (int x = 0; recFuncs[x].name; ++x) @@ -247,15 +265,7 @@ Node->foldNodeCompletely(); } } - for (Value::use_iterator ii = F->use_begin(), ee = F->use_end(); - ii != ee; ++ii) - if (CallInst* CI = dyn_cast(ii)) - if (CI->getOperand(0) == F) { - DSGraph* Graph = getDSGraph(*CI->getParent()->getParent()); - //delete the call - DOUT << "Removing " << F->getName() << " from " << CI->getParent()->getParent()->getName() << "\n"; - Graph->removeFunctionCalls(*F); - } + eraseCallsTo(F); } return false; Modified: poolalloc/trunk/lib/Makefile URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/Makefile?rev=58019&r1=58018&r2=58019&view=diff ============================================================================== --- poolalloc/trunk/lib/Makefile (original) +++ poolalloc/trunk/lib/Makefile Wed Oct 22 20:15:04 2008 @@ -6,6 +6,6 @@ # # List all of the subdirectories that we will compile. # -DIRS=DSA PoolAllocate +DIRS=DSA PoolAllocate AssistDS include $(LEVEL)/Makefile.common Modified: poolalloc/trunk/test/TEST.poolalloc.Makefile URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/test/TEST.poolalloc.Makefile?rev=58019&r1=58018&r2=58019&view=diff ============================================================================== --- poolalloc/trunk/test/TEST.poolalloc.Makefile (original) +++ poolalloc/trunk/test/TEST.poolalloc.Makefile Wed Oct 22 20:15:04 2008 @@ -27,6 +27,7 @@ # Pool allocator pass shared object PA_SO := $(PADIR)/Debug/lib/libpoolalloc$(SHLIBEXT) DSA_SO := $(PADIR)/Debug/lib/libLLVMDataStructure$(SHLIBEXT) +ASSIST_SO := $(PADIR)/Debug/lib/libAssistDS$(SHLIBEXT) # Pool allocator runtime library #PA_RT := $(PADIR)/Debug/lib/libpoolalloc_fl_rt.bc @@ -49,8 +50,8 @@ -$(LLVMLD) -link-as-library $< $(PA_PRE_RT) -o $@ $(PROGRAMS_TO_TEST:%=Output/%.base.bc): \ -Output/%.base.bc: Output/%.temp.bc $(LOPT) - -$(LOPT) -instnamer -internalize -globaldce $< -f -o $@ +Output/%.base.bc: Output/%.temp.bc $(LOPT) $(ASSIST_SO) + -$(LOPT) -load $(ASSIST_SO) -instnamer -internalize -indclone -funcspec -ipsccp -deadargelim -instcombine -globaldce -stats $< -f -o $@ # This rule runs the pool allocator on the .base.bc file to produce a new .bc # file From kremenek at apple.com Wed Oct 22 20:56:23 2008 From: kremenek at apple.com (Ted Kremenek) Date: Thu, 23 Oct 2008 01:56:23 -0000 Subject: [llvm-commits] [llvm] r58022 - /llvm/tags/checker/checker-116/ Message-ID: <200810230156.m9N1uNLw000666@zion.cs.uiuc.edu> Author: kremenek Date: Wed Oct 22 20:56:23 2008 New Revision: 58022 URL: http://llvm.org/viewvc/llvm-project?rev=58022&view=rev Log: Removing checker-116. Removed: llvm/tags/checker/checker-116/ From kremenek at apple.com Wed Oct 22 20:57:53 2008 From: kremenek at apple.com (Ted Kremenek) Date: Thu, 23 Oct 2008 01:57:53 -0000 Subject: [llvm-commits] [llvm] r58025 - /llvm/tags/checker/checker-116/ Message-ID: <200810230157.m9N1vrWq000763@zion.cs.uiuc.edu> Author: kremenek Date: Wed Oct 22 20:57:53 2008 New Revision: 58025 URL: http://llvm.org/viewvc/llvm-project?rev=58025&view=rev Log: Tagging checker-116. Added: llvm/tags/checker/checker-116/ - copied from r58024, llvm/trunk/ From tonic at nondot.org Thu Oct 23 00:01:32 2008 From: tonic at nondot.org (Tanya Lattner) Date: Thu, 23 Oct 2008 05:01:32 -0000 Subject: [llvm-commits] [llvm] r58031 - /llvm/branches/release_24/include/llvm/ADT/StringExtras.h Message-ID: <200810230501.m9N51XJq005891@zion.cs.uiuc.edu> Author: tbrethou Date: Thu Oct 23 00:01:25 2008 New Revision: 58031 URL: http://llvm.org/viewvc/llvm-project?rev=58031&view=rev Log: Merge from mainline Fix incorrect testing for the end of the both strings in CStrInCStrNoCase. This could cause a read-out-of-bounds error if s2 is smaller than s1. Modified: llvm/branches/release_24/include/llvm/ADT/StringExtras.h Modified: llvm/branches/release_24/include/llvm/ADT/StringExtras.h URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_24/include/llvm/ADT/StringExtras.h?rev=58031&r1=58030&r2=58031&view=diff ============================================================================== --- llvm/branches/release_24/include/llvm/ADT/StringExtras.h (original) +++ llvm/branches/release_24/include/llvm/ADT/StringExtras.h Thu Oct 23 00:01:25 2008 @@ -156,7 +156,7 @@ const char *I1=s1, *I2=s2; - while (*I1 != '\0' || *I2 != '\0' ) + while (*I1 != '\0' && *I2 != '\0' ) if (tolower(*I1) != tolower(*I2)) { // No match. Start over. ++s1; I1 = s1; I2 = s2; } From tonic at nondot.org Thu Oct 23 00:03:22 2008 From: tonic at nondot.org (Tanya Lattner) Date: Thu, 23 Oct 2008 05:03:22 -0000 Subject: [llvm-commits] [llvm] r58032 - in /llvm/branches/release_24: lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp test/CodeGen/X86/pr2924.ll Message-ID: <200810230503.m9N53MK7005996@zion.cs.uiuc.edu> Author: tbrethou Date: Thu Oct 23 00:03:22 2008 New Revision: 58032 URL: http://llvm.org/viewvc/llvm-project?rev=58032&view=rev Log: Merge from mainline. Added: llvm/branches/release_24/test/CodeGen/X86/pr2924.ll - copied unchanged from r57925, llvm/trunk/test/CodeGen/X86/pr2924.ll Modified: llvm/branches/release_24/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp Modified: llvm/branches/release_24/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_24/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp?rev=58032&r1=58031&r2=58032&view=diff ============================================================================== --- llvm/branches/release_24/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp (original) +++ llvm/branches/release_24/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp Thu Oct 23 00:03:22 2008 @@ -905,11 +905,13 @@ SmallVector NewValues; NewValues.push_back(getControlRoot()); for (unsigned i = 0, e = I.getNumOperands(); i != e; ++i) { - SDValue RetOp = getValue(I.getOperand(i)); - SmallVector ValueVTs; ComputeValueVTs(TLI, I.getOperand(i)->getType(), ValueVTs); - for (unsigned j = 0, f = ValueVTs.size(); j != f; ++j) { + unsigned NumValues = ValueVTs.size(); + if (NumValues == 0) continue; + + SDValue RetOp = getValue(I.getOperand(i)); + for (unsigned j = 0, f = NumValues; j != f; ++j) { MVT VT = ValueVTs[j]; // FIXME: C calling convention requires the return type to be promoted to @@ -2195,11 +2197,23 @@ } void SelectionDAGLowering::visitSelect(User &I) { - SDValue Cond = getValue(I.getOperand(0)); - SDValue TrueVal = getValue(I.getOperand(1)); - SDValue FalseVal = getValue(I.getOperand(2)); - setValue(&I, DAG.getNode(ISD::SELECT, TrueVal.getValueType(), Cond, - TrueVal, FalseVal)); + SmallVector ValueVTs; + ComputeValueVTs(TLI, I.getType(), ValueVTs); + unsigned NumValues = ValueVTs.size(); + if (NumValues != 0) { + SmallVector Values(NumValues); + SDValue Cond = getValue(I.getOperand(0)); + SDValue TrueVal = getValue(I.getOperand(1)); + SDValue FalseVal = getValue(I.getOperand(2)); + + for (unsigned i = 0; i != NumValues; ++i) + Values[i] = DAG.getNode(ISD::SELECT, TrueVal.getValueType(), Cond, + SDValue(TrueVal.getNode(), TrueVal.getResNo() + i), + SDValue(FalseVal.getNode(), FalseVal.getResNo() + i)); + + setValue(&I, DAG.getMergeValues(DAG.getVTList(&ValueVTs[0], NumValues), + &Values[0], NumValues)); + } } From lattner at apple.com Thu Oct 23 00:06:57 2008 From: lattner at apple.com (Tanya Lattner) Date: Wed, 22 Oct 2008 22:06:57 -0700 Subject: [llvm-commits] [llvm] r57925 - in /llvm/trunk: lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp test/CodeGen/X86/pr2924.ll In-Reply-To: <7aa9f8a40810221040le686004ja4e70227fb503495@mail.gmail.com> References: <200810212000.m9LK0h2U028185@zion.cs.uiuc.edu> <7aa9f8a40810220115v487c513ci764df9b5b5fcb947@mail.gmail.com> <5DC7C5AE-B73C-4A03-8AEF-7141F5F71425@apple.com> <7aa9f8a40810221040le686004ja4e70227fb503495@mail.gmail.com> Message-ID: <0C87DECA-B4E5-4551-8FCB-7AEA6A3635B0@apple.com> Chris is 100% correct. We don't merge in patches at this point that are not regressions in llvm-test or dejanu checks from 2.3. I'll be detailing this in a release policy document for 2.5. Because there is some confusion on the issue, I've merged this into 2.4, but this would not normally meet our criteria. We have to draw the line at some point or we would never get out a release. With every patch we merge in there is risk associated with it and requires a full run of the test suite on all the platforms we support. We try very hard to have high quality releases, so you can understand why we are conservative. -Tanya On Oct 22, 2008, at 10:40 AM, Tomas Lindquist Olsen wrote: > > > On Wed, Oct 22, 2008 at 7:23 PM, Chris Lattner > wrote: > > On Oct 22, 2008, at 1:15 AM, Tomas Lindquist Olsen wrote: > >> On Tue, Oct 21, 2008 at 10:00 PM, Dan Gohman >> wrote: >> Author: djg >> Date: Tue Oct 21 15:00:42 2008 >> New Revision: 57925 >> >> URL: http://llvm.org/viewvc/llvm-project?rev=57925&view=rev >> Log: >> Fix SelectionDAGBuild lowering of Select instructions to >> handle first-class aggregate values. Also, fix a bug in >> the Ret handling for empty aggregates. >> >> Added: >> llvm/trunk/test/CodeGen/X86/pr2924.ll >> Modified: >> llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp >> >> >> Any chance this will make it into the 2.4 branch ? > > If you have an example of C code that worked with llvm-gcc in 2.3 > but that fails with llvm-gcc in 2.4, then it would be a regression > and yes we would want to pull it in. Otherwise unfortunately we > shouldn't pull it in. > > -Chris > > _______________________________________________ > llvm-commits mailing list > llvm-commits at cs.uiuc.edu > http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits > > > Ok :( > > I don't have llvm-gcc, this code is generated by my D compiler. > > Using first class aggregates only started working after this fix (at > least when doing optimizations, which is what produces the select > inst) > > Sounds like we won't be able to support the 2.4 release. Oh well... > > If I do find some time for it, what kind of C/C++ code would I write > to generate something that produces first class aggregates ? > _______________________________________________ > llvm-commits mailing list > llvm-commits at cs.uiuc.edu > http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20081022/562a67ab/attachment.html From baldrick at free.fr Thu Oct 23 00:39:22 2008 From: baldrick at free.fr (Duncan Sands) Date: Thu, 23 Oct 2008 07:39:22 +0200 Subject: [llvm-commits] [llvm-gcc-4.2] r57992 - /llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp In-Reply-To: <6F553805-9B78-4D82-8C2C-CD02631C586C@apple.com> References: <200810221814.m9MIEY6K018726@zion.cs.uiuc.edu> <6F553805-9B78-4D82-8C2C-CD02631C586C@apple.com> Message-ID: <200810230739.22588.baldrick@free.fr> Hi Devang, > > + // Type conversion does not ensure that there is always an LLVM > > field > > + // starting at the same byte as the gcc field. Correct for > > this now. > > + // An example of how this can occur is: > > + // Field A: offset 0, length 1 > > + // Field B: offset 4, length 4 (4 byte alignment) > > + // Field C: offset 6 > > + // Since field C overlaps field B, we delete field B and > > replace it with > > + // padding: > > + // LLVM A: offset 0, length 1 > > + // LLVM B: offset 1, length 5 (1 byte alignment) - padding > > array > > + // LLVM C: offset 6 > > So, in this case "Field B" will be represented by 3rd llvm field ? If > so then is it 4 byte aligned ? the gcc "Field B" is currently represented by the second llvm field "LLVM B". That's because it's the only LLVM field that contains the first byte of gcc "Field B" (the first byte is at offset 4). Ciao, Duncan. From baldrick at free.fr Thu Oct 23 00:40:17 2008 From: baldrick at free.fr (Duncan Sands) Date: Thu, 23 Oct 2008 07:40:17 +0200 Subject: [llvm-commits] [llvm-gcc-4.2] r57992 - /llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp In-Reply-To: <6F553805-9B78-4D82-8C2C-CD02631C586C@apple.com> References: <200810221814.m9MIEY6K018726@zion.cs.uiuc.edu> <6F553805-9B78-4D82-8C2C-CD02631C586C@apple.com> Message-ID: <200810230740.17736.baldrick@free.fr> PS: I debugged this directly on tramp3d-v4 rather than reducing a testcase. I can try to reduce a testcase if you like. From tonic at nondot.org Thu Oct 23 00:44:06 2008 From: tonic at nondot.org (Tanya Lattner) Date: Thu, 23 Oct 2008 05:44:06 -0000 Subject: [llvm-commits] [llvm] r58033 - in /llvm/branches/release_24: autoconf/configure.ac configure test/Bindings/Ocaml/analysis.ml test/Bindings/Ocaml/bitreader.ml test/Bindings/Ocaml/bitwriter.ml test/Bindings/Ocaml/executionengine.ml test/Bindings/Ocaml/scalar_opts.ml test/Bindings/Ocaml/target.ml test/Bindings/Ocaml/vmcore.ml Message-ID: <200810230544.m9N5i6gZ007728@zion.cs.uiuc.edu> Author: tbrethou Date: Thu Oct 23 00:44:04 2008 New Revision: 58033 URL: http://llvm.org/viewvc/llvm-project?rev=58033&view=rev Log: Merge from mainline for PR2886. Modified: llvm/branches/release_24/autoconf/configure.ac llvm/branches/release_24/configure llvm/branches/release_24/test/Bindings/Ocaml/analysis.ml llvm/branches/release_24/test/Bindings/Ocaml/bitreader.ml llvm/branches/release_24/test/Bindings/Ocaml/bitwriter.ml llvm/branches/release_24/test/Bindings/Ocaml/executionengine.ml llvm/branches/release_24/test/Bindings/Ocaml/scalar_opts.ml llvm/branches/release_24/test/Bindings/Ocaml/target.ml llvm/branches/release_24/test/Bindings/Ocaml/vmcore.ml Modified: llvm/branches/release_24/autoconf/configure.ac URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_24/autoconf/configure.ac?rev=58033&r1=58032&r2=58033&view=diff ============================================================================== --- llvm/branches/release_24/autoconf/configure.ac (original) +++ llvm/branches/release_24/autoconf/configure.ac Thu Oct 23 00:44:04 2008 @@ -610,10 +610,10 @@ AC_PATH_PROG(RUNTEST, [runtest]) DJ_AC_PATH_TCLSH AC_PATH_PROG(ZIP, [zip]) -AC_PATH_PROGS(OCAMLC, [ocamlc.opt ocamlc]) -AC_PATH_PROGS(OCAMLOPT, [ocamlopt.opt ocamlopt]) -AC_PATH_PROGS(OCAMLDEP, [ocamldep.opt ocamldep]) -AC_PATH_PROGS(OCAMLDOC, [ocamldoc.opt ocamldoc]) +AC_PATH_PROGS(OCAMLC, [ocamlc]) +AC_PATH_PROGS(OCAMLOPT, [ocamlopt]) +AC_PATH_PROGS(OCAMLDEP, [ocamldep]) +AC_PATH_PROGS(OCAMLDOC, [ocamldoc]) dnl Determine if the linker supports the -R option. AC_LINK_USE_R Modified: llvm/branches/release_24/configure URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_24/configure?rev=58033&r1=58032&r2=58033&view=diff ============================================================================== --- llvm/branches/release_24/configure (original) +++ llvm/branches/release_24/configure Thu Oct 23 00:44:04 2008 @@ -8139,7 +8139,7 @@ fi -for ac_prog in ocamlc.opt ocamlc +for ac_prog in ocamlc do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -8184,7 +8184,7 @@ test -n "$OCAMLC" && break done -for ac_prog in ocamlopt.opt ocamlopt +for ac_prog in ocamlopt do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -8229,7 +8229,7 @@ test -n "$OCAMLOPT" && break done -for ac_prog in ocamldep.opt ocamldep +for ac_prog in ocamldep do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -8274,7 +8274,7 @@ test -n "$OCAMLDEP" && break done -for ac_prog in ocamldoc.opt ocamldoc +for ac_prog in ocamldoc do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 Modified: llvm/branches/release_24/test/Bindings/Ocaml/analysis.ml URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_24/test/Bindings/Ocaml/analysis.ml?rev=58033&r1=58032&r2=58033&view=diff ============================================================================== --- llvm/branches/release_24/test/Bindings/Ocaml/analysis.ml (original) +++ llvm/branches/release_24/test/Bindings/Ocaml/analysis.ml Thu Oct 23 00:44:04 2008 @@ -1,4 +1,4 @@ -(* RUN: %ocamlc -warn-error A llvm.cma llvm_analysis.cma %s -o %t +(* RUN: %ocamlc -warn-error A llvm.cma llvm_analysis.cma %s -o %t 2> /dev/null * RUN: ./%t %t.bc *) Modified: llvm/branches/release_24/test/Bindings/Ocaml/bitreader.ml URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_24/test/Bindings/Ocaml/bitreader.ml?rev=58033&r1=58032&r2=58033&view=diff ============================================================================== --- llvm/branches/release_24/test/Bindings/Ocaml/bitreader.ml (original) +++ llvm/branches/release_24/test/Bindings/Ocaml/bitreader.ml Thu Oct 23 00:44:04 2008 @@ -1,4 +1,4 @@ -(* RUN: %ocamlc -warn-error A llvm.cma llvm_bitreader.cma llvm_bitwriter.cma %s -o %t +(* RUN: %ocamlc -warn-error A llvm.cma llvm_bitreader.cma llvm_bitwriter.cma %s -o %t 2> /dev/null * RUN: ./%t %t.bc * RUN: llvm-dis < %t.bc | grep caml_int_ty *) Modified: llvm/branches/release_24/test/Bindings/Ocaml/bitwriter.ml URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_24/test/Bindings/Ocaml/bitwriter.ml?rev=58033&r1=58032&r2=58033&view=diff ============================================================================== --- llvm/branches/release_24/test/Bindings/Ocaml/bitwriter.ml (original) +++ llvm/branches/release_24/test/Bindings/Ocaml/bitwriter.ml Thu Oct 23 00:44:04 2008 @@ -1,4 +1,4 @@ -(* RUN: %ocamlc -warn-error A llvm.cma llvm_bitwriter.cma %s -o %t +(* RUN: %ocamlc -warn-error A llvm.cma llvm_bitwriter.cma %s -o %t 2> /dev/null * RUN: ./%t %t.bc * RUN: llvm-dis < %t.bc | grep caml_int_ty *) Modified: llvm/branches/release_24/test/Bindings/Ocaml/executionengine.ml URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_24/test/Bindings/Ocaml/executionengine.ml?rev=58033&r1=58032&r2=58033&view=diff ============================================================================== --- llvm/branches/release_24/test/Bindings/Ocaml/executionengine.ml (original) +++ llvm/branches/release_24/test/Bindings/Ocaml/executionengine.ml Thu Oct 23 00:44:04 2008 @@ -1,4 +1,4 @@ -(* RUN: %ocamlc -warn-error A llvm.cma llvm_target.cma llvm_executionengine.cma %s -o %t +(* RUN: %ocamlc -warn-error A llvm.cma llvm_target.cma llvm_executionengine.cma %s -o %t 2> /dev/null * RUN: ./%t %t.bc *) Modified: llvm/branches/release_24/test/Bindings/Ocaml/scalar_opts.ml URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_24/test/Bindings/Ocaml/scalar_opts.ml?rev=58033&r1=58032&r2=58033&view=diff ============================================================================== --- llvm/branches/release_24/test/Bindings/Ocaml/scalar_opts.ml (original) +++ llvm/branches/release_24/test/Bindings/Ocaml/scalar_opts.ml Thu Oct 23 00:44:04 2008 @@ -1,4 +1,4 @@ -(* RUN: %ocamlc -warn-error A llvm.cma llvm_scalar_opts.cma llvm_target.cma %s -o %t +(* RUN: %ocamlc -warn-error A llvm.cma llvm_scalar_opts.cma llvm_target.cma %s -o %t 2> /dev/null *) (* Note: It takes several seconds for ocamlc to link an executable with Modified: llvm/branches/release_24/test/Bindings/Ocaml/target.ml URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_24/test/Bindings/Ocaml/target.ml?rev=58033&r1=58032&r2=58033&view=diff ============================================================================== --- llvm/branches/release_24/test/Bindings/Ocaml/target.ml (original) +++ llvm/branches/release_24/test/Bindings/Ocaml/target.ml Thu Oct 23 00:44:04 2008 @@ -1,4 +1,4 @@ -(* RUN: %ocamlc -warn-error A llvm.cma llvm_target.cma %s -o %t +(* RUN: %ocamlc -warn-error A llvm.cma llvm_target.cma %s -o %t 2> /dev/null *) (* Note: It takes several seconds for ocamlc to link an executable with Modified: llvm/branches/release_24/test/Bindings/Ocaml/vmcore.ml URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_24/test/Bindings/Ocaml/vmcore.ml?rev=58033&r1=58032&r2=58033&view=diff ============================================================================== --- llvm/branches/release_24/test/Bindings/Ocaml/vmcore.ml (original) +++ llvm/branches/release_24/test/Bindings/Ocaml/vmcore.ml Thu Oct 23 00:44:04 2008 @@ -1,4 +1,4 @@ -(* RUN: %ocamlc -warn-error A llvm.cma llvm_analysis.cma llvm_bitwriter.cma %s -o %t +(* RUN: %ocamlc -warn-error A llvm.cma llvm_analysis.cma llvm_bitwriter.cma %s -o %t 2> /dev/null * RUN: ./%t %t.bc * RUN: llvm-dis < %t.bc > %t.ll *) From isanbard at gmail.com Thu Oct 23 01:04:05 2008 From: isanbard at gmail.com (Bill Wendling) Date: Thu, 23 Oct 2008 06:04:05 -0000 Subject: [llvm-commits] [llvm] r58036 - /llvm/tags/Apple/llvmCore-2077.1/ Message-ID: <200810230604.m9N645Cg008389@zion.cs.uiuc.edu> Author: void Date: Thu Oct 23 01:04:05 2008 New Revision: 58036 URL: http://llvm.org/viewvc/llvm-project?rev=58036&view=rev Log: Creating llvmCore-2077.1 based on llvmCore-2077 Added: llvm/tags/Apple/llvmCore-2077.1/ - copied from r58035, llvm/tags/Apple/llvmCore-2077/ From isanbard at gmail.com Thu Oct 23 01:05:49 2008 From: isanbard at gmail.com (Bill Wendling) Date: Thu, 23 Oct 2008 06:05:49 -0000 Subject: [llvm-commits] [llvm-gcc-4.2] r58037 - in /llvm-gcc-4.2/tags/Apple/llvmgcc42-2077.1: ./ gcc/llvm-backend.cpp Message-ID: <200810230605.m9N65nTC008446@zion.cs.uiuc.edu> Author: void Date: Thu Oct 23 01:05:49 2008 New Revision: 58037 URL: http://llvm.org/viewvc/llvm-project?rev=58037&view=rev Log: Creating llvmgcc42-2077.1. Disabling read attributes pass. Added: llvm-gcc-4.2/tags/Apple/llvmgcc42-2077.1/ - copied from r57689, llvm-gcc-4.2/tags/Apple/llvmgcc42-2077/ Modified: llvm-gcc-4.2/tags/Apple/llvmgcc42-2077.1/gcc/llvm-backend.cpp Modified: llvm-gcc-4.2/tags/Apple/llvmgcc42-2077.1/gcc/llvm-backend.cpp URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/tags/Apple/llvmgcc42-2077.1/gcc/llvm-backend.cpp?rev=58037&r1=57689&r2=58037&view=diff ============================================================================== --- llvm-gcc-4.2/tags/Apple/llvmgcc42-2077.1/gcc/llvm-backend.cpp (original) +++ llvm-gcc-4.2/tags/Apple/llvmgcc42-2077.1/gcc/llvm-backend.cpp Thu Oct 23 01:05:49 2008 @@ -408,7 +408,9 @@ if (flag_unit_at_a_time) { if (flag_exceptions) PM->add(createPruneEHPass()); // Remove dead EH info +#if 0 PM->add(createAddReadAttrsPass()); // Set readonly/readnone attrs +#endif } if (flag_inline_trees > 1) // respect -fno-inline-functions PM->add(createFunctionInliningPass()); // Inline small functions From baldrick at free.fr Thu Oct 23 01:18:45 2008 From: baldrick at free.fr (Duncan Sands) Date: Thu, 23 Oct 2008 08:18:45 +0200 Subject: [llvm-commits] [llvm-gcc-4.2] r58037 - in /llvm-gcc-4.2/tags/Apple/llvmgcc42-2077.1: ./ gcc/llvm-backend.cpp In-Reply-To: <200810230605.m9N65nTC008446@zion.cs.uiuc.edu> References: <200810230605.m9N65nTC008446@zion.cs.uiuc.edu> Message-ID: <200810230818.45844.baldrick@free.fr> > Creating llvmgcc42-2077.1. Disabling read attributes pass. Is this PR965? Ciao, Duncan. From evan.cheng at apple.com Thu Oct 23 02:02:39 2008 From: evan.cheng at apple.com (Evan Cheng) Date: Thu, 23 Oct 2008 00:02:39 -0700 Subject: [llvm-commits] [llvm-gcc-4.2] r58037 - in /llvm-gcc-4.2/tags/Apple/llvmgcc42-2077.1: ./ gcc/llvm-backend.cpp In-Reply-To: <200810230818.45844.baldrick@free.fr> References: <200810230605.m9N65nTC008446@zion.cs.uiuc.edu> <200810230818.45844.baldrick@free.fr> Message-ID: It's not. We haven't determined what optimization pass is causing a miscompilation with the pass turned on. Do you know what passed are using these attributes? Evan On Oct 22, 2008, at 11:18 PM, Duncan Sands wrote: >> Creating llvmgcc42-2077.1. Disabling read attributes pass. > > Is this PR965? > > Ciao, > > Duncan. > _______________________________________________ > llvm-commits mailing list > llvm-commits at cs.uiuc.edu > http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits From baldrick at free.fr Thu Oct 23 02:25:52 2008 From: baldrick at free.fr (Duncan Sands) Date: Thu, 23 Oct 2008 09:25:52 +0200 Subject: [llvm-commits] [llvm-gcc-4.2] r58037 - in /llvm-gcc-4.2/tags/Apple/llvmgcc42-2077.1: ./ gcc/llvm-backend.cpp In-Reply-To: References: <200810230605.m9N65nTC008446@zion.cs.uiuc.edu> <200810230818.45844.baldrick@free.fr> Message-ID: <200810230925.52416.baldrick@free.fr> Hi Evan, > It's not. We haven't determined what optimization pass is causing a > miscompilation with the pass turned on. Do you know what passed are > using these attributes? anything that uses alias analysis. The attributes are also used to determine whether a call is trivially dead. The inliner makes use of these attributes to determine whether it needs to create a temporary and memcpy when inlining a function with a "byval" parameter. Ciao, Duncan. From tomas.l.olsen at gmail.com Thu Oct 23 05:40:28 2008 From: tomas.l.olsen at gmail.com (Tomas Lindquist Olsen) Date: Thu, 23 Oct 2008 12:40:28 +0200 Subject: [llvm-commits] [llvm] r57925 - in /llvm/trunk: lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp test/CodeGen/X86/pr2924.ll In-Reply-To: <0C87DECA-B4E5-4551-8FCB-7AEA6A3635B0@apple.com> References: <200810212000.m9LK0h2U028185@zion.cs.uiuc.edu> <7aa9f8a40810220115v487c513ci764df9b5b5fcb947@mail.gmail.com> <5DC7C5AE-B73C-4A03-8AEF-7141F5F71425@apple.com> <7aa9f8a40810221040le686004ja4e70227fb503495@mail.gmail.com> <0C87DECA-B4E5-4551-8FCB-7AEA6A3635B0@apple.com> Message-ID: <7aa9f8a40810230340t78fa339bs43f4af0c2edacbd9@mail.gmail.com> On Thu, Oct 23, 2008 at 7:06 AM, Tanya Lattner wrote: > Chris is 100% correct. We don't merge in patches at this point that are not > regressions in llvm-test or dejanu checks from 2.3. I'll be detailing this > in a release policy document for 2.5. Because there is some confusion on the > issue, I've merged this into 2.4, but this would not normally meet our > criteria. > We have to draw the line at some point or we would never get out a release. > With every patch we merge in there is risk associated with it and requires a > full run of the test suite on all the platforms we support. We try very hard > to have high quality releases, so you can understand why we are > conservative. > > -Tanya > > On Oct 22, 2008, at 10:40 AM, Tomas Lindquist Olsen wrote: > > > > On Wed, Oct 22, 2008 at 7:23 PM, Chris Lattner wrote: > >> >> On Oct 22, 2008, at 1:15 AM, Tomas Lindquist Olsen wrote: >> >> On Tue, Oct 21, 2008 at 10:00 PM, Dan Gohman wrote: >> >>> Author: djg >>> Date: Tue Oct 21 15:00:42 2008 >>> New Revision: 57925 >>> >>> URL: http://llvm.org/viewvc/llvm-project?rev=57925&view=rev >>> Log: >>> Fix SelectionDAGBuild lowering of Select instructions to >>> handle first-class aggregate values. Also, fix a bug in >>> the Ret handling for empty aggregates. >>> >>> Added: >>> llvm/trunk/test/CodeGen/X86/pr2924.ll >>> Modified: >>> llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp >>> >>> >> Any chance this will make it into the 2.4 branch ? >> >> >> If you have an example of C code that worked with llvm-gcc in 2.3 but that >> fails with llvm-gcc in 2.4, then it would be a regression and yes we would >> want to pull it in. Otherwise unfortunately we shouldn't pull it in. >> >> -Chris >> >> _______________________________________________ >> llvm-commits mailing list >> llvm-commits at cs.uiuc.edu >> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits >> >> > Ok :( > > I don't have llvm-gcc, this code is generated by my D compiler. > > Using first class aggregates only started working after this fix (at least > when doing optimizations, which is what produces the select inst) > > Sounds like we won't be able to support the 2.4 release. Oh well... > > If I do find some time for it, what kind of C/C++ code would I write to > generate something that produces first class aggregates ? > _______________________________________________ > llvm-commits mailing list > llvm-commits at cs.uiuc.edu > http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits > > > > _______________________________________________ > llvm-commits mailing list > llvm-commits at cs.uiuc.edu > http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits > > First, thanx a lot for making the exception :) About the reason that I was asking for this in the first place, I dont't think I was clear enough on why it was important.... The thing is we don't generate the select, it's produced by one of the LLVM optimization passes (it was fixed so fast I never found out which one, rather just updated llvm). Our unoptimized LLVM code codegen'd as it should, but after optimization the select would be there and break codegen, so we could have lived without it, if we could live without optimizations... The other option would have been to revert my changes that introduced these FCA's, but they're needed as part of my work on following the D calling convention / ABI. I hope this is a bit more clear... I can fully understand the reasons for not merging in every fix, from working on our own compiler, I've seen how a seemingly small change can break lots of code that you would never have thought was even affected. Thanx again for merging it in. -Tomas -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20081023/1ac98821/attachment.html From nicolas.geoffray at lip6.fr Thu Oct 23 10:06:09 2008 From: nicolas.geoffray at lip6.fr (Nicolas Geoffray) Date: Thu, 23 Oct 2008 17:06:09 +0200 Subject: [llvm-commits] Thread local storage support in the JIT In-Reply-To: <48FE32C3.3010501@lip6.fr> References: <48FE32C3.3010501@lip6.fr> Message-ID: <490092E1.6050909@lip6.fr> Hi everyone, Here's a new patch that moves tls memory allocation to TargetJITInfo instead of the ExecutionEngine. It's a cleaner implementation since each target may have its own way of allocating tls variables. Nicolas Nicolas Geoffray wrote: > Hi everyone, > > This patch enables thread local storage in JIT/Interpreter > environments (on linux/x86). It does 2 things: > > - The emission of thread local global variables by giving it an offset > in the thread local register (ie SG). > - The code generation of thread local global variable loads and stores. > > What do you guys think? > > Thanks, > Nicolas > ------------------------------------------------------------------------ > > _______________________________________________ > llvm-commits mailing list > llvm-commits at cs.uiuc.edu > http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits -------------- next part -------------- A non-text attachment was scrubbed... Name: jit-tls.patch Type: text/x-patch Size: 9894 bytes Desc: not available Url : http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20081023/92e23b87/attachment.bin From jlerouge at apple.com Thu Oct 23 11:22:19 2008 From: jlerouge at apple.com (Julien Lerouge) Date: Thu, 23 Oct 2008 09:22:19 -0700 Subject: [llvm-commits] [llvm] r57989 - in /llvm/trunk: include/llvm/Bitcode/ReaderWriter.h lib/Bitcode/Writer/BitcodeWriter.cpp lib/Bitcode/Writer/BitcodeWriterPass.cpp In-Reply-To: <200810221739.m9MHdE2d017690@zion.cs.uiuc.edu> References: <200810221739.m9MHdE2d017690@zion.cs.uiuc.edu> Message-ID: <20081023162219.GA54677@pom.apple.com> On Wed, Oct 22, 2008 at 05:39:14PM +0000, Daniel Dunbar wrote: > ... > > ============================================================================== > --- llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp (original) > +++ llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp Wed Oct 22 12:39:14 2008 > @@ -1356,7 +1364,7 @@ > > > // If writing to stdout, set binary mode. > - if (llvm::cout == Out) > + if (&llvm::outs() == &Out) > sys::Program::ChangeStdoutToBinary(); > > // Write the generated bitstream to "Out". > > ... > This breaks stdout output on MingW if using the old WriteBitcodeToFile API. In that case, the test doesn't work because it's comparing the address of the raw_stdout_ostream static with the address of a local object (allocated in the older API). In the older API, can you add a test for cout and return the same static if writing to stdout ? Or directly call ChangeStdoutToBinary in the older API if llvm::cout == Out ? Thanks, Julien MW $ llvm-as -f foo.ll > foo.bc MW $ llvm-dis -f foo.bc C:\llvm\bin\llvm-dis: Invalid bitcode signature MW $ but: MW $ llvm-as -f foo.ll -o foo.bc MW $ llvm-dis -f foo.bc MW $ -- Julien Lerouge PGP Key Id: 0xB1964A62 PGP Fingerprint: 392D 4BAD DB8B CE7F 4E5F FA3C 62DB 4AA7 B196 4A62 PGP Public Key from: keyserver.pgp.com From tonic at nondot.org Thu Oct 23 11:29:07 2008 From: tonic at nondot.org (Tanya Lattner) Date: Thu, 23 Oct 2008 16:29:07 -0000 Subject: [llvm-commits] [llvm] r58038 - /llvm/branches/release_24/test/Linker/2008-07-06-AliasWeakDest.ll Message-ID: <200810231629.m9NGT8rN005993@zion.cs.uiuc.edu> Author: tbrethou Date: Thu Oct 23 11:29:04 2008 New Revision: 58038 URL: http://llvm.org/viewvc/llvm-project?rev=58038&view=rev Log: Merge from mainline. This test was fixed. Modified: llvm/branches/release_24/test/Linker/2008-07-06-AliasWeakDest.ll Modified: llvm/branches/release_24/test/Linker/2008-07-06-AliasWeakDest.ll URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_24/test/Linker/2008-07-06-AliasWeakDest.ll?rev=58038&r1=58037&r2=58038&view=diff ============================================================================== --- llvm/branches/release_24/test/Linker/2008-07-06-AliasWeakDest.ll (original) +++ llvm/branches/release_24/test/Linker/2008-07-06-AliasWeakDest.ll Thu Oct 23 11:29:04 2008 @@ -4,8 +4,6 @@ ; RUN: llvm-link %t1.bc %t2.bc -f -o %t3.bc ; RUN: llvm-link %t2.bc %t1.bc -f -o %t4.bc -; XFAIL: * - target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:32:32" target triple = "i386-pc-linux-gnu" From dpatel at apple.com Thu Oct 23 11:41:34 2008 From: dpatel at apple.com (Devang Patel) Date: Thu, 23 Oct 2008 09:41:34 -0700 Subject: [llvm-commits] [llvm-gcc-4.2] r57992 - /llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp In-Reply-To: <200810230740.17736.baldrick@free.fr> References: <200810221814.m9MIEY6K018726@zion.cs.uiuc.edu> <6F553805-9B78-4D82-8C2C-CD02631C586C@apple.com> <200810230740.17736.baldrick@free.fr> Message-ID: <0478FA7B-02BA-44DC-8DC9-2BC5E116569F@apple.com> On Oct 22, 2008, at 10:40 PM, Duncan Sands wrote: > PS: I debugged this directly on tramp3d-v4 rather > than reducing a testcase. I can try to reduce a > testcase if you like. I reduced test case in testsuite will help us avoid debugging tramp3d- v4 directly again in future :) - Devang From akyrtzi at gmail.com Thu Oct 23 12:20:42 2008 From: akyrtzi at gmail.com (Argiris Kirtzidis) Date: Thu, 23 Oct 2008 17:20:42 -0000 Subject: [llvm-commits] [llvm] r58039 - /llvm/trunk/include/llvm/Support/DataTypes.h.in Message-ID: <200810231720.m9NHKgtj007962@zion.cs.uiuc.edu> Author: akirtzidis Date: Thu Oct 23 12:20:39 2008 New Revision: 58039 URL: http://llvm.org/viewvc/llvm-project?rev=58039&view=rev Log: Introduce INT64_C macro and unbreak LLVM on MSVC. Modified: llvm/trunk/include/llvm/Support/DataTypes.h.in Modified: llvm/trunk/include/llvm/Support/DataTypes.h.in URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/DataTypes.h.in?rev=58039&r1=58038&r2=58039&view=diff ============================================================================== --- llvm/trunk/include/llvm/Support/DataTypes.h.in (original) +++ llvm/trunk/include/llvm/Support/DataTypes.h.in Thu Oct 23 12:20:39 2008 @@ -105,6 +105,9 @@ #define INT32_MAX 2147483647 #define INT32_MIN -2147483648 #define UINT32_MAX 4294967295U +#if !defined(INT64_C) +# define INT64_C(val) val##LL +#endif #endif /* _MSC_VER */ /* Set defaults for constants which we cannot find. */ From baldrick at free.fr Thu Oct 23 14:34:24 2008 From: baldrick at free.fr (Duncan Sands) Date: Thu, 23 Oct 2008 19:34:24 -0000 Subject: [llvm-commits] [llvm] r58041 - in /llvm/trunk/lib/CodeGen/SelectionDAG: LegalizeFloatTypes.cpp LegalizeIntegerTypes.cpp Message-ID: <200810231934.m9NJYO2a013176@zion.cs.uiuc.edu> Author: baldrick Date: Thu Oct 23 14:34:23 2008 New Revision: 58041 URL: http://llvm.org/viewvc/llvm-project?rev=58041&view=rev Log: Fix thinko - the operand number has nothing to do with the result number. Modified: llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeFloatTypes.cpp llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp Modified: llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeFloatTypes.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeFloatTypes.cpp?rev=58041&r1=58040&r2=58041&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeFloatTypes.cpp (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeFloatTypes.cpp Thu Oct 23 14:34:23 2008 @@ -799,7 +799,7 @@ if (TLI.getOperationAction(N->getOpcode(), N->getOperand(OpNo).getValueType()) == TargetLowering::Custom) - Res = TLI.LowerOperation(SDValue(N, OpNo), DAG); + Res = TLI.LowerOperation(SDValue(N, 0), DAG); if (Res.getNode() == 0) { switch (N->getOpcode()) { Modified: llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp?rev=58041&r1=58040&r2=58041&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp Thu Oct 23 14:34:23 2008 @@ -572,7 +572,7 @@ if (TLI.getOperationAction(N->getOpcode(), N->getOperand(OpNo).getValueType()) == TargetLowering::Custom) - Res = TLI.LowerOperation(SDValue(N, OpNo), DAG); + Res = TLI.LowerOperation(SDValue(N, 0), DAG); if (Res.getNode() == 0) { switch (N->getOpcode()) { @@ -1856,7 +1856,7 @@ if (TLI.getOperationAction(N->getOpcode(), N->getOperand(OpNo).getValueType()) == TargetLowering::Custom) - Res = TLI.LowerOperation(SDValue(N, OpNo), DAG); + Res = TLI.LowerOperation(SDValue(N, 0), DAG); if (Res.getNode() == 0) { switch (N->getOpcode()) { From daniel at zuster.org Thu Oct 23 14:37:35 2008 From: daniel at zuster.org (Daniel Dunbar) Date: Thu, 23 Oct 2008 19:37:35 -0000 Subject: [llvm-commits] [llvm] r58042 - /llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp Message-ID: <200810231937.m9NJba5s013281@zion.cs.uiuc.edu> Author: ddunbar Date: Thu Oct 23 14:37:34 2008 New Revision: 58042 URL: http://llvm.org/viewvc/llvm-project?rev=58042&view=rev Log: Make sure to set stdout to binary when writing bitcode files via std::ostream API. Modified: llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp Modified: llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp?rev=58042&r1=58041&r2=58042&view=diff ============================================================================== --- llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp (original) +++ llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp Thu Oct 23 14:37:34 2008 @@ -1332,6 +1332,9 @@ /// stream. void llvm::WriteBitcodeToFile(const Module *M, std::ostream &Out) { raw_os_ostream RawOut(Out); + // If writing to stdout, set binary mode. + if (llvm::cout == Out) + sys::Program::ChangeStdoutToBinary(); WriteBitcodeToFile(M, RawOut); } From daniel at zuster.org Thu Oct 23 14:39:15 2008 From: daniel at zuster.org (Daniel Dunbar) Date: Thu, 23 Oct 2008 12:39:15 -0700 Subject: [llvm-commits] [llvm] r57989 - in /llvm/trunk: include/llvm/Bitcode/ReaderWriter.h lib/Bitcode/Writer/BitcodeWriter.cpp lib/Bitcode/Writer/BitcodeWriterPass.cpp In-Reply-To: <20081023162219.GA54677@pom.apple.com> References: <200810221739.m9MHdE2d017690@zion.cs.uiuc.edu> <20081023162219.GA54677@pom.apple.com> Message-ID: <6a8523d60810231239n555ce306g877bcca050c0a1ab@mail.gmail.com> Hi Julien, Sorry, I didn't think about this case. r58042 is a fix I believe, can you confirm? - Daniel On Thu, Oct 23, 2008 at 9:22 AM, Julien Lerouge wrote: > On Wed, Oct 22, 2008 at 05:39:14PM +0000, Daniel Dunbar wrote: > > ... > > > > > ============================================================================== > > --- llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp (original) > > +++ llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp Wed Oct 22 12:39:14 > 2008 > > @@ -1356,7 +1364,7 @@ > > > > > > // If writing to stdout, set binary mode. > > - if (llvm::cout == Out) > > + if (&llvm::outs() == &Out) > > sys::Program::ChangeStdoutToBinary(); > > > > // Write the generated bitstream to "Out". > > > > ... > > > > This breaks stdout output on MingW if using the old WriteBitcodeToFile > API. In that case, the test doesn't work because it's comparing the > address of the raw_stdout_ostream static with the address of a local > object (allocated in the older API). > > In the older API, can you add a test for cout and return the same static > if writing to stdout ? Or directly call ChangeStdoutToBinary in the > older API if llvm::cout == Out ? > > Thanks, > Julien > > MW $ llvm-as -f foo.ll > foo.bc > MW $ llvm-dis -f foo.bc > C:\llvm\bin\llvm-dis: Invalid bitcode signature > MW $ > > but: > > MW $ llvm-as -f foo.ll -o foo.bc > MW $ llvm-dis -f foo.bc > MW $ > > -- > Julien Lerouge > PGP Key Id: 0xB1964A62 > PGP Fingerprint: 392D 4BAD DB8B CE7F 4E5F FA3C 62DB 4AA7 B196 4A62 > PGP Public Key from: keyserver.pgp.com > _______________________________________________ > llvm-commits mailing list > llvm-commits at cs.uiuc.edu > http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits > -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20081023/c08b76f6/attachment.html From dalej at apple.com Thu Oct 23 15:41:29 2008 From: dalej at apple.com (Dale Johannesen) Date: Thu, 23 Oct 2008 20:41:29 -0000 Subject: [llvm-commits] [llvm] r58043 - in /llvm/trunk/lib/Target/PowerPC: PPCInstr64Bit.td PPCInstrInfo.td Message-ID: <200810232041.m9NKfTVt015487@zion.cs.uiuc.edu> Author: johannes Date: Thu Oct 23 15:41:28 2008 New Revision: 58043 URL: http://llvm.org/viewvc/llvm-project?rev=58043&view=rev Log: Mark defs and uses of CTR and LR correctly. Prevents DeadMachineInstructionElim from thinking things like MTCTR are dead (fixes massive testsuite breakage at -O0). Modified: llvm/trunk/lib/Target/PowerPC/PPCInstr64Bit.td llvm/trunk/lib/Target/PowerPC/PPCInstrInfo.td Modified: llvm/trunk/lib/Target/PowerPC/PPCInstr64Bit.td URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/PPCInstr64Bit.td?rev=58043&r1=58042&r2=58043&view=diff ============================================================================== --- llvm/trunk/lib/Target/PowerPC/PPCInstr64Bit.td (original) +++ llvm/trunk/lib/Target/PowerPC/PPCInstr64Bit.td Thu Oct 23 15:41:28 2008 @@ -76,10 +76,12 @@ def BLA8_Macho : IForm<18, 1, 1, (outs), (ins aaddr:$func, variable_ops), "bla $func", BrB, [(PPCcall_Macho (i64 imm:$func))]>; - def BCTRL8_Macho : XLForm_2_ext<19, 528, 20, 0, 1, + let Uses = [CTR8] in { + def BCTRL8_Macho : XLForm_2_ext<19, 528, 20, 0, 1, (outs), (ins variable_ops), "bctrl", BrB, [(PPCbctrl_Macho)]>, Requires<[In64BitMode]>; + } } // ELF 64 ABI Calls = Macho ABI Calls @@ -98,10 +100,12 @@ def BLA8_ELF : IForm<18, 1, 1, (outs), (ins aaddr:$func, variable_ops), "bla $func", BrB, [(PPCcall_ELF (i64 imm:$func))]>; - def BCTRL8_ELF : XLForm_2_ext<19, 528, 20, 0, 1, + let Uses = [CTR8] in { + def BCTRL8_ELF : XLForm_2_ext<19, 528, 20, 0, 1, (outs), (ins variable_ops), "bctrl", BrB, [(PPCbctrl_ELF)]>, Requires<[In64BitMode]>; + } } @@ -186,7 +190,7 @@ let isTerminator = 1, isBarrier = 1, PPC970_Unit = 7, isBranch = 1, - isIndirectBranch = 1, isCall = 1, isReturn = 1 in + isIndirectBranch = 1, isCall = 1, isReturn = 1, Uses = [CTR] in def TAILBCTR8 : XLForm_2_ext<19, 528, 20, 0, 0, (outs), (ins), "bctr", BrB, []>, Requires<[In64BitMode]>; @@ -218,10 +222,12 @@ //===----------------------------------------------------------------------===// // 64-bit SPR manipulation instrs. +let Uses = [CTR8] in { def MFCTR8 : XFXForm_1_ext<31, 339, 9, (outs G8RC:$rT), (ins), "mfctr $rT", SprMFSPR>, PPC970_DGroup_First, PPC970_Unit_FXU; -let Pattern = [(PPCmtctr G8RC:$rS)] in { +} +let Pattern = [(PPCmtctr G8RC:$rS)], Defs = [CTR8] in { def MTCTR8 : XFXForm_7_ext<31, 467, 9, (outs), (ins G8RC:$rS), "mtctr $rS", SprMTSPR>, PPC970_DGroup_First, PPC970_Unit_FXU; @@ -233,13 +239,16 @@ [(set G8RC:$result, (PPCdynalloc G8RC:$negsize, iaddr:$fpsi))]>; +let Defs = [LR8] in { def MTLR8 : XFXForm_7_ext<31, 467, 8, (outs), (ins G8RC:$rS), "mtlr $rS", SprMTSPR>, PPC970_DGroup_First, PPC970_Unit_FXU; +} +let Uses = [LR8] in { def MFLR8 : XFXForm_1_ext<31, 339, 8, (outs G8RC:$rT), (ins), "mflr $rT", SprMFSPR>, PPC970_DGroup_First, PPC970_Unit_FXU; - +} //===----------------------------------------------------------------------===// // Fixed point instructions. Modified: llvm/trunk/lib/Target/PowerPC/PPCInstrInfo.td URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/PPCInstrInfo.td?rev=58043&r1=58042&r2=58043&view=diff ============================================================================== --- llvm/trunk/lib/Target/PowerPC/PPCInstrInfo.td (original) +++ llvm/trunk/lib/Target/PowerPC/PPCInstrInfo.td Thu Oct 23 15:41:28 2008 @@ -385,11 +385,11 @@ "${:comment} SPILL_CR $cond $F", []>; let isTerminator = 1, isBarrier = 1, PPC970_Unit = 7 in { - let isReturn = 1 in + let isReturn = 1, Uses = [LR] in def BLR : XLForm_2_br<19, 16, 0, (outs), (ins pred:$p), "b${p:cc}lr ${p:reg}", BrB, [(retflag)]>; - let isBranch = 1, isIndirectBranch = 1 in + let isBranch = 1, isIndirectBranch = 1, Uses = [CTR] in def BCTR : XLForm_2_ext<19, 528, 20, 0, 0, (outs), (ins), "bctr", BrB, []>; } @@ -429,10 +429,12 @@ def BLA_Macho : IForm<18, 1, 1, (outs), (ins aaddr:$func, variable_ops), "bla $func", BrB, [(PPCcall_Macho (i32 imm:$func))]>; - def BCTRL_Macho : XLForm_2_ext<19, 528, 20, 0, 1, + let Uses = [CTR] in { + def BCTRL_Macho : XLForm_2_ext<19, 528, 20, 0, 1, (outs), (ins variable_ops), "bctrl", BrB, [(PPCbctrl_Macho)]>, Requires<[In32BitMode]>; + } } // ELF ABI Calls. @@ -453,10 +455,12 @@ (outs), (ins aaddr:$func, variable_ops), "bla $func", BrB, [(PPCcall_ELF (i32 imm:$func))]>; - def BCTRL_ELF : XLForm_2_ext<19, 528, 20, 0, 1, + let Uses = [CTR] in { + def BCTRL_ELF : XLForm_2_ext<19, 528, 20, 0, 1, (outs), (ins variable_ops), "bctrl", BrB, [(PPCbctrl_ELF)]>, Requires<[In32BitMode]>; + } } @@ -479,7 +483,7 @@ let isTerminator = 1, isBarrier = 1, PPC970_Unit = 7, isBranch = 1, - isIndirectBranch = 1, isCall = 1, isReturn = 1 in + isIndirectBranch = 1, isCall = 1, isReturn = 1, Uses = [CTR] in def TAILBCTR : XLForm_2_ext<19, 528, 20, 0, 0, (outs), (ins), "bctr", BrB, []>, Requires<[In32BitMode]>; @@ -1056,21 +1060,27 @@ // XFX-Form instructions. Instructions that deal with SPRs. // +let Uses = [CTR] in { def MFCTR : XFXForm_1_ext<31, 339, 9, (outs GPRC:$rT), (ins), "mfctr $rT", SprMFSPR>, PPC970_DGroup_First, PPC970_Unit_FXU; -let Pattern = [(PPCmtctr GPRC:$rS)] in { +} +let Defs = [CTR], Pattern = [(PPCmtctr GPRC:$rS)] in { def MTCTR : XFXForm_7_ext<31, 467, 9, (outs), (ins GPRC:$rS), "mtctr $rS", SprMTSPR>, PPC970_DGroup_First, PPC970_Unit_FXU; } +let Defs = [LR] in { def MTLR : XFXForm_7_ext<31, 467, 8, (outs), (ins GPRC:$rS), "mtlr $rS", SprMTSPR>, PPC970_DGroup_First, PPC970_Unit_FXU; +} +let Uses = [LR] in { def MFLR : XFXForm_1_ext<31, 339, 8, (outs GPRC:$rT), (ins), "mflr $rT", SprMFSPR>, PPC970_DGroup_First, PPC970_Unit_FXU; +} // Move to/from VRSAVE: despite being a SPR, the VRSAVE register is renamed like // a GPR on the PPC970. As such, copies in and out have the same performance From evan.cheng at apple.com Thu Oct 23 15:43:13 2008 From: evan.cheng at apple.com (Evan Cheng) Date: Thu, 23 Oct 2008 20:43:13 -0000 Subject: [llvm-commits] [llvm] r58044 - in /llvm/trunk: include/llvm/CodeGen/LiveIntervalAnalysis.h lib/CodeGen/PreAllocSplitting.cpp lib/CodeGen/RegAllocLinearScan.cpp Message-ID: <200810232043.m9NKhDqb015546@zion.cs.uiuc.edu> Author: evancheng Date: Thu Oct 23 15:43:13 2008 New Revision: 58044 URL: http://llvm.org/viewvc/llvm-project?rev=58044&view=rev Log: Committing a good chunk of the pre-register allocation live interval splitting pass. It's handling simple cases and appear to do good things. Next: avoid splitting an interval multiple times; renumber registers when possible; record stack slot live intervals for coloring; rematerialize defs when possible. Modified: llvm/trunk/include/llvm/CodeGen/LiveIntervalAnalysis.h llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp llvm/trunk/lib/CodeGen/RegAllocLinearScan.cpp Modified: llvm/trunk/include/llvm/CodeGen/LiveIntervalAnalysis.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/LiveIntervalAnalysis.h?rev=58044&r1=58043&r2=58044&view=diff ============================================================================== --- llvm/trunk/include/llvm/CodeGen/LiveIntervalAnalysis.h (original) +++ llvm/trunk/include/llvm/CodeGen/LiveIntervalAnalysis.h Thu Oct 23 15:43:13 2008 @@ -219,6 +219,39 @@ return i2miMap_[index]; } + /// hasGapBeforeInstr - Return true if the previous instruction slot, + /// i.e. Index - InstrSlots::NUM, is not occupied. + bool hasGapBeforeInstr(unsigned Index) { + Index = getBaseIndex(Index - InstrSlots::NUM); + return getInstructionFromIndex(Index) == 0; + } + + /// findGapBeforeInstr - Find an empty instruction slot before the + /// specified index. If "Furthest" is true, find one that's furthest + /// away from the index (but before any index that's occupied). + unsigned findGapBeforeInstr(unsigned Index, bool Furthest = false) { + Index = getBaseIndex(Index - InstrSlots::NUM); + if (getInstructionFromIndex(Index)) + return 0; // No gap! + if (!Furthest) + return Index; + unsigned PrevIndex = getBaseIndex(Index - InstrSlots::NUM); + while (getInstructionFromIndex(Index)) { + Index = PrevIndex; + PrevIndex = getBaseIndex(Index - InstrSlots::NUM); + } + return Index; + } + + /// InsertMachineInstrInMaps - Insert the specified machine instruction + /// into the instruction index map at the given index. + void InsertMachineInstrInMaps(MachineInstr *MI, unsigned Index) { + i2miMap_[Index / InstrSlots::NUM] = MI; + Mi2IndexMap::iterator it = mi2iMap_.find(MI); + assert(it == mi2iMap_.end() && "Already in map!"); + mi2iMap_[MI] = Index; + } + /// conflictsWithPhysRegDef - Returns true if the specified register /// is defined during the duration of the specified interval. bool conflictsWithPhysRegDef(const LiveInterval &li, VirtRegMap &vrm, Modified: llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp?rev=58044&r1=58043&r2=58044&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp (original) +++ llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp Thu Oct 23 15:43:13 2008 @@ -16,29 +16,51 @@ #define DEBUG_TYPE "pre-alloc-split" #include "llvm/CodeGen/LiveIntervalAnalysis.h" +#include "llvm/CodeGen/MachineFrameInfo.h" #include "llvm/CodeGen/MachineFunctionPass.h" #include "llvm/CodeGen/MachineLoopInfo.h" #include "llvm/CodeGen/MachineRegisterInfo.h" #include "llvm/CodeGen/Passes.h" #include "llvm/CodeGen/RegisterCoalescer.h" +#include "llvm/Target/TargetInstrInfo.h" #include "llvm/Target/TargetMachine.h" #include "llvm/Target/TargetOptions.h" #include "llvm/Target/TargetRegisterInfo.h" #include "llvm/Support/CommandLine.h" #include "llvm/Support/Debug.h" -#include "llvm/ADT/PostOrderIterator.h" #include "llvm/ADT/SmallPtrSet.h" +#include "llvm/ADT/Statistic.h" +#include using namespace llvm; +STATISTIC(NumSplit , "Number of intervals split"); + namespace { class VISIBILITY_HIDDEN PreAllocSplitting : public MachineFunctionPass { - // ProcessedBarriers - Register live interval barriers that have already - // been processed. - SmallPtrSet ProcessedBarriers; - - // ActiveBarriers - Register live interval barriers that are currently - // being processed. - SmallSet ActiveBarriers; + MachineFunction *CurMF; + const TargetMachine *TM; + const TargetInstrInfo *TII; + MachineFrameInfo *MFI; + MachineRegisterInfo *MRI; + LiveIntervals *LIs; + + // Barrier - Current barrier being processed. + MachineInstr *Barrier; + + // BarrierMBB - Basic block where the barrier resides in. + MachineBasicBlock *BarrierMBB; + + // Barrier - Current barrier index. + unsigned BarrierIdx; + + // CurrLI - Current live interval being split. + LiveInterval *CurrLI; + + // LIValNoSSMap - A map from live interval and val# pairs to spill slots. + // This records what live interval's val# has been split and what spill + // slot was used. + std::map, int> LIValNoSSMap; + public: static char ID; PreAllocSplitting() : MachineFunctionPass(&ID) {} @@ -48,24 +70,60 @@ virtual void getAnalysisUsage(AnalysisUsage &AU) const { AU.addRequired(); AU.addPreserved(); - AU.addPreserved(); AU.addPreserved(); if (StrongPHIElim) AU.addPreservedID(StrongPHIEliminationID); else AU.addPreservedID(PHIEliminationID); - AU.addPreservedID(TwoAddressInstructionPassID); MachineFunctionPass::getAnalysisUsage(AU); } virtual void releaseMemory() { - ProcessedBarriers.clear(); - ActiveBarriers.clear(); + LIValNoSSMap.clear(); } virtual const char *getPassName() const { return "Pre-Register Allocaton Live Interval Splitting"; } + + /// print - Implement the dump method. + virtual void print(std::ostream &O, const Module* M = 0) const { + LIs->print(O, M); + } + + void print(std::ostream *O, const Module* M = 0) const { + if (O) print(*O, M); + } + + private: + MachineBasicBlock::iterator + findNextEmptySlot(MachineBasicBlock*, MachineInstr*, + unsigned&); + + MachineBasicBlock::iterator + findSpillPoint(MachineBasicBlock*, MachineInstr*, + SmallPtrSet&, unsigned&); + + MachineBasicBlock::iterator + findRestorePoint(MachineBasicBlock*, MachineInstr*, + SmallPtrSet&, unsigned&); + + void RecordSplit(unsigned, unsigned, unsigned, int); + + bool isAlreadySplit(unsigned, unsigned, int&); + + void UpdateIntervalForSplit(VNInfo*, unsigned, unsigned); + + bool ShrinkWrapToLastUse(MachineBasicBlock*, + std::vector&); + + void ShrinkWrapLiveInterval(VNInfo*, MachineBasicBlock*, + MachineBasicBlock*, SmallPtrSet&, + DenseMap >&); + + bool SplitRegLiveInterval(LiveInterval*); + + bool SplitRegLiveIntervals(const TargetRegisterClass **); }; } // end anonymous namespace @@ -76,6 +134,507 @@ const PassInfo *const llvm::PreAllocSplittingID = &X; + +/// findNextEmptySlot - Find a gap after the given machine instruction in the +/// instruction index map. If there isn't one, return end(). +MachineBasicBlock::iterator +PreAllocSplitting::findNextEmptySlot(MachineBasicBlock *MBB, MachineInstr *MI, + unsigned &SpotIndex) { + MachineBasicBlock::iterator MII = MI; + if (++MII != MBB->end()) { + unsigned Index = LIs->findGapBeforeInstr(LIs->getInstructionIndex(MII)); + if (Index) { + SpotIndex = Index; + return MII; + } + } + return MBB->end(); +} + +/// findSpillPoint - Find a gap as far away from the given MI that's suitable +/// for spilling the current live interval. The index must be before any +/// defs and uses of the live interval register in the mbb. Return begin() if +/// none is found. +MachineBasicBlock::iterator +PreAllocSplitting::findSpillPoint(MachineBasicBlock *MBB, MachineInstr *MI, + SmallPtrSet &RefsInMBB, + unsigned &SpillIndex) { + MachineBasicBlock::iterator Pt = MBB->begin(); + + // Go top down if RefsInMBB is empty. + if (RefsInMBB.empty()) { + MachineBasicBlock::iterator MII = MBB->begin(); + MachineBasicBlock::iterator EndPt = MI; + do { + ++MII; + unsigned Index = LIs->getInstructionIndex(MII); + unsigned Gap = LIs->findGapBeforeInstr(Index); + if (Gap) { + Pt = MII; + SpillIndex = Gap; + break; + } + } while (MII != EndPt); + } else { + MachineBasicBlock::iterator MII = MI; + while (MII != MBB->begin() && !RefsInMBB.count(MII)) { + unsigned Index = LIs->getInstructionIndex(MII); + if (LIs->hasGapBeforeInstr(Index)) { + Pt = MII; + SpillIndex = LIs->findGapBeforeInstr(Index, true); + } + --MII; + } + } + + return Pt; +} + +/// findRestorePoint - Find a gap in the instruction index map that's suitable +/// for restoring the current live interval value. The index must be before any +/// uses of the live interval register in the mbb. Return end() if none is +/// found. +MachineBasicBlock::iterator +PreAllocSplitting::findRestorePoint(MachineBasicBlock *MBB, MachineInstr *MI, + SmallPtrSet &RefsInMBB, + unsigned &RestoreIndex) { + MachineBasicBlock::iterator Pt = MBB->end(); + + // Go bottom up if RefsInMBB is empty. + if (RefsInMBB.empty()) { + MachineBasicBlock::iterator MII = MBB->end(); + MachineBasicBlock::iterator EndPt = MI; + do { + --MII; + unsigned Index = LIs->getInstructionIndex(MII); + unsigned Gap = LIs->hasGapBeforeInstr(Index); + if (Gap) { + Pt = MII; + RestoreIndex = Gap; + break; + } + } while (MII != EndPt); + } else { + MachineBasicBlock::iterator MII = MI; + MII = ++MII; + while (MII != MBB->end()) { + unsigned Index = LIs->getInstructionIndex(MII); + unsigned Gap = LIs->findGapBeforeInstr(Index); + if (Gap) { + Pt = MII; + RestoreIndex = Gap; + } + if (RefsInMBB.count(MII)) + break; + ++MII; + } + } + + return Pt; +} + +/// RecordSplit - Given a register live interval is split, remember the spill +/// slot where the val#s are in. +void PreAllocSplitting::RecordSplit(unsigned Reg, unsigned SpillIndex, + unsigned RestoreIndex, int SS) { + LiveInterval::iterator LR = + CurrLI->FindLiveRangeContaining(LIs->getUseIndex(SpillIndex)); + LIValNoSSMap.insert(std::make_pair(std::make_pair(CurrLI->reg, LR->valno->id), + SS)); + LR = CurrLI->FindLiveRangeContaining(LIs->getDefIndex(RestoreIndex)); + LIValNoSSMap.insert(std::make_pair(std::make_pair(CurrLI->reg, LR->valno->id), + SS)); +} + +/// isAlreadySplit - Return if a given val# of a register live interval is already +/// split. Also return by reference the spill stock where the value is. +bool PreAllocSplitting::isAlreadySplit(unsigned Reg, unsigned ValNoId, int &SS){ + std::map, int>::iterator I = + LIValNoSSMap.find(std::make_pair(Reg, ValNoId)); + if (I == LIValNoSSMap.end()) + return false; + SS = I->second; + return true; +} + +/// UpdateIntervalForSplit - Given the specified val# of the current live +/// interval is being split, and the split and rejoin indices, update the live +/// interval accordingly. +void +PreAllocSplitting::UpdateIntervalForSplit(VNInfo *ValNo, unsigned SplitIndex, + unsigned JoinIndex) { + SmallVector, 4> Before; + SmallVector, 4> After; + SmallVector BeforeKills; + SmallVector AfterKills; + SmallPtrSet Processed; + + // First, let's figure out which parts of the live interval is now defined + // by the restore, which are defined by the original definition. + const LiveRange *LR = CurrLI->getLiveRangeContaining(JoinIndex); + After.push_back(std::make_pair(JoinIndex, LR->end)); + assert(LR->contains(SplitIndex)); + Before.push_back(std::make_pair(LR->start, SplitIndex)); + BeforeKills.push_back(SplitIndex); + Processed.insert(LR); + + SmallVector WorkList; + MachineBasicBlock *MBB = LIs->getMBBFromIndex(LR->end-1); + for (MachineBasicBlock::succ_iterator SI = MBB->succ_begin(), + SE = MBB->succ_end(); SI != SE; ++SI) + WorkList.push_back(*SI); + + while (!WorkList.empty()) { + MBB = WorkList.back(); + WorkList.pop_back(); + unsigned Idx = LIs->getMBBStartIdx(MBB); + LR = CurrLI->getLiveRangeContaining(Idx); + if (LR && LR->valno == ValNo && !Processed.count(LR)) { + After.push_back(std::make_pair(LR->start, LR->end)); + if (CurrLI->isKill(ValNo, LR->end)) + AfterKills.push_back(LR->end); + Idx = LIs->getMBBEndIdx(MBB); + if (LR->end > Idx) { + for (MachineBasicBlock::succ_iterator SI = MBB->succ_begin(), + SE = MBB->succ_end(); SI != SE; ++SI) + WorkList.push_back(*SI); + if (LR->end > Idx+1) { + MBB = LIs->getMBBFromIndex(LR->end-1); + for (MachineBasicBlock::succ_iterator SI = MBB->succ_begin(), + SE = MBB->succ_end(); SI != SE; ++SI) + WorkList.push_back(*SI); + } + } + Processed.insert(LR); + } + } + + for (LiveInterval::iterator I = CurrLI->begin(), E = CurrLI->end(); + I != E; ++I) { + LiveRange *LR = I; + if (LR->valno == ValNo && !Processed.count(LR)) { + Before.push_back(std::make_pair(LR->start, LR->end)); + if (CurrLI->isKill(ValNo, LR->end)) + BeforeKills.push_back(LR->end); + } + } + + // Now create new val#s to represent the live ranges defined by the old def + // those defined by the restore. + unsigned AfterDef = ValNo->def; + MachineInstr *AfterCopy = ValNo->copy; + bool HasPHIKill = ValNo->hasPHIKill; + CurrLI->removeValNo(ValNo); + VNInfo *BValNo = CurrLI->getNextValue(AfterDef, AfterCopy, + LIs->getVNInfoAllocator()); + VNInfo *AValNo = CurrLI->getNextValue(JoinIndex,0, LIs->getVNInfoAllocator()); + AValNo->hasPHIKill = HasPHIKill; + CurrLI->addKills(AValNo, AfterKills); + CurrLI->addKills(BValNo, BeforeKills); + + for (unsigned i = 0, e = Before.size(); i != e; ++i) { + unsigned Start = Before[i].first; + unsigned End = Before[i].second; + CurrLI->addRange(LiveRange(Start, End, BValNo)); + } + for (unsigned i = 0, e = After.size(); i != e; ++i) { + unsigned Start = After[i].first; + unsigned End = After[i].second; + CurrLI->addRange(LiveRange(Start, End, AValNo)); + } +} + +/// ShrinkWrapToLastUse - There are uses of the current live interval in the +/// given block, shrink wrap the live interval to the last use (i.e. remove +/// from last use to the end of the mbb). In case mbb is the where the barrier +/// is, remove from the last use to the barrier. +bool +PreAllocSplitting::ShrinkWrapToLastUse(MachineBasicBlock *MBB, + std::vector &Uses) { + MachineOperand *LastMO = 0; + MachineInstr *LastMI = 0; + if (MBB != BarrierMBB && Uses.size() == 1) { + // Single use, no need to traverse the block. We can't assume this for the + // barrier bb though since the use is probably below the barrier. + LastMO = Uses[0]; + LastMI = LastMO->getParent(); + } else { + SmallPtrSet UseMIs; + for (unsigned i = 0, e = Uses.size(); i != e; ++i) + UseMIs.insert(Uses[i]->getParent()); + MachineBasicBlock::iterator MII; + if (MBB == BarrierMBB) { + MII = Barrier; + --MII; + } else + MII = MBB->end(); + for (MachineBasicBlock::iterator MEE = MBB->begin(); MII != MEE; --MII) { + MachineInstr *UseMI = &*MII; + if (!UseMIs.count(UseMI)) + continue; + for (unsigned i = 0, e = UseMI->getNumOperands(); i != e; ++i) { + MachineOperand &MO = UseMI->getOperand(i); + if (MO.isReg() && MO.getReg() == CurrLI->reg) { + LastMO = &MO; + break; + } + } + LastMI = UseMI; + break; + } + } + + // Cut off live range from last use (or beginning of the mbb if there + // are no uses in it) to the end of the mbb. + unsigned RangeStart, RangeEnd = LIs->getMBBEndIdx(MBB)+1; + if (LastMI) { + RangeStart = LIs->getUseIndex(LIs->getInstructionIndex(LastMI))+1; + assert(!LastMO->isKill() && "Last use already terminates the interval?"); + LastMO->setIsKill(); + } else { + assert(MBB == BarrierMBB); + RangeStart = LIs->getMBBStartIdx(MBB); + } + if (MBB == BarrierMBB) + RangeEnd = LIs->getUseIndex(BarrierIdx); + CurrLI->removeRange(RangeStart, RangeEnd); + + // Return true if the last use becomes a new kill. + return LastMI; +} + +/// ShrinkWrapLiveInterval - Recursively traverse the predecessor +/// chain to find the new 'kills' and shrink wrap the live interval to the +/// new kill indices. +void +PreAllocSplitting::ShrinkWrapLiveInterval(VNInfo *ValNo, + MachineBasicBlock *MBB, MachineBasicBlock *DefMBB, + SmallPtrSet &Visited, + DenseMap > &Uses) { + if (!Visited.insert(MBB)) + return; + + DenseMap >::iterator UMII = + Uses.find(MBB->getNumber()); + if (UMII != Uses.end()) { + // At least one use in this mbb, lets look for the kill. + if (ShrinkWrapToLastUse(MBB, UMII->second)) + // Found a kill, shrink wrapping of this path ends here. + return; + } else { + // Remove entire live range of the bb out of the live interval. + CurrLI->removeRange(LIs->getMBBStartIdx(MBB), LIs->getMBBEndIdx(MBB)); + abort(); // FIXME + } + + if (MBB == DefMBB) + // Reached the def mbb, stop traversing this path further. + return; + + // Traverse the pathes up the predecessor chains further. + for (MachineBasicBlock::pred_iterator PI = MBB->pred_begin(), + PE = MBB->pred_end(); PI != PE; ++PI) { + MachineBasicBlock *Pred = *PI; + if (Pred == MBB) + continue; + if (Pred == DefMBB && ValNo->hasPHIKill) + // Pred is the def bb and the def reaches other val#s, we must + // allow the value to be live out of the bb. + continue; + ShrinkWrapLiveInterval(ValNo, Pred, DefMBB, Visited, Uses); + } + + return; +} + +/// SplitRegLiveInterval - Split (spill and restore) the given live interval +/// so it would not cross the barrier that's being processed. Shrink wrap +/// (minimize) the live interval to the last uses. +bool PreAllocSplitting::SplitRegLiveInterval(LiveInterval *LI) { + CurrLI = LI; + + // Find live range where current interval cross the barrier. + LiveInterval::iterator LR = + CurrLI->FindLiveRangeContaining(LIs->getUseIndex(BarrierIdx)); + VNInfo *ValNo = LR->valno; + + if (ValNo->def == ~1U) { + // Defined by a dead def? How can this be? + assert(0 && "Val# is defined by a dead def?"); + abort(); + } + + // Find all references in the barrier mbb. + SmallPtrSet RefsInMBB; + for (MachineRegisterInfo::reg_iterator I = MRI->reg_begin(CurrLI->reg), + E = MRI->reg_end(); I != E; ++I) { + MachineInstr *RefMI = &*I; + if (RefMI->getParent() == BarrierMBB) + RefsInMBB.insert(RefMI); + } + + // Find a point to restore the value after the barrier. + unsigned RestoreIndex; + MachineBasicBlock::iterator RestorePt = + findRestorePoint(BarrierMBB, Barrier, RefsInMBB, RestoreIndex); + if (RestorePt == BarrierMBB->end()) + return false; + + // Add a spill either before the barrier or after the definition. + MachineBasicBlock *DefMBB = NULL; + const TargetRegisterClass *RC = MRI->getRegClass(CurrLI->reg); + int SS; + unsigned SpillIndex = 0; + if (isAlreadySplit(CurrLI->reg, ValNo->id, SS)) { + // If it's already split, just restore the value. There is no need to spill + // the def again. + abort(); // FIXME + } else if (ValNo->def == ~0U) { + // If it's defined by a phi, we must split just before the barrier. + MachineBasicBlock::iterator SpillPt = + findSpillPoint(BarrierMBB, Barrier, RefsInMBB, SpillIndex); + if (SpillPt == BarrierMBB->begin()) + return false; // No gap to insert spill. + // Add spill. + SS = MFI->CreateStackObject(RC->getSize(), RC->getAlignment()); + TII->storeRegToStackSlot(*BarrierMBB, SpillPt, CurrLI->reg, true, SS, RC); + MachineInstr *StoreMI = prior(SpillPt); + LIs->InsertMachineInstrInMaps(StoreMI, SpillIndex); + } else { + // Check if it's possible to insert a spill after the def MI. + MachineInstr *DefMI = LIs->getInstructionFromIndex(ValNo->def); + DefMBB = DefMI->getParent(); + MachineBasicBlock::iterator SpillPt = + findNextEmptySlot(DefMBB, DefMI, SpillIndex); + if (SpillPt == DefMBB->end()) + return false; // No gap to insert spill. + SS = MFI->CreateStackObject(RC->getSize(), RC->getAlignment()); + + // Add spill. The store instruction does *not* kill the register. + TII->storeRegToStackSlot(*DefMBB, SpillPt, CurrLI->reg, false, SS, RC); + MachineInstr *StoreMI = prior(SpillPt); + LIs->InsertMachineInstrInMaps(StoreMI, SpillIndex); + } + + // Add restore. + // FIXME: Create live interval for stack slot. + TII->loadRegFromStackSlot(*BarrierMBB, RestorePt, CurrLI->reg, SS, RC); + MachineInstr *LoadMI = prior(RestorePt); + LIs->InsertMachineInstrInMaps(LoadMI, RestoreIndex); + + // If live interval is spilled in the same block as the barrier, just + // create a hole in the interval. + if (!DefMBB || + LIs->getInstructionFromIndex(SpillIndex)->getParent() == BarrierMBB) { + UpdateIntervalForSplit(ValNo, LIs->getUseIndex(SpillIndex)+1, + LIs->getDefIndex(RestoreIndex)); + + // Record val# values are in the specific spill slot. + RecordSplit(CurrLI->reg, SpillIndex, RestoreIndex, SS); + + ++NumSplit; + return true; + } + + // Shrink wrap the live interval by walking up the CFG and find the + // new kills. + // Now let's find all the uses of the val#. + DenseMap > Uses; + for (MachineRegisterInfo::use_iterator UI = MRI->use_begin(CurrLI->reg), + UE = MRI->use_end(); UI != UE; ++UI) { + MachineOperand &UseMO = UI.getOperand(); + MachineInstr *UseMI = UseMO.getParent(); + unsigned UseIdx = LIs->getInstructionIndex(UseMI); + LiveInterval::iterator ULR = CurrLI->FindLiveRangeContaining(UseIdx); + if (ULR->valno != ValNo) + continue; + MachineBasicBlock *UseMBB = UseMI->getParent(); + unsigned MBBId = UseMBB->getNumber(); + DenseMap >::iterator UMII = + Uses.find(MBBId); + if (UMII != Uses.end()) + UMII->second.push_back(&UseMO); + else { + std::vector Ops; + Ops.push_back(&UseMO); + Uses.insert(std::make_pair(MBBId, Ops)); + } + } + + // Walk up the predecessor chains. + SmallPtrSet Visited; + ShrinkWrapLiveInterval(ValNo, BarrierMBB, DefMBB, Visited, Uses); + + // Remove live range from barrier to the restore. FIXME: Find a better + // point to re-start the live interval. + UpdateIntervalForSplit(ValNo, LIs->getUseIndex(BarrierIdx)+1, + LIs->getDefIndex(RestoreIndex)); + // Record val# values are in the specific spill slot. + RecordSplit(CurrLI->reg, BarrierIdx, RestoreIndex, SS); + + ++NumSplit; + return true; +} + +/// SplitRegLiveIntervals - Split all register live intervals that cross the +/// barrier that's being processed. +bool +PreAllocSplitting::SplitRegLiveIntervals(const TargetRegisterClass **RCs) { + // First find all the virtual registers whose live intervals are intercepted + // by the current barrier. + SmallVector Intervals; + for (const TargetRegisterClass **RC = RCs; *RC; ++RC) { + std::vector &VRs = MRI->getRegClassVirtRegs(*RC); + for (unsigned i = 0, e = VRs.size(); i != e; ++i) { + unsigned Reg = VRs[i]; + if (!LIs->hasInterval(Reg)) + continue; + LiveInterval *LI = &LIs->getInterval(Reg); + if (LI->liveAt(BarrierIdx) && !Barrier->readsRegister(Reg)) + // Virtual register live interval is intercepted by the barrier. We + // should split and shrink wrap its interval if possible. + Intervals.push_back(LI); + } + } + + // Process the affected live intervals. + bool Change = false; + while (!Intervals.empty()) { + LiveInterval *LI = Intervals.back(); + Intervals.pop_back(); + Change |= SplitRegLiveInterval(LI); + } + + return Change; +} + bool PreAllocSplitting::runOnMachineFunction(MachineFunction &MF) { - return false; + CurMF = &MF; + TM = &MF.getTarget(); + TII = TM->getInstrInfo(); + MFI = MF.getFrameInfo(); + MRI = &MF.getRegInfo(); + LIs = &getAnalysis(); + + bool MadeChange = false; + + // Make sure blocks are numbered in order. + MF.RenumberBlocks(); + + for (MachineFunction::reverse_iterator I = MF.rbegin(), E = MF.rend(); + I != E; ++I) { + BarrierMBB = &*I; + for (MachineBasicBlock::reverse_iterator II = BarrierMBB->rbegin(), + EE = BarrierMBB->rend(); II != EE; ++II) { + Barrier = &*II; + const TargetRegisterClass **BarrierRCs = + Barrier->getDesc().getRegClassBarriers(); + if (!BarrierRCs) + continue; + BarrierIdx = LIs->getInstructionIndex(Barrier); + MadeChange |= SplitRegLiveIntervals(BarrierRCs); + } + } + + return MadeChange; } Modified: llvm/trunk/lib/CodeGen/RegAllocLinearScan.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/RegAllocLinearScan.cpp?rev=58044&r1=58043&r2=58044&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/RegAllocLinearScan.cpp (original) +++ llvm/trunk/lib/CodeGen/RegAllocLinearScan.cpp Thu Oct 23 15:43:13 2008 @@ -49,6 +49,11 @@ cl::desc("Use new spilling heuristic"), cl::init(false), cl::Hidden); +static cl::opt +PreSplitIntervals("pre-alloc-split", + cl::desc("Pre-register allocation live interval splitting"), + cl::init(false), cl::Hidden); + static RegisterRegAlloc linearscanRegAlloc("linearscan", "linear scan register allocator", createLinearScanRegisterAllocator); @@ -113,6 +118,8 @@ // Make sure PassManager knows which analyses to make available // to coalescing and which analyses coalescing invalidates. AU.addRequiredTransitive(); + if (PreSplitIntervals) + AU.addRequiredID(PreAllocSplittingID); AU.addRequired(); AU.addPreserved(); AU.addRequired(); From jlerouge at apple.com Thu Oct 23 16:23:17 2008 From: jlerouge at apple.com (Julien Lerouge) Date: Thu, 23 Oct 2008 14:23:17 -0700 Subject: [llvm-commits] [llvm] r57989 - in /llvm/trunk: include/llvm/Bitcode/ReaderWriter.h lib/Bitcode/Writer/BitcodeWriter.cpp lib/Bitcode/Writer/BitcodeWriterPass.cpp In-Reply-To: <6a8523d60810231239n555ce306g877bcca050c0a1ab@mail.gmail.com> References: <200810221739.m9MHdE2d017690@zion.cs.uiuc.edu> <20081023162219.GA54677@pom.apple.com> <6a8523d60810231239n555ce306g877bcca050c0a1ab@mail.gmail.com> Message-ID: <20081023212316.GB54677@pom.apple.com> On Thu, Oct 23, 2008 at 12:39:15PM -0700, Daniel Dunbar wrote: > Hi Julien, > Sorry, I didn't think about this case. r58042 is a fix I believe, can you > confirm? > > - Daniel Yes, it works. Thanks Daniel ! -- Julien Lerouge PGP Key Id: 0xB1964A62 PGP Fingerprint: 392D 4BAD DB8B CE7F 4E5F FA3C 62DB 4AA7 B196 4A62 PGP Public Key from: keyserver.pgp.com From snaroff at apple.com Thu Oct 23 18:28:24 2008 From: snaroff at apple.com (Steve Naroff) Date: Thu, 23 Oct 2008 23:28:24 -0000 Subject: [llvm-commits] [llvm] r58048 - in /llvm/trunk: include/llvm/Support/DataTypes.h.in win32/VMCore/VMCore.vcproj win32/clang.sln Message-ID: <200810232328.m9NNSObW020740@zion.cs.uiuc.edu> Author: snaroff Date: Thu Oct 23 18:28:23 2008 New Revision: 58048 URL: http://llvm.org/viewvc/llvm-project?rev=58048&view=rev Log: Changes to make the Windows build work... - Add a file to the VC++ project. - Make sure the clang driver links against the Transforms library. - Incorporate changes from patch by Dan Gohman. Modified: llvm/trunk/include/llvm/Support/DataTypes.h.in llvm/trunk/win32/VMCore/VMCore.vcproj llvm/trunk/win32/clang.sln Modified: llvm/trunk/include/llvm/Support/DataTypes.h.in URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/DataTypes.h.in?rev=58048&r1=58047&r2=58048&view=diff ============================================================================== --- llvm/trunk/include/llvm/Support/DataTypes.h.in (original) +++ llvm/trunk/include/llvm/Support/DataTypes.h.in Thu Oct 23 18:28:23 2008 @@ -37,6 +37,11 @@ # error "Must #define __STDC_LIMIT_MACROS before #including Support/DataTypes.h" #endif +#if !defined(__STDC_CONSTANT_MACROS) +# error "Must #define __STDC_CONSTANT_MACROS before " \ + "#including Support/DataTypes.h" +#endif + // Note that includes , if this is a C99 system. #ifdef HAVE_SYS_TYPES_H #include @@ -105,9 +110,14 @@ #define INT32_MAX 2147483647 #define INT32_MIN -2147483648 #define UINT32_MAX 4294967295U -#if !defined(INT64_C) -# define INT64_C(val) val##LL -#endif +#define INT8_C(C) C +#define UINT8_C(C) C +#define INT16_C(C) C +#define UINT16_C(C) C +#define INT32_C(C) C +#define UINT32_C(C) C ## U +#define INT64_C(C) ((int64_t) C ## LL) +#define UINT64_C(C) ((uint64_t) C ## ULL) #endif /* _MSC_VER */ /* Set defaults for constants which we cannot find. */ Modified: llvm/trunk/win32/VMCore/VMCore.vcproj URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/win32/VMCore/VMCore.vcproj?rev=58048&r1=58047&r2=58048&view=diff ============================================================================== --- llvm/trunk/win32/VMCore/VMCore.vcproj (original) +++ llvm/trunk/win32/VMCore/VMCore.vcproj Thu Oct 23 18:28:23 2008 @@ -434,6 +434,10 @@ > + + Modified: llvm/trunk/win32/clang.sln URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/win32/clang.sln?rev=58048&r1=58047&r2=58048&view=diff ============================================================================== --- llvm/trunk/win32/clang.sln (original) +++ llvm/trunk/win32/clang.sln Thu Oct 23 18:28:23 2008 @@ -7,33 +7,33 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TableGen", "TableGen\TableGen.vcproj", "{339C2249-26B6-4172-B484-85653029AF57}" ProjectSection(ProjectDependencies) = postProject - {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} = {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} - {19514E48-456C-4B9D-8637-F2285476461E} = {19514E48-456C-4B9D-8637-F2285476461E} {28AA9146-3482-4F41-9CC6-407B1D258508} = {28AA9146-3482-4F41-9CC6-407B1D258508} + {19514E48-456C-4B9D-8637-F2285476461E} = {19514E48-456C-4B9D-8637-F2285476461E} + {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} = {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Fibonacci", "Fibonacci\Fibonacci.vcproj", "{48FB551D-E37E-42EC-BC97-FF7219774867}" ProjectSection(ProjectDependencies) = postProject - {144EEBF6-8C9B-4473-B715-2C821666AF6C} = {144EEBF6-8C9B-4473-B715-2C821666AF6C} - {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} = {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} - {76295AE8-A083-460E-9F80-6F2B8923264A} = {76295AE8-A083-460E-9F80-6F2B8923264A} - {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} = {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} - {08CEB1BB-C2A4-4587-B9A9-AEDB8FB44897} = {08CEB1BB-C2A4-4587-B9A9-AEDB8FB44897} - {059FBAB8-C76D-48A0-AA75-3C57BD3EAFE4} = {059FBAB8-C76D-48A0-AA75-3C57BD3EAFE4} - {28AA9146-3482-4F41-9CC6-407B1D258508} = {28AA9146-3482-4F41-9CC6-407B1D258508} {0622E827-8464-489D-8B1C-B0B496F35C08} = {0622E827-8464-489D-8B1C-B0B496F35C08} + {28AA9146-3482-4F41-9CC6-407B1D258508} = {28AA9146-3482-4F41-9CC6-407B1D258508} + {059FBAB8-C76D-48A0-AA75-3C57BD3EAFE4} = {059FBAB8-C76D-48A0-AA75-3C57BD3EAFE4} + {08CEB1BB-C2A4-4587-B9A9-AEDB8FB44897} = {08CEB1BB-C2A4-4587-B9A9-AEDB8FB44897} + {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} = {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} + {76295AE8-A083-460E-9F80-6F2B8923264A} = {76295AE8-A083-460E-9F80-6F2B8923264A} + {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} = {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} + {144EEBF6-8C9B-4473-B715-2C821666AF6C} = {144EEBF6-8C9B-4473-B715-2C821666AF6C} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ExecutionEngine", "ExecutionEngine\ExecutionEngine.vcproj", "{76295AE8-A083-460E-9F80-6F2B8923264A}" ProjectSection(ProjectDependencies) = postProject - {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} = {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} {19514E48-456C-4B9D-8637-F2285476461E} = {19514E48-456C-4B9D-8637-F2285476461E} + {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} = {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VMCore", "VMCore\VMCore.vcproj", "{45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB}" ProjectSection(ProjectDependencies) = postProject - {339C2249-26B6-4172-B484-85653029AF57} = {339C2249-26B6-4172-B484-85653029AF57} {19514E48-456C-4B9D-8637-F2285476461E} = {19514E48-456C-4B9D-8637-F2285476461E} + {339C2249-26B6-4172-B484-85653029AF57} = {339C2249-26B6-4172-B484-85653029AF57} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Target", "Target\Target.vcproj", "{059FBAB8-C76D-48A0-AA75-3C57BD3EAFE4}" @@ -43,9 +43,9 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CodeGen", "CodeGen\CodeGen.vcproj", "{08CEB1BB-C2A4-4587-B9A9-AEDB8FB44897}" ProjectSection(ProjectDependencies) = postProject - {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} = {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} - {339C2249-26B6-4172-B484-85653029AF57} = {339C2249-26B6-4172-B484-85653029AF57} {19514E48-456C-4B9D-8637-F2285476461E} = {19514E48-456C-4B9D-8637-F2285476461E} + {339C2249-26B6-4172-B484-85653029AF57} = {339C2249-26B6-4172-B484-85653029AF57} + {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} = {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "System", "System\System.vcproj", "{0F8407F3-FA23-4CF1-83A9-DCBE0B361489}" @@ -55,71 +55,71 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Analysis", "Analysis\Analysis.vcproj", "{0622E827-8464-489D-8B1C-B0B496F35C08}" ProjectSection(ProjectDependencies) = postProject - {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} = {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} {19514E48-456C-4B9D-8637-F2285476461E} = {19514E48-456C-4B9D-8637-F2285476461E} + {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} = {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "x86", "x86\x86.vcproj", "{144EEBF6-8C9B-4473-B715-2C821666AF6C}" ProjectSection(ProjectDependencies) = postProject {19514E48-456C-4B9D-8637-F2285476461E} = {19514E48-456C-4B9D-8637-F2285476461E} + {339C2249-26B6-4172-B484-85653029AF57} = {339C2249-26B6-4172-B484-85653029AF57} {059FBAB8-C76D-48A0-AA75-3C57BD3EAFE4} = {059FBAB8-C76D-48A0-AA75-3C57BD3EAFE4} - {C59374C1-9FC0-4147-B836-327DFDC52D99} = {C59374C1-9FC0-4147-B836-327DFDC52D99} {08CEB1BB-C2A4-4587-B9A9-AEDB8FB44897} = {08CEB1BB-C2A4-4587-B9A9-AEDB8FB44897} - {339C2249-26B6-4172-B484-85653029AF57} = {339C2249-26B6-4172-B484-85653029AF57} + {C59374C1-9FC0-4147-B836-327DFDC52D99} = {C59374C1-9FC0-4147-B836-327DFDC52D99} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Transforms", "Transforms\Transforms.vcproj", "{C59374C1-9FC0-4147-B836-327DFDC52D99}" ProjectSection(ProjectDependencies) = postProject - {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} = {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} - {339C2249-26B6-4172-B484-85653029AF57} = {339C2249-26B6-4172-B484-85653029AF57} {19514E48-456C-4B9D-8637-F2285476461E} = {19514E48-456C-4B9D-8637-F2285476461E} + {339C2249-26B6-4172-B484-85653029AF57} = {339C2249-26B6-4172-B484-85653029AF57} + {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} = {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Configure", "Configure\Configure.vcproj", "{19514E48-456C-4B9D-8637-F2285476461E}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lli", "lli\lli.vcproj", "{FB6FFD68-C1E4-4DCF-AB02-36D205D5263E}" ProjectSection(ProjectDependencies) = postProject - {144EEBF6-8C9B-4473-B715-2C821666AF6C} = {144EEBF6-8C9B-4473-B715-2C821666AF6C} - {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} = {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} - {76295AE8-A083-460E-9F80-6F2B8923264A} = {76295AE8-A083-460E-9F80-6F2B8923264A} - {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} = {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} - {08CEB1BB-C2A4-4587-B9A9-AEDB8FB44897} = {08CEB1BB-C2A4-4587-B9A9-AEDB8FB44897} - {059FBAB8-C76D-48A0-AA75-3C57BD3EAFE4} = {059FBAB8-C76D-48A0-AA75-3C57BD3EAFE4} - {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D62} = {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D62} - {28AA9146-3482-4F41-9CC6-407B1D258508} = {28AA9146-3482-4F41-9CC6-407B1D258508} {0622E827-8464-489D-8B1C-B0B496F35C08} = {0622E827-8464-489D-8B1C-B0B496F35C08} + {28AA9146-3482-4F41-9CC6-407B1D258508} = {28AA9146-3482-4F41-9CC6-407B1D258508} + {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D62} = {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D62} + {059FBAB8-C76D-48A0-AA75-3C57BD3EAFE4} = {059FBAB8-C76D-48A0-AA75-3C57BD3EAFE4} + {08CEB1BB-C2A4-4587-B9A9-AEDB8FB44897} = {08CEB1BB-C2A4-4587-B9A9-AEDB8FB44897} + {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} = {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} + {76295AE8-A083-460E-9F80-6F2B8923264A} = {76295AE8-A083-460E-9F80-6F2B8923264A} + {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} = {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} + {144EEBF6-8C9B-4473-B715-2C821666AF6C} = {144EEBF6-8C9B-4473-B715-2C821666AF6C} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llc", "llc\llc.vcproj", "{ADE86BDC-B04C-43DF-B9BB-90492C7B14AC}" ProjectSection(ProjectDependencies) = postProject - {144EEBF6-8C9B-4473-B715-2C821666AF6C} = {144EEBF6-8C9B-4473-B715-2C821666AF6C} - {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} = {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} - {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} = {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} - {057777CD-DED5-46DF-BF9A-6B76DE212549} = {057777CD-DED5-46DF-BF9A-6B76DE212549} - {08CEB1BB-C2A4-4587-B9A9-AEDB8FB44897} = {08CEB1BB-C2A4-4587-B9A9-AEDB8FB44897} - {059FBAB8-C76D-48A0-AA75-3C57BD3EAFE4} = {059FBAB8-C76D-48A0-AA75-3C57BD3EAFE4} - {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D62} = {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D62} - {28AA9146-3482-4F41-9CC6-407B1D258508} = {28AA9146-3482-4F41-9CC6-407B1D258508} {0622E827-8464-489D-8B1C-B0B496F35C08} = {0622E827-8464-489D-8B1C-B0B496F35C08} + {28AA9146-3482-4F41-9CC6-407B1D258508} = {28AA9146-3482-4F41-9CC6-407B1D258508} + {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D62} = {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D62} + {059FBAB8-C76D-48A0-AA75-3C57BD3EAFE4} = {059FBAB8-C76D-48A0-AA75-3C57BD3EAFE4} + {08CEB1BB-C2A4-4587-B9A9-AEDB8FB44897} = {08CEB1BB-C2A4-4587-B9A9-AEDB8FB44897} + {057777CD-DED5-46DF-BF9A-6B76DE212549} = {057777CD-DED5-46DF-BF9A-6B76DE212549} + {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} = {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} + {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} = {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} + {144EEBF6-8C9B-4473-B715-2C821666AF6C} = {144EEBF6-8C9B-4473-B715-2C821666AF6C} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llvm-dis", "llvm-dis\llvm-dis.vcproj", "{B13476BC-30AB-4EA0-BC1E-212C0A459405}" ProjectSection(ProjectDependencies) = postProject - {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} = {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} - {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} = {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} - {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D62} = {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D62} - {19514E48-456C-4B9D-8637-F2285476461E} = {19514E48-456C-4B9D-8637-F2285476461E} {28AA9146-3482-4F41-9CC6-407B1D258508} = {28AA9146-3482-4F41-9CC6-407B1D258508} + {19514E48-456C-4B9D-8637-F2285476461E} = {19514E48-456C-4B9D-8637-F2285476461E} + {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D62} = {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D62} + {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} = {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} + {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} = {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llvm-as", "llvm-as\llvm-as.vcproj", "{4FBC40A5-E626-4A6C-A9D3-FAE5C28D30CC}" ProjectSection(ProjectDependencies) = postProject - {3DC216F5-1DDD-478A-84F8-C124E5C31982} = {3DC216F5-1DDD-478A-84F8-C124E5C31982} - {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} = {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} - {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} = {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} - {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D62} = {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D62} - {19514E48-456C-4B9D-8637-F2285476461E} = {19514E48-456C-4B9D-8637-F2285476461E} {28AA9146-3482-4F41-9CC6-407B1D258508} = {28AA9146-3482-4F41-9CC6-407B1D258508} + {19514E48-456C-4B9D-8637-F2285476461E} = {19514E48-456C-4B9D-8637-F2285476461E} + {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D62} = {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D62} + {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} = {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} + {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} = {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} + {3DC216F5-1DDD-478A-84F8-C124E5C31982} = {3DC216F5-1DDD-478A-84F8-C124E5C31982} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AsmParser", "AsmParser\AsmParser.vcproj", "{3DC216F5-1DDD-478A-84F8-C124E5C31982}" @@ -129,113 +129,113 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llvm-ar", "llvm-ar\llvm-ar.vcproj", "{0FF2B75C-49C1-4B49-A44A-531C93000296}" ProjectSection(ProjectDependencies) = postProject - {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} = {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} - {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} = {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} - {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D62} = {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D62} - {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D61} = {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D61} - {19514E48-456C-4B9D-8637-F2285476461E} = {19514E48-456C-4B9D-8637-F2285476461E} {28AA9146-3482-4F41-9CC6-407B1D258508} = {28AA9146-3482-4F41-9CC6-407B1D258508} + {19514E48-456C-4B9D-8637-F2285476461E} = {19514E48-456C-4B9D-8637-F2285476461E} + {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D61} = {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D61} + {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D62} = {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D62} + {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} = {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} + {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} = {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llvm-ranlib", "llvm-ranlib\llvm-ranlib.vcproj", "{BB16C7EE-B4ED-4714-B5ED-B775C62A6612}" ProjectSection(ProjectDependencies) = postProject - {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} = {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} - {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} = {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} - {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D62} = {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D62} - {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D61} = {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D61} - {19514E48-456C-4B9D-8637-F2285476461E} = {19514E48-456C-4B9D-8637-F2285476461E} {28AA9146-3482-4F41-9CC6-407B1D258508} = {28AA9146-3482-4F41-9CC6-407B1D258508} + {19514E48-456C-4B9D-8637-F2285476461E} = {19514E48-456C-4B9D-8637-F2285476461E} + {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D61} = {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D61} + {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D62} = {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D62} + {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} = {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} + {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} = {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llvm-link", "llvm-link\llvm-link.vcproj", "{5E249789-49E1-4600-B12B-8AD2BB6439B2}" ProjectSection(ProjectDependencies) = postProject - {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} = {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} - {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} = {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} - {342CF48F-760A-4040-A9A1-7D75AA2471CE} = {342CF48F-760A-4040-A9A1-7D75AA2471CE} - {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D62} = {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D62} - {19514E48-456C-4B9D-8637-F2285476461E} = {19514E48-456C-4B9D-8637-F2285476461E} {28AA9146-3482-4F41-9CC6-407B1D258508} = {28AA9146-3482-4F41-9CC6-407B1D258508} + {19514E48-456C-4B9D-8637-F2285476461E} = {19514E48-456C-4B9D-8637-F2285476461E} + {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D62} = {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D62} + {342CF48F-760A-4040-A9A1-7D75AA2471CE} = {342CF48F-760A-4040-A9A1-7D75AA2471CE} + {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} = {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} + {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} = {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Linker", "Linker\Linker.vcproj", "{342CF48F-760A-4040-A9A1-7D75AA2471CE}" ProjectSection(ProjectDependencies) = postProject - {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} = {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} - {19514E48-456C-4B9D-8637-F2285476461E} = {19514E48-456C-4B9D-8637-F2285476461E} {28AA9146-3482-4F41-9CC6-407B1D258508} = {28AA9146-3482-4F41-9CC6-407B1D258508} + {19514E48-456C-4B9D-8637-F2285476461E} = {19514E48-456C-4B9D-8637-F2285476461E} + {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} = {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CBackend", "CBackend\CBackend.vcproj", "{057777CD-DED5-46DF-BF9A-6B76DE212549}" ProjectSection(ProjectDependencies) = postProject - {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} = {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} {19514E48-456C-4B9D-8637-F2285476461E} = {19514E48-456C-4B9D-8637-F2285476461E} + {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} = {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opt", "opt\opt.vcproj", "{006D8B41-C3C7-4448-85E1-AF8907E591E5}" ProjectSection(ProjectDependencies) = postProject - {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} = {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} - {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} = {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} - {C59374C1-9FC0-4147-B836-327DFDC52D99} = {C59374C1-9FC0-4147-B836-327DFDC52D99} - {059FBAB8-C76D-48A0-AA75-3C57BD3EAFE4} = {059FBAB8-C76D-48A0-AA75-3C57BD3EAFE4} - {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D62} = {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D62} - {19514E48-456C-4B9D-8637-F2285476461E} = {19514E48-456C-4B9D-8637-F2285476461E} - {28AA9146-3482-4F41-9CC6-407B1D258508} = {28AA9146-3482-4F41-9CC6-407B1D258508} {0622E827-8464-489D-8B1C-B0B496F35C08} = {0622E827-8464-489D-8B1C-B0B496F35C08} + {28AA9146-3482-4F41-9CC6-407B1D258508} = {28AA9146-3482-4F41-9CC6-407B1D258508} + {19514E48-456C-4B9D-8637-F2285476461E} = {19514E48-456C-4B9D-8637-F2285476461E} + {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D62} = {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D62} + {059FBAB8-C76D-48A0-AA75-3C57BD3EAFE4} = {059FBAB8-C76D-48A0-AA75-3C57BD3EAFE4} + {C59374C1-9FC0-4147-B836-327DFDC52D99} = {C59374C1-9FC0-4147-B836-327DFDC52D99} + {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} = {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} + {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} = {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llvm-bcanalyzer", "llvm-bcanalyzer\llvm-bcanalyzer.vcproj", "{E0B1E329-BE3E-456D-B372-5F397BE42C84}" ProjectSection(ProjectDependencies) = postProject - {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} = {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} - {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} = {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} - {19514E48-456C-4B9D-8637-F2285476461E} = {19514E48-456C-4B9D-8637-F2285476461E} {28AA9146-3482-4F41-9CC6-407B1D258508} = {28AA9146-3482-4F41-9CC6-407B1D258508} + {19514E48-456C-4B9D-8637-F2285476461E} = {19514E48-456C-4B9D-8637-F2285476461E} + {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} = {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} + {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} = {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llvm-ld", "llvm-ld\llvm-ld.vcproj", "{64D8AA46-88DB-41F4-B837-053AE02406B8}" ProjectSection(ProjectDependencies) = postProject - {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} = {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} - {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} = {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} - {C59374C1-9FC0-4147-B836-327DFDC52D99} = {C59374C1-9FC0-4147-B836-327DFDC52D99} - {059FBAB8-C76D-48A0-AA75-3C57BD3EAFE4} = {059FBAB8-C76D-48A0-AA75-3C57BD3EAFE4} - {342CF48F-760A-4040-A9A1-7D75AA2471CE} = {342CF48F-760A-4040-A9A1-7D75AA2471CE} - {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D62} = {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D62} - {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D61} = {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D61} - {19514E48-456C-4B9D-8637-F2285476461E} = {19514E48-456C-4B9D-8637-F2285476461E} - {28AA9146-3482-4F41-9CC6-407B1D258508} = {28AA9146-3482-4F41-9CC6-407B1D258508} {0622E827-8464-489D-8B1C-B0B496F35C08} = {0622E827-8464-489D-8B1C-B0B496F35C08} + {28AA9146-3482-4F41-9CC6-407B1D258508} = {28AA9146-3482-4F41-9CC6-407B1D258508} + {19514E48-456C-4B9D-8637-F2285476461E} = {19514E48-456C-4B9D-8637-F2285476461E} + {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D61} = {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D61} + {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D62} = {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D62} + {342CF48F-760A-4040-A9A1-7D75AA2471CE} = {342CF48F-760A-4040-A9A1-7D75AA2471CE} + {059FBAB8-C76D-48A0-AA75-3C57BD3EAFE4} = {059FBAB8-C76D-48A0-AA75-3C57BD3EAFE4} + {C59374C1-9FC0-4147-B836-327DFDC52D99} = {C59374C1-9FC0-4147-B836-327DFDC52D99} + {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} = {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} + {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} = {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llvm-nm", "llvm-nm\llvm-nm.vcproj", "{5FF862CE-80A0-4B48-A80B-68AE325A0432}" ProjectSection(ProjectDependencies) = postProject - {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} = {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} - {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} = {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} - {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D62} = {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D62} - {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D61} = {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D61} - {19514E48-456C-4B9D-8637-F2285476461E} = {19514E48-456C-4B9D-8637-F2285476461E} {28AA9146-3482-4F41-9CC6-407B1D258508} = {28AA9146-3482-4F41-9CC6-407B1D258508} + {19514E48-456C-4B9D-8637-F2285476461E} = {19514E48-456C-4B9D-8637-F2285476461E} + {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D61} = {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D61} + {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D62} = {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D62} + {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} = {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} + {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} = {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llvm-prof", "llvm-prof\llvm-prof.vcproj", "{ACBE81D9-64B1-4133-823A-807A4E60B454}" ProjectSection(ProjectDependencies) = postProject - {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} = {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} - {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} = {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} - {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D62} = {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D62} - {19514E48-456C-4B9D-8637-F2285476461E} = {19514E48-456C-4B9D-8637-F2285476461E} - {28AA9146-3482-4F41-9CC6-407B1D258508} = {28AA9146-3482-4F41-9CC6-407B1D258508} {0622E827-8464-489D-8B1C-B0B496F35C08} = {0622E827-8464-489D-8B1C-B0B496F35C08} + {28AA9146-3482-4F41-9CC6-407B1D258508} = {28AA9146-3482-4F41-9CC6-407B1D258508} + {19514E48-456C-4B9D-8637-F2285476461E} = {19514E48-456C-4B9D-8637-F2285476461E} + {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D62} = {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D62} + {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} = {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} + {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} = {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bugpoint", "bugpoint\bugpoint.vcproj", "{57249192-8E29-4D85-8B7A-FEFF1760B1DA}" ProjectSection(ProjectDependencies) = postProject - {3DC216F5-1DDD-478A-84F8-C124E5C31982} = {3DC216F5-1DDD-478A-84F8-C124E5C31982} - {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} = {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} - {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} = {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} - {C59374C1-9FC0-4147-B836-327DFDC52D99} = {C59374C1-9FC0-4147-B836-327DFDC52D99} - {059FBAB8-C76D-48A0-AA75-3C57BD3EAFE4} = {059FBAB8-C76D-48A0-AA75-3C57BD3EAFE4} - {342CF48F-760A-4040-A9A1-7D75AA2471CE} = {342CF48F-760A-4040-A9A1-7D75AA2471CE} - {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D62} = {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D62} - {19514E48-456C-4B9D-8637-F2285476461E} = {19514E48-456C-4B9D-8637-F2285476461E} - {28AA9146-3482-4F41-9CC6-407B1D258508} = {28AA9146-3482-4F41-9CC6-407B1D258508} {0622E827-8464-489D-8B1C-B0B496F35C08} = {0622E827-8464-489D-8B1C-B0B496F35C08} + {28AA9146-3482-4F41-9CC6-407B1D258508} = {28AA9146-3482-4F41-9CC6-407B1D258508} + {19514E48-456C-4B9D-8637-F2285476461E} = {19514E48-456C-4B9D-8637-F2285476461E} + {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D62} = {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D62} + {342CF48F-760A-4040-A9A1-7D75AA2471CE} = {342CF48F-760A-4040-A9A1-7D75AA2471CE} + {059FBAB8-C76D-48A0-AA75-3C57BD3EAFE4} = {059FBAB8-C76D-48A0-AA75-3C57BD3EAFE4} + {C59374C1-9FC0-4147-B836-327DFDC52D99} = {C59374C1-9FC0-4147-B836-327DFDC52D99} + {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} = {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} + {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} = {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} + {3DC216F5-1DDD-478A-84F8-C124E5C31982} = {3DC216F5-1DDD-478A-84F8-C124E5C31982} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Bitcode", "Bitcode\Bitcode.vcproj", "{F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D62}" @@ -245,8 +245,8 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Archive", "Archive\Archive.vcproj", "{F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D61}" ProjectSection(ProjectDependencies) = postProject - {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} = {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} {19514E48-456C-4B9D-8637-F2285476461E} = {19514E48-456C-4B9D-8637-F2285476461E} + {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} = {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "LLVM", "LLVM", "{455BCF47-13B6-451E-8321-8ED9C4866BAA}" @@ -265,20 +265,21 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "clangDriver", "..\tools\clang\win32\clangDriver\clangDriver.vcproj", "{7E7DA455-C276-4B93-8D02-8F7E2F629BAF}" ProjectSection(ProjectDependencies) = postProject - {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} = {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} - {AECB78DF-C319-4D49-B2FD-F98F62EBBDF4} = {AECB78DF-C319-4D49-B2FD-F98F62EBBDF4} - {5125C3DB-FBD6-4BF8-8D8B-CE51D6E93BCD} = {5125C3DB-FBD6-4BF8-8D8B-CE51D6E93BCD} - {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} = {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} - {08CEB1BB-C2A4-4587-B9A9-AEDB8FB44897} = {08CEB1BB-C2A4-4587-B9A9-AEDB8FB44897} - {059FBAB8-C76D-48A0-AA75-3C57BD3EAFE4} = {059FBAB8-C76D-48A0-AA75-3C57BD3EAFE4} - {4727E8B7-AA99-41C9-AB09-A8A862595DB7} = {4727E8B7-AA99-41C9-AB09-A8A862595DB7} - {F9FBDDA2-9EE1-473C-A456-BE20B7B2439D} = {F9FBDDA2-9EE1-473C-A456-BE20B7B2439D} - {4CEC5897-D957-47E7-A6AE-2021D4F44A8F} = {4CEC5897-D957-47E7-A6AE-2021D4F44A8F} - {298B4876-6EF1-4E80-85D7-72F80693BBEB} = {298B4876-6EF1-4E80-85D7-72F80693BBEB} - {05DF3074-11AF-491A-B078-83BD2EDC31F6} = {05DF3074-11AF-491A-B078-83BD2EDC31F6} - {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D62} = {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D62} - {28AA9146-3482-4F41-9CC6-407B1D258508} = {28AA9146-3482-4F41-9CC6-407B1D258508} {0622E827-8464-489D-8B1C-B0B496F35C08} = {0622E827-8464-489D-8B1C-B0B496F35C08} + {28AA9146-3482-4F41-9CC6-407B1D258508} = {28AA9146-3482-4F41-9CC6-407B1D258508} + {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D62} = {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D62} + {05DF3074-11AF-491A-B078-83BD2EDC31F6} = {05DF3074-11AF-491A-B078-83BD2EDC31F6} + {298B4876-6EF1-4E80-85D7-72F80693BBEB} = {298B4876-6EF1-4E80-85D7-72F80693BBEB} + {4CEC5897-D957-47E7-A6AE-2021D4F44A8F} = {4CEC5897-D957-47E7-A6AE-2021D4F44A8F} + {F9FBDDA2-9EE1-473C-A456-BE20B7B2439D} = {F9FBDDA2-9EE1-473C-A456-BE20B7B2439D} + {4727E8B7-AA99-41C9-AB09-A8A862595DB7} = {4727E8B7-AA99-41C9-AB09-A8A862595DB7} + {059FBAB8-C76D-48A0-AA75-3C57BD3EAFE4} = {059FBAB8-C76D-48A0-AA75-3C57BD3EAFE4} + {08CEB1BB-C2A4-4587-B9A9-AEDB8FB44897} = {08CEB1BB-C2A4-4587-B9A9-AEDB8FB44897} + {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} = {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} + {5125C3DB-FBD6-4BF8-8D8B-CE51D6E93BCD} = {5125C3DB-FBD6-4BF8-8D8B-CE51D6E93BCD} + {AECB78DF-C319-4D49-B2FD-F98F62EBBDF4} = {AECB78DF-C319-4D49-B2FD-F98F62EBBDF4} + {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} = {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} + {C59374C1-9FC0-4147-B836-327DFDC52D99} = {C59374C1-9FC0-4147-B836-327DFDC52D99} {6C98551A-4C36-4E74-8419-4D3EEEC9D8E0} = {6C98551A-4C36-4E74-8419-4D3EEEC9D8E0} {030F6909-B2FA-4E53-BEA7-9A559CFC2F73} = {030F6909-B2FA-4E53-BEA7-9A559CFC2F73} EndProjectSection From kremenek at apple.com Thu Oct 23 18:49:10 2008 From: kremenek at apple.com (Ted Kremenek) Date: Thu, 23 Oct 2008 23:49:10 -0000 Subject: [llvm-commits] [llvm] r58052 - in /llvm/trunk: include/llvm/Support/raw_ostream.h lib/Support/raw_ostream.cpp Message-ID: <200810232349.m9NNnBA5021454@zion.cs.uiuc.edu> Author: kremenek Date: Thu Oct 23 18:49:09 2008 New Revision: 58052 URL: http://llvm.org/viewvc/llvm-project?rev=58052&view=rev Log: Added raw_fd_ostream::close(). Modified: llvm/trunk/include/llvm/Support/raw_ostream.h llvm/trunk/lib/Support/raw_ostream.cpp Modified: llvm/trunk/include/llvm/Support/raw_ostream.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/raw_ostream.h?rev=58052&r1=58051&r2=58052&view=diff ============================================================================== --- llvm/trunk/include/llvm/Support/raw_ostream.h (original) +++ llvm/trunk/include/llvm/Support/raw_ostream.h Thu Oct 23 18:49:09 2008 @@ -168,6 +168,9 @@ /// subclasses. This outputs the currently buffered data and resets the /// buffer to empty. virtual void flush_impl(); + + /// close - Manually flush the stream and close the file. + void close(); }; /// raw_stdout_ostream - This is a stream that always prints to stdout. Modified: llvm/trunk/lib/Support/raw_ostream.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/raw_ostream.cpp?rev=58052&r1=58051&r2=58052&view=diff ============================================================================== --- llvm/trunk/lib/Support/raw_ostream.cpp (original) +++ llvm/trunk/lib/Support/raw_ostream.cpp Thu Oct 23 18:49:09 2008 @@ -220,17 +220,28 @@ } raw_fd_ostream::~raw_fd_ostream() { - flush(); - if (ShouldClose) - close(FD); + if (FD >= 0) { + flush(); + if (ShouldClose) + ::close(FD); + } } void raw_fd_ostream::flush_impl() { + assert (FD >= 0 && "File already closed."); if (OutBufCur-OutBufStart) ::write(FD, OutBufStart, OutBufCur-OutBufStart); HandleFlush(); } +void raw_fd_ostream::close() { + assert (ShouldClose); + ShouldClose = false; + flush(); + ::close(FD); + FD = -1; +} + //===----------------------------------------------------------------------===// // raw_stdout/err_ostream //===----------------------------------------------------------------------===// From dalej at apple.com Thu Oct 23 20:06:58 2008 From: dalej at apple.com (Dale Johannesen) Date: Fri, 24 Oct 2008 01:06:58 -0000 Subject: [llvm-commits] [llvm] r58057 - /llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp Message-ID: <200810240106.m9O16xPn023791@zion.cs.uiuc.edu> Author: johannes Date: Thu Oct 23 20:06:58 2008 New Revision: 58057 URL: http://llvm.org/viewvc/llvm-project?rev=58057&view=rev Log: Initialize uninitialized variable. Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp?rev=58057&r1=58056&r2=58057&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp Thu Oct 23 20:06:58 2008 @@ -4783,7 +4783,7 @@ /// getMemOperand - Return a MachineMemOperand object describing the memory /// reference performed by this memory reference. MachineMemOperand MemSDNode::getMemOperand() const { - int Flags; + int Flags = 0; if (isa(this)) Flags = MachineMemOperand::MOLoad; else if (isa(this)) From snaroff at apple.com Thu Oct 23 20:21:47 2008 From: snaroff at apple.com (Steve Naroff) Date: Fri, 24 Oct 2008 01:21:47 -0000 Subject: [llvm-commits] [llvm] r58060 - /llvm/trunk/win32/CodeGen/CodeGen.vcproj Message-ID: <200810240121.m9O1LmoZ024314@zion.cs.uiuc.edu> Author: snaroff Date: Thu Oct 23 20:21:47 2008 New Revision: 58060 URL: http://llvm.org/viewvc/llvm-project?rev=58060&view=rev Log: Add file to VC++ project. Modified: llvm/trunk/win32/CodeGen/CodeGen.vcproj Modified: llvm/trunk/win32/CodeGen/CodeGen.vcproj URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/win32/CodeGen/CodeGen.vcproj?rev=58060&r1=58059&r2=58060&view=diff ============================================================================== --- llvm/trunk/win32/CodeGen/CodeGen.vcproj (original) +++ llvm/trunk/win32/CodeGen/CodeGen.vcproj Thu Oct 23 20:21:47 2008 @@ -89,11 +89,11 @@ /> + + From gohman at apple.com Thu Oct 23 20:40:57 2008 From: gohman at apple.com (Dan Gohman) Date: Fri, 24 Oct 2008 01:40:57 -0000 Subject: [llvm-commits] [test-suite] r58062 - /test-suite/trunk/Makefile.programs Message-ID: <200810240140.m9O1evYP024959@zion.cs.uiuc.edu> Author: djg Date: Thu Oct 23 20:40:56 2008 New Revision: 58062 URL: http://llvm.org/viewvc/llvm-project?rev=58062&view=rev Log: Cleanup files like bugpoint.test.bc too. Modified: test-suite/trunk/Makefile.programs Modified: test-suite/trunk/Makefile.programs URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/Makefile.programs?rev=58062&r1=58061&r2=58062&view=diff ============================================================================== --- test-suite/trunk/Makefile.programs (original) +++ test-suite/trunk/Makefile.programs Thu Oct 23 20:40:56 2008 @@ -548,6 +548,7 @@ clean:: rm -f bugpoint-* + rm -f bugpoint.* rm -rf Output/misopt-* LIBPROFILESO = $(LLVM_OBJ_ROOT)/Debug/lib/libprofile_rt.so From gohman at apple.com Thu Oct 23 20:47:08 2008 From: gohman at apple.com (Dan Gohman) Date: Fri, 24 Oct 2008 01:47:08 -0000 Subject: [llvm-commits] [test-suite] r58063 - /test-suite/trunk/MultiSource/Applications/ClamAV/clamscan_clamscan.c Message-ID: <200810240147.m9O1l8oZ025168@zion.cs.uiuc.edu> Author: djg Date: Thu Oct 23 20:47:08 2008 New Revision: 58063 URL: http://llvm.org/viewvc/llvm-project?rev=58063&view=rev Log: Disable the call to setrlimit (which only happened when C_LINUX) is defined. There's no need to override the core-file settings in the context of the LLVM test-suite. And if the setrlimit fails, a message was printed, leading to spurious test failures. Modified: test-suite/trunk/MultiSource/Applications/ClamAV/clamscan_clamscan.c Modified: test-suite/trunk/MultiSource/Applications/ClamAV/clamscan_clamscan.c URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/ClamAV/clamscan_clamscan.c?rev=58063&r1=58062&r2=58063&view=diff ============================================================================== --- test-suite/trunk/MultiSource/Applications/ClamAV/clamscan_clamscan.c (original) +++ test-suite/trunk/MultiSource/Applications/ClamAV/clamscan_clamscan.c Thu Oct 23 20:47:08 2008 @@ -92,6 +92,9 @@ if(opt_check(opt, "debug")) { +#if 0 // In the context of the LLVM testsuite, we don't want to override + // the setrlimit values. Among other problems, it can fail, leading + // to spurious diffs. #if defined(C_LINUX) /* njh at bandsman.co.uk: create a dump if needed */ struct rlimit rlim; @@ -100,6 +103,7 @@ if(setrlimit(RLIMIT_CORE, &rlim) < 0) perror("setrlimit"); #endif +#endif cl_debug(); /* enable debug messages */ } From gohman at apple.com Thu Oct 23 20:48:58 2008 From: gohman at apple.com (Dan Gohman) Date: Fri, 24 Oct 2008 01:48:58 -0000 Subject: [llvm-commits] [test-suite] r58064 - /test-suite/trunk/MultiSource/Applications/ClamAV/Makefile Message-ID: <200810240148.m9O1mwjg025237@zion.cs.uiuc.edu> Author: djg Date: Thu Oct 23 20:48:58 2008 New Revision: 58064 URL: http://llvm.org/viewvc/llvm-project?rev=58064&view=rev Log: Fix the correct soname for libz on "Linux" hosts, fixing a JIT failure. Modified: test-suite/trunk/MultiSource/Applications/ClamAV/Makefile Modified: test-suite/trunk/MultiSource/Applications/ClamAV/Makefile URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/ClamAV/Makefile?rev=58064&r1=58063&r2=58064&view=diff ============================================================================== --- test-suite/trunk/MultiSource/Applications/ClamAV/Makefile (original) +++ test-suite/trunk/MultiSource/Applications/ClamAV/Makefile Thu Oct 23 20:48:58 2008 @@ -108,6 +108,11 @@ EXTRA_LLI_OPTS += -load=libz.dylib EXTRA_JIT_OPTS += -load=libz.dylib else +ifeq ($(OS),Linux) +EXTRA_LLI_OPTS += -load=libz.so.1 +EXTRA_JIT_OPTS += -load=libz.so.1 +else EXTRA_LLI_OPTS += -load=libz EXTRA_JIT_OPTS += -load=libz endif +endif From gohman at apple.com Thu Oct 23 20:50:53 2008 From: gohman at apple.com (Dan Gohman) Date: Fri, 24 Oct 2008 01:50:53 -0000 Subject: [llvm-commits] [test-suite] r58065 - /test-suite/trunk/External/SPEC/CINT95/126.gcc/Makefile Message-ID: <200810240150.m9O1orfQ025322@zion.cs.uiuc.edu> Author: djg Date: Thu Oct 23 20:50:53 2008 New Revision: 58065 URL: http://llvm.org/viewvc/llvm-project?rev=58065&view=rev Log: Include the Makefile.spec95 before examining RUN_TYPE, since it is set with := in Makefile.spec95. This also makes Makefile.spec95 less different from Makefile.spec2000. Modified: test-suite/trunk/External/SPEC/CINT95/126.gcc/Makefile Modified: test-suite/trunk/External/SPEC/CINT95/126.gcc/Makefile URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CINT95/126.gcc/Makefile?rev=58065&r1=58064&r2=58065&view=diff ============================================================================== --- test-suite/trunk/External/SPEC/CINT95/126.gcc/Makefile (original) +++ test-suite/trunk/External/SPEC/CINT95/126.gcc/Makefile Thu Oct 23 20:50:53 2008 @@ -1,4 +1,7 @@ LEVEL = ../../../.. + +include ../../Makefile.spec95 + CPPFLAGS += -DSPEC -idirafter $(SPEC95_ROOT)/CINT95/126.gcc/src/src.alt RUN_OPTIONS := -quiet -funroll-loops -fforce-mem -fcse-follow-jumps -fcse-skip-blocks -fexpensive-optimizations -fstrength-reduce -fpeephole -fschedule-insns -finline-functions -fschedule-insns2 -O -o - @@ -16,4 +19,3 @@ CPPFLAGS += -DHOST_BITS_PER_WIDE_INT=64 -DHOST_WIDE_INT=long endif -include ../../Makefile.spec95 From gohman at apple.com Thu Oct 23 20:57:54 2008 From: gohman at apple.com (Dan Gohman) Date: Fri, 24 Oct 2008 01:57:54 -0000 Subject: [llvm-commits] [llvm] r58066 - in /llvm/trunk: include/llvm/CodeGen/MachineCodeEmitter.h lib/Target/X86/X86CodeEmitter.cpp lib/Target/X86/X86Relocations.h Message-ID: <200810240157.m9O1vsJJ025520@zion.cs.uiuc.edu> Author: djg Date: Thu Oct 23 20:57:54 2008 New Revision: 58066 URL: http://llvm.org/viewvc/llvm-project?rev=58066&view=rev Log: Fix constant-offset emission for x86-64 absolute addresses. This fixes a bunch of test-suite JIT failures on x86-64 in -relocation-model=static mode. Modified: llvm/trunk/include/llvm/CodeGen/MachineCodeEmitter.h llvm/trunk/lib/Target/X86/X86CodeEmitter.cpp llvm/trunk/lib/Target/X86/X86Relocations.h Modified: llvm/trunk/include/llvm/CodeGen/MachineCodeEmitter.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/MachineCodeEmitter.h?rev=58066&r1=58065&r2=58066&view=diff ============================================================================== --- llvm/trunk/include/llvm/CodeGen/MachineCodeEmitter.h (original) +++ llvm/trunk/include/llvm/CodeGen/MachineCodeEmitter.h Thu Oct 23 20:57:54 2008 @@ -125,6 +125,42 @@ } } + /// emitDWordLE - This callback is invoked when a 64-bit word needs to be + /// written to the output stream in little-endian format. + /// + void emitDWordLE(uint64_t W) { + if (CurBufferPtr+8 <= BufferEnd) { + *CurBufferPtr++ = (unsigned char)(W >> 0); + *CurBufferPtr++ = (unsigned char)(W >> 8); + *CurBufferPtr++ = (unsigned char)(W >> 16); + *CurBufferPtr++ = (unsigned char)(W >> 24); + *CurBufferPtr++ = (unsigned char)(W >> 32); + *CurBufferPtr++ = (unsigned char)(W >> 40); + *CurBufferPtr++ = (unsigned char)(W >> 48); + *CurBufferPtr++ = (unsigned char)(W >> 56); + } else { + CurBufferPtr = BufferEnd; + } + } + + /// emitDWordBE - This callback is invoked when a 64-bit word needs to be + /// written to the output stream in big-endian format. + /// + void emitDWordBE(uint64_t W) { + if (CurBufferPtr+8 <= BufferEnd) { + *CurBufferPtr++ = (unsigned char)(W >> 56); + *CurBufferPtr++ = (unsigned char)(W >> 48); + *CurBufferPtr++ = (unsigned char)(W >> 40); + *CurBufferPtr++ = (unsigned char)(W >> 32); + *CurBufferPtr++ = (unsigned char)(W >> 24); + *CurBufferPtr++ = (unsigned char)(W >> 16); + *CurBufferPtr++ = (unsigned char)(W >> 8); + *CurBufferPtr++ = (unsigned char)(W >> 0); + } else { + CurBufferPtr = BufferEnd; + } + } + /// emitAlignment - Move the CurBufferPtr pointer up the the specified /// alignment (saturated to BufferEnd of course). void emitAlignment(unsigned Alignment) { Modified: llvm/trunk/lib/Target/X86/X86CodeEmitter.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86CodeEmitter.cpp?rev=58066&r1=58065&r2=58066&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/X86CodeEmitter.cpp (original) +++ llvm/trunk/lib/Target/X86/X86CodeEmitter.cpp Thu Oct 23 20:57:54 2008 @@ -72,10 +72,10 @@ private: void emitPCRelativeBlockAddress(MachineBasicBlock *MBB); void emitGlobalAddress(GlobalValue *GV, unsigned Reloc, - int Disp = 0, intptr_t PCAdj = 0, + intptr_t Disp = 0, intptr_t PCAdj = 0, bool NeedStub = false, bool IsLazy = false); void emitExternalSymbolAddress(const char *ES, unsigned Reloc); - void emitConstPoolAddress(unsigned CPI, unsigned Reloc, int Disp = 0, + void emitConstPoolAddress(unsigned CPI, unsigned Reloc, intptr_t Disp = 0, intptr_t PCAdj = 0); void emitJumpTableAddress(unsigned JTI, unsigned Reloc, intptr_t PCAdj = 0); @@ -152,7 +152,8 @@ /// this is part of a "take the address of a global" instruction. /// void Emitter::emitGlobalAddress(GlobalValue *GV, unsigned Reloc, - int Disp /* = 0 */, intptr_t PCAdj /* = 0 */, + intptr_t Disp /* = 0 */, + intptr_t PCAdj /* = 0 */, bool NeedStub /* = false */, bool isLazy /* = false */) { intptr_t RelocCST = 0; @@ -166,9 +167,11 @@ : MachineRelocation::getGV(MCE.getCurrentPCOffset(), Reloc, GV, RelocCST, NeedStub); MCE.addRelocation(MR); + // The relocated value will be added to the displacement if (Reloc == X86::reloc_absolute_dword) - MCE.emitWordLE(0); - MCE.emitWordLE(Disp); // The relocated value will be added to the displacement + MCE.emitDWordLE(Disp); + else + MCE.emitWordLE((int32_t)Disp); } /// emitExternalSymbolAddress - Arrange for the address of an external symbol to @@ -179,15 +182,16 @@ MCE.addRelocation(MachineRelocation::getExtSym(MCE.getCurrentPCOffset(), Reloc, ES, RelocCST)); if (Reloc == X86::reloc_absolute_dword) + MCE.emitDWordLE(0); + else MCE.emitWordLE(0); - MCE.emitWordLE(0); } /// emitConstPoolAddress - Arrange for the address of an constant pool /// to be emitted to the current location in the function, and allow it to be PC /// relative. void Emitter::emitConstPoolAddress(unsigned CPI, unsigned Reloc, - int Disp /* = 0 */, + intptr_t Disp /* = 0 */, intptr_t PCAdj /* = 0 */) { intptr_t RelocCST = 0; if (Reloc == X86::reloc_picrel_word) @@ -196,9 +200,11 @@ RelocCST = PCAdj; MCE.addRelocation(MachineRelocation::getConstPool(MCE.getCurrentPCOffset(), Reloc, CPI, RelocCST)); + // The relocated value will be added to the displacement if (Reloc == X86::reloc_absolute_dword) - MCE.emitWordLE(0); - MCE.emitWordLE(Disp); // The relocated value will be added to the displacement + MCE.emitDWordLE(Disp); + else + MCE.emitWordLE((int32_t)Disp); } /// emitJumpTableAddress - Arrange for the address of a jump table to @@ -213,9 +219,11 @@ RelocCST = PCAdj; MCE.addRelocation(MachineRelocation::getJumpTable(MCE.getCurrentPCOffset(), Reloc, JTI, RelocCST)); + // The relocated value will be added to the displacement if (Reloc == X86::reloc_absolute_dword) + MCE.emitDWordLE(0); + else MCE.emitWordLE(0); - MCE.emitWordLE(0); // The relocated value will be added to the displacement } unsigned Emitter::getX86RegNum(unsigned RegNo) const { @@ -554,7 +562,7 @@ TM.getSubtarget().isTargetDarwin())) || Opcode == X86::TAILJMPd; emitGlobalAddress(MO.getGlobal(), X86::reloc_pcrel_word, - 0, 0, NeedStub); + MO.getOffset(), 0, NeedStub); } else if (MO.isSymbol()) { emitExternalSymbolAddress(MO.getSymbolName(), X86::reloc_pcrel_word); } else if (MO.isImm()) { Modified: llvm/trunk/lib/Target/X86/X86Relocations.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86Relocations.h?rev=58066&r1=58065&r2=58066&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/X86Relocations.h (original) +++ llvm/trunk/lib/Target/X86/X86Relocations.h Thu Oct 23 20:57:54 2008 @@ -18,6 +18,9 @@ namespace llvm { namespace X86 { + /// RelocationType - An enum for the x86 relocation codes. Note that + /// the terminology here doesn't follow x86 convention - word means + /// 32-bit and dword means 64-bit. enum RelocationType { // reloc_pcrel_word - PC relative relocation, add the relocated value to // the value already in memory, after we adjust it for where the PC is. From evan.cheng at apple.com Thu Oct 23 21:05:00 2008 From: evan.cheng at apple.com (Evan Cheng) Date: Fri, 24 Oct 2008 02:05:00 -0000 Subject: [llvm-commits] [llvm] r58068 - in /llvm/trunk: include/llvm/CodeGen/LiveIntervalAnalysis.h lib/CodeGen/LiveIntervalAnalysis.cpp lib/CodeGen/PreAllocSplitting.cpp test/CodeGen/X86/pre-split1.ll test/CodeGen/X86/pre-split2.ll test/CodeGen/X86/pre-split3.ll Message-ID: <200810240205.m9O2515r025765@zion.cs.uiuc.edu> Author: evancheng Date: Thu Oct 23 21:05:00 2008 New Revision: 58068 URL: http://llvm.org/viewvc/llvm-project?rev=58068&view=rev Log: Avoid splitting an interval multiple times; avoid splitting re-materializable val# (for now). Added: llvm/trunk/test/CodeGen/X86/pre-split1.ll llvm/trunk/test/CodeGen/X86/pre-split2.ll llvm/trunk/test/CodeGen/X86/pre-split3.ll Modified: llvm/trunk/include/llvm/CodeGen/LiveIntervalAnalysis.h llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp Modified: llvm/trunk/include/llvm/CodeGen/LiveIntervalAnalysis.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/LiveIntervalAnalysis.h?rev=58068&r1=58067&r2=58068&view=diff ============================================================================== --- llvm/trunk/include/llvm/CodeGen/LiveIntervalAnalysis.h (original) +++ llvm/trunk/include/llvm/CodeGen/LiveIntervalAnalysis.h Thu Oct 23 21:05:00 2008 @@ -363,6 +363,11 @@ SmallVectorImpl &SpillIs, bool &isLoad); + /// isReMaterializable - Returns true if the definition MI of the specified + /// val# of the specified interval is re-materializable. + bool isReMaterializable(const LiveInterval &li, const VNInfo *ValNo, + MachineInstr *MI); + /// getRepresentativeReg - Find the largest super register of the specified /// physical register. unsigned getRepresentativeReg(unsigned Reg) const; Modified: llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp?rev=58068&r1=58067&r2=58068&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp (original) +++ llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp Thu Oct 23 21:05:00 2008 @@ -948,6 +948,15 @@ return true; } +/// isReMaterializable - Returns true if the definition MI of the specified +/// val# of the specified interval is re-materializable. +bool LiveIntervals::isReMaterializable(const LiveInterval &li, + const VNInfo *ValNo, MachineInstr *MI) { + SmallVector Dummy1; + bool Dummy2; + return isReMaterializable(li, ValNo, MI, Dummy1, Dummy2); +} + /// isReMaterializable - Returns true if every definition of MI of every /// val# of the specified interval is re-materializable. bool LiveIntervals::isReMaterializable(const LiveInterval &li, Modified: llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp?rev=58068&r1=58067&r2=58068&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp (original) +++ llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp Thu Oct 23 21:05:00 2008 @@ -61,6 +61,9 @@ // slot was used. std::map, int> LIValNoSSMap; + // RestoreMIs - All the restores inserted due to live interval splitting. + SmallPtrSet RestoreMIs; + public: static char ID; PreAllocSplitting() : MachineFunctionPass(&ID) {} @@ -80,6 +83,7 @@ virtual void releaseMemory() { LIValNoSSMap.clear(); + RestoreMIs.clear(); } virtual const char *getPassName() const { @@ -115,11 +119,14 @@ void UpdateIntervalForSplit(VNInfo*, unsigned, unsigned); bool ShrinkWrapToLastUse(MachineBasicBlock*, - std::vector&); + SmallVector&, + SmallPtrSet&); void ShrinkWrapLiveInterval(VNInfo*, MachineBasicBlock*, MachineBasicBlock*, SmallPtrSet&, - DenseMap >&); + DenseMap >&, + DenseMap >&, + SmallVector&); bool SplitRegLiveInterval(LiveInterval*); @@ -237,13 +244,15 @@ /// slot where the val#s are in. void PreAllocSplitting::RecordSplit(unsigned Reg, unsigned SpillIndex, unsigned RestoreIndex, int SS) { - LiveInterval::iterator LR = - CurrLI->FindLiveRangeContaining(LIs->getUseIndex(SpillIndex)); - LIValNoSSMap.insert(std::make_pair(std::make_pair(CurrLI->reg, LR->valno->id), - SS)); - LR = CurrLI->FindLiveRangeContaining(LIs->getDefIndex(RestoreIndex)); - LIValNoSSMap.insert(std::make_pair(std::make_pair(CurrLI->reg, LR->valno->id), - SS)); + const LiveRange *LR = NULL; + if (SpillIndex) { + LR = CurrLI->getLiveRangeContaining(LIs->getUseIndex(SpillIndex)); + LIValNoSSMap.insert(std::make_pair(std::make_pair(CurrLI->reg, + LR->valno->id), SS)); + } + LR = CurrLI->getLiveRangeContaining(LIs->getDefIndex(RestoreIndex)); + LIValNoSSMap.insert(std::make_pair(std::make_pair(CurrLI->reg, + LR->valno->id), SS)); } /// isAlreadySplit - Return if a given val# of a register live interval is already @@ -273,9 +282,14 @@ // by the restore, which are defined by the original definition. const LiveRange *LR = CurrLI->getLiveRangeContaining(JoinIndex); After.push_back(std::make_pair(JoinIndex, LR->end)); + if (CurrLI->isKill(ValNo, LR->end)) + AfterKills.push_back(LR->end); + assert(LR->contains(SplitIndex)); - Before.push_back(std::make_pair(LR->start, SplitIndex)); - BeforeKills.push_back(SplitIndex); + if (SplitIndex > LR->start) { + Before.push_back(std::make_pair(LR->start, SplitIndex)); + BeforeKills.push_back(SplitIndex); + } Processed.insert(LR); SmallVector WorkList; @@ -325,12 +339,19 @@ MachineInstr *AfterCopy = ValNo->copy; bool HasPHIKill = ValNo->hasPHIKill; CurrLI->removeValNo(ValNo); - VNInfo *BValNo = CurrLI->getNextValue(AfterDef, AfterCopy, - LIs->getVNInfoAllocator()); - VNInfo *AValNo = CurrLI->getNextValue(JoinIndex,0, LIs->getVNInfoAllocator()); - AValNo->hasPHIKill = HasPHIKill; - CurrLI->addKills(AValNo, AfterKills); - CurrLI->addKills(BValNo, BeforeKills); + VNInfo *BValNo = (Before.empty()) + ? NULL + : CurrLI->getNextValue(AfterDef, AfterCopy, LIs->getVNInfoAllocator()); + if (BValNo) + CurrLI->addKills(BValNo, BeforeKills); + + VNInfo *AValNo = (After.empty()) + ? NULL + : CurrLI->getNextValue(JoinIndex,0, LIs->getVNInfoAllocator()); + if (AValNo) { + AValNo->hasPHIKill = HasPHIKill; + CurrLI->addKills(AValNo, AfterKills); + } for (unsigned i = 0, e = Before.size(); i != e; ++i) { unsigned Start = Before[i].first; @@ -350,7 +371,8 @@ /// is, remove from the last use to the barrier. bool PreAllocSplitting::ShrinkWrapToLastUse(MachineBasicBlock *MBB, - std::vector &Uses) { + SmallVector &Uses, + SmallPtrSet &UseMIs) { MachineOperand *LastMO = 0; MachineInstr *LastMI = 0; if (MBB != BarrierMBB && Uses.size() == 1) { @@ -359,9 +381,6 @@ LastMO = Uses[0]; LastMI = LastMO->getParent(); } else { - SmallPtrSet UseMIs; - for (unsigned i = 0, e = Uses.size(); i != e; ++i) - UseMIs.insert(Uses[i]->getParent()); MachineBasicBlock::iterator MII; if (MBB == BarrierMBB) { MII = Barrier; @@ -396,7 +415,7 @@ RangeStart = LIs->getMBBStartIdx(MBB); } if (MBB == BarrierMBB) - RangeEnd = LIs->getUseIndex(BarrierIdx); + RangeEnd = LIs->getUseIndex(BarrierIdx)+1; CurrLI->removeRange(RangeStart, RangeEnd); // Return true if the last use becomes a new kill. @@ -408,22 +427,39 @@ /// new kill indices. void PreAllocSplitting::ShrinkWrapLiveInterval(VNInfo *ValNo, - MachineBasicBlock *MBB, MachineBasicBlock *DefMBB, - SmallPtrSet &Visited, - DenseMap > &Uses) { + MachineBasicBlock *MBB, MachineBasicBlock *DefMBB, + SmallPtrSet &Visited, + DenseMap > &Uses, + DenseMap > &UseMIs, + SmallVector &UseMBBs) { if (!Visited.insert(MBB)) return; - DenseMap >::iterator UMII = - Uses.find(MBB->getNumber()); + DenseMap >::iterator + UMII = Uses.find(MBB); if (UMII != Uses.end()) { // At least one use in this mbb, lets look for the kill. - if (ShrinkWrapToLastUse(MBB, UMII->second)) + DenseMap >::iterator + UMII2 = UseMIs.find(MBB); + if (ShrinkWrapToLastUse(MBB, UMII->second, UMII2->second)) // Found a kill, shrink wrapping of this path ends here. return; + } else if (MBB == DefMBB) { + assert(LIValNoSSMap.find(std::make_pair(CurrLI->reg, ValNo->id)) != + LIValNoSSMap.end() && "Why wasn't def spilled?"); + // There are no uses after the def. + MachineInstr *DefMI = LIs->getInstructionFromIndex(ValNo->def); + assert(RestoreMIs.count(DefMI) && "Not defined by a join?"); + if (UseMBBs.empty()) { + // The only use must be below barrier in the barrier block. It's safe to + // remove the def. + LIs->RemoveMachineInstrFromMaps(DefMI); + DefMI->eraseFromParent(); + CurrLI->removeRange(ValNo->def, LIs->getMBBEndIdx(MBB)+1); + } } else { // Remove entire live range of the bb out of the live interval. - CurrLI->removeRange(LIs->getMBBStartIdx(MBB), LIs->getMBBEndIdx(MBB)); + CurrLI->removeRange(LIs->getMBBStartIdx(MBB), LIs->getMBBEndIdx(MBB)+1); abort(); // FIXME } @@ -441,7 +477,7 @@ // Pred is the def bb and the def reaches other val#s, we must // allow the value to be live out of the bb. continue; - ShrinkWrapLiveInterval(ValNo, Pred, DefMBB, Visited, Uses); + ShrinkWrapLiveInterval(ValNo, Pred, DefMBB, Visited, Uses, UseMIs, UseMBBs); } return; @@ -464,6 +500,12 @@ abort(); } + // FIXME: For now, if definition is rematerializable, do not split. + MachineInstr *DefMI = (ValNo->def != ~0U) + ? LIs->getInstructionFromIndex(ValNo->def) : NULL; + if (DefMI && LIs->isReMaterializable(*LI, ValNo, DefMI)) + return false; + // Find all references in the barrier mbb. SmallPtrSet RefsInMBB; for (MachineRegisterInfo::reg_iterator I = MRI->reg_begin(CurrLI->reg), @@ -481,14 +523,14 @@ return false; // Add a spill either before the barrier or after the definition. - MachineBasicBlock *DefMBB = NULL; + MachineBasicBlock *DefMBB = DefMI ? DefMI->getParent() : NULL; const TargetRegisterClass *RC = MRI->getRegClass(CurrLI->reg); int SS; unsigned SpillIndex = 0; + MachineInstr *SpillMI = NULL; if (isAlreadySplit(CurrLI->reg, ValNo->id, SS)) { // If it's already split, just restore the value. There is no need to spill // the def again. - abort(); // FIXME } else if (ValNo->def == ~0U) { // If it's defined by a phi, we must split just before the barrier. MachineBasicBlock::iterator SpillPt = @@ -498,22 +540,22 @@ // Add spill. SS = MFI->CreateStackObject(RC->getSize(), RC->getAlignment()); TII->storeRegToStackSlot(*BarrierMBB, SpillPt, CurrLI->reg, true, SS, RC); - MachineInstr *StoreMI = prior(SpillPt); - LIs->InsertMachineInstrInMaps(StoreMI, SpillIndex); + SpillMI = prior(SpillPt); + LIs->InsertMachineInstrInMaps(SpillMI, SpillIndex); } else { // Check if it's possible to insert a spill after the def MI. - MachineInstr *DefMI = LIs->getInstructionFromIndex(ValNo->def); - DefMBB = DefMI->getParent(); MachineBasicBlock::iterator SpillPt = findNextEmptySlot(DefMBB, DefMI, SpillIndex); if (SpillPt == DefMBB->end()) return false; // No gap to insert spill. SS = MFI->CreateStackObject(RC->getSize(), RC->getAlignment()); - // Add spill. The store instruction does *not* kill the register. - TII->storeRegToStackSlot(*DefMBB, SpillPt, CurrLI->reg, false, SS, RC); - MachineInstr *StoreMI = prior(SpillPt); - LIs->InsertMachineInstrInMaps(StoreMI, SpillIndex); + // Add spill. The store instruction kills the register if def is before the + // barrier in the barrier block. + TII->storeRegToStackSlot(*DefMBB, SpillPt, CurrLI->reg, + DefMBB == BarrierMBB, SS, RC); + SpillMI = prior(SpillPt); + LIs->InsertMachineInstrInMaps(SpillMI, SpillIndex); } // Add restore. @@ -521,11 +563,12 @@ TII->loadRegFromStackSlot(*BarrierMBB, RestorePt, CurrLI->reg, SS, RC); MachineInstr *LoadMI = prior(RestorePt); LIs->InsertMachineInstrInMaps(LoadMI, RestoreIndex); + RestoreMIs.insert(LoadMI); // If live interval is spilled in the same block as the barrier, just // create a hole in the interval. if (!DefMBB || - LIs->getInstructionFromIndex(SpillIndex)->getParent() == BarrierMBB) { + (SpillIndex && SpillMI->getParent() == BarrierMBB)) { UpdateIntervalForSplit(ValNo, LIs->getUseIndex(SpillIndex)+1, LIs->getDefIndex(RestoreIndex)); @@ -539,7 +582,10 @@ // Shrink wrap the live interval by walking up the CFG and find the // new kills. // Now let's find all the uses of the val#. - DenseMap > Uses; + DenseMap > Uses; + DenseMap > UseMIs; + SmallPtrSet Seen; + SmallVector UseMBBs; for (MachineRegisterInfo::use_iterator UI = MRI->use_begin(CurrLI->reg), UE = MRI->use_end(); UI != UE; ++UI) { MachineOperand &UseMO = UI.getOperand(); @@ -549,28 +595,37 @@ if (ULR->valno != ValNo) continue; MachineBasicBlock *UseMBB = UseMI->getParent(); - unsigned MBBId = UseMBB->getNumber(); - DenseMap >::iterator UMII = - Uses.find(MBBId); - if (UMII != Uses.end()) + // Remember which other mbb's use this val#. + if (Seen.insert(UseMBB) && UseMBB != BarrierMBB) + UseMBBs.push_back(UseMBB); + DenseMap >::iterator + UMII = Uses.find(UseMBB); + if (UMII != Uses.end()) { + DenseMap >::iterator + UMII2 = UseMIs.find(UseMBB); UMII->second.push_back(&UseMO); - else { - std::vector Ops; + UMII2->second.insert(UseMI); + } else { + SmallVector Ops; Ops.push_back(&UseMO); - Uses.insert(std::make_pair(MBBId, Ops)); + Uses.insert(std::make_pair(UseMBB, Ops)); + SmallPtrSet MIs; + MIs.insert(UseMI); + UseMIs.insert(std::make_pair(UseMBB, MIs)); } } // Walk up the predecessor chains. SmallPtrSet Visited; - ShrinkWrapLiveInterval(ValNo, BarrierMBB, DefMBB, Visited, Uses); + ShrinkWrapLiveInterval(ValNo, BarrierMBB, DefMBB, Visited, + Uses, UseMIs, UseMBBs); // Remove live range from barrier to the restore. FIXME: Find a better // point to re-start the live interval. UpdateIntervalForSplit(ValNo, LIs->getUseIndex(BarrierIdx)+1, LIs->getDefIndex(RestoreIndex)); // Record val# values are in the specific spill slot. - RecordSplit(CurrLI->reg, BarrierIdx, RestoreIndex, SS); + RecordSplit(CurrLI->reg, SpillIndex, RestoreIndex, SS); ++NumSplit; return true; Added: llvm/trunk/test/CodeGen/X86/pre-split1.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/pre-split1.ll?rev=58068&view=auto ============================================================================== --- llvm/trunk/test/CodeGen/X86/pre-split1.ll (added) +++ llvm/trunk/test/CodeGen/X86/pre-split1.ll Thu Oct 23 21:05:00 2008 @@ -0,0 +1,23 @@ +; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 -pre-alloc-split -stats |& \ +; RUN: grep {pre-alloc-split} | grep {Number of intervals split} | grep 1 + +define void @test(double* %P, i32 %cond) nounwind { +entry: + %0 = load double* %P, align 8 ; [#uses=1] + %1 = add double %0, 4.000000e+00 ; [#uses=2] + %2 = icmp eq i32 %cond, 0 ; [#uses=1] + br i1 %2, label %bb1, label %bb + +bb: ; preds = %entry + %3 = add double %1, 4.000000e+00 ; [#uses=1] + br label %bb1 + +bb1: ; preds = %bb, %entry + %A.0 = phi double [ %3, %bb ], [ %1, %entry ] ; [#uses=1] + %4 = mul double %A.0, 4.000000e+00 ; [#uses=1] + %5 = tail call i32 (...)* @bar() nounwind ; [#uses=0] + store double %4, double* %P, align 8 + ret void +} + +declare i32 @bar(...) Added: llvm/trunk/test/CodeGen/X86/pre-split2.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/pre-split2.ll?rev=58068&view=auto ============================================================================== --- llvm/trunk/test/CodeGen/X86/pre-split2.ll (added) +++ llvm/trunk/test/CodeGen/X86/pre-split2.ll Thu Oct 23 21:05:00 2008 @@ -0,0 +1,26 @@ +; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 -pre-alloc-split -stats |& \ +; RUN: not grep {pre-alloc-split} + +define i32 @t() { +entry: + br label %bb6 + +.noexc6: ; preds = %bb6 + %0 = and i32 %2, -8 ; [#uses=1] + tail call void @llvm.memmove.i32(i8* %3, i8* null, i32 %0, i32 1) nounwind + store double %1, double* null, align 8 + br label %bb6 + +bb6: ; preds = %.noexc6, %entry + %1 = uitofp i32 0 to double ; [#uses=1] + %2 = sub i32 0, 0 ; [#uses=1] + %3 = invoke i8* @_Znwm(i32 0) + to label %.noexc6 unwind label %lpad32 ; [#uses=1] + +lpad32: ; preds = %bb6 + unreachable +} + +declare void @llvm.memmove.i32(i8*, i8*, i32, i32) nounwind + +declare i8* @_Znwm(i32) Added: llvm/trunk/test/CodeGen/X86/pre-split3.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/pre-split3.ll?rev=58068&view=auto ============================================================================== --- llvm/trunk/test/CodeGen/X86/pre-split3.ll (added) +++ llvm/trunk/test/CodeGen/X86/pre-split3.ll Thu Oct 23 21:05:00 2008 @@ -0,0 +1,26 @@ +; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 -pre-alloc-split -stats |& \ +; RUN: grep {pre-alloc-split} | grep {Number of intervals split} | grep 2 + +define i32 @t(i32 %arg) { +entry: + br label %bb6 + +.noexc6: ; preds = %bb6 + %0 = and i32 %2, -8 ; [#uses=1] + tail call void @llvm.memmove.i32(i8* %3, i8* null, i32 %0, i32 1) nounwind + store double %1, double* null, align 8 + br label %bb6 + +bb6: ; preds = %.noexc6, %entry + %1 = uitofp i32 %arg to double ; [#uses=1] + %2 = sub i32 0, 0 ; [#uses=1] + %3 = invoke i8* @_Znwm(i32 0) + to label %.noexc6 unwind label %lpad32 ; [#uses=1] + +lpad32: ; preds = %bb6 + unreachable +} + +declare void @llvm.memmove.i32(i8*, i8*, i32, i32) nounwind + +declare i8* @_Znwm(i32) From nicholas at mxc.ca Thu Oct 23 23:00:30 2008 From: nicholas at mxc.ca (Nick Lewycky) Date: Fri, 24 Oct 2008 04:00:30 -0000 Subject: [llvm-commits] [llvm] r58069 - /llvm/trunk/lib/Transforms/Scalar/PredicateSimplifier.cpp Message-ID: <200810240400.m9O40Vgr029704@zion.cs.uiuc.edu> Author: nicholas Date: Thu Oct 23 23:00:26 2008 New Revision: 58069 URL: http://llvm.org/viewvc/llvm-project?rev=58069&view=rev Log: Add value range analyzing of Add and Sub. Understand that mul %x, 1 = %x. Modified: llvm/trunk/lib/Transforms/Scalar/PredicateSimplifier.cpp Modified: llvm/trunk/lib/Transforms/Scalar/PredicateSimplifier.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/PredicateSimplifier.cpp?rev=58069&r1=58068&r2=58069&view=diff ============================================================================== --- llvm/trunk/lib/Transforms/Scalar/PredicateSimplifier.cpp (original) +++ llvm/trunk/lib/Transforms/Scalar/PredicateSimplifier.cpp Thu Oct 23 23:00:26 2008 @@ -1938,6 +1938,7 @@ assert(!Ty->isFPOrFPVector() && "Float in work queue!"); Constant *Zero = Constant::getNullValue(Ty); + Constant *One = ConstantInt::get(Ty, 1); ConstantInt *AllOnes = ConstantInt::getAllOnesValue(Ty); switch (Opcode) { @@ -1945,19 +1946,73 @@ case Instruction::LShr: case Instruction::AShr: case Instruction::Shl: + if (Op1 == Zero) { + add(BO, Op0, ICmpInst::ICMP_EQ, NewContext); + return; + } + break; case Instruction::Sub: if (Op1 == Zero) { add(BO, Op0, ICmpInst::ICMP_EQ, NewContext); return; } + if (ConstantInt *CI0 = dyn_cast(Op0)) { + unsigned n_ci0 = VN.getOrInsertVN(Op1, Top); + ConstantRange CR = VR.range(n_ci0, Top); + if (!CR.isFullSet()) { + CR.subtract(CI0->getValue()); + unsigned n_bo = VN.getOrInsertVN(BO, Top); + VR.applyRange(n_bo, CR, Top, this); + return; + } + } + if (ConstantInt *CI1 = dyn_cast(Op1)) { + unsigned n_ci1 = VN.getOrInsertVN(Op0, Top); + ConstantRange CR = VR.range(n_ci1, Top); + if (!CR.isFullSet()) { + CR.subtract(CI1->getValue()); + unsigned n_bo = VN.getOrInsertVN(BO, Top); + VR.applyRange(n_bo, CR, Top, this); + return; + } + } break; case Instruction::Or: if (Op0 == AllOnes || Op1 == AllOnes) { add(BO, AllOnes, ICmpInst::ICMP_EQ, NewContext); return; - } // fall-through - case Instruction::Xor: + } + if (Op0 == Zero) { + add(BO, Op1, ICmpInst::ICMP_EQ, NewContext); + return; + } else if (Op1 == Zero) { + add(BO, Op0, ICmpInst::ICMP_EQ, NewContext); + return; + } + break; case Instruction::Add: + if (ConstantInt *CI0 = dyn_cast(Op0)) { + unsigned n_ci0 = VN.getOrInsertVN(Op1, Top); + ConstantRange CR = VR.range(n_ci0, Top); + if (!CR.isFullSet()) { + CR.subtract(-CI0->getValue()); + unsigned n_bo = VN.getOrInsertVN(BO, Top); + VR.applyRange(n_bo, CR, Top, this); + return; + } + } + if (ConstantInt *CI1 = dyn_cast(Op1)) { + unsigned n_ci1 = VN.getOrInsertVN(Op0, Top); + ConstantRange CR = VR.range(n_ci1, Top); + if (!CR.isFullSet()) { + CR.subtract(-CI1->getValue()); + unsigned n_bo = VN.getOrInsertVN(BO, Top); + VR.applyRange(n_bo, CR, Top, this); + return; + } + } + // fall-through + case Instruction::Xor: if (Op0 == Zero) { add(BO, Op1, ICmpInst::ICMP_EQ, NewContext); return; @@ -1974,19 +2029,30 @@ add(BO, Op0, ICmpInst::ICMP_EQ, NewContext); return; } - // fall-through + if (Op0 == Zero || Op1 == Zero) { + add(BO, Zero, ICmpInst::ICMP_EQ, NewContext); + return; + } + break; case Instruction::Mul: if (Op0 == Zero || Op1 == Zero) { add(BO, Zero, ICmpInst::ICMP_EQ, NewContext); return; } + if (Op0 == One) { + add(BO, Op1, ICmpInst::ICMP_EQ, NewContext); + return; + } else if (Op1 == One) { + add(BO, Op0, ICmpInst::ICMP_EQ, NewContext); + return; + } break; } // "%x = add i32 %y, %z" and %x EQ %y then %z EQ 0 // "%x = add i32 %y, %z" and %x EQ %z then %y EQ 0 // "%x = shl i32 %y, %z" and %x EQ %y and %y NE 0 then %z EQ 0 - // "%x = udiv i32 %y, %z" and %x EQ %y then %z EQ 1 + // "%x = udiv i32 %y, %z" and %x EQ %y and %y NE 0 then %z EQ 1 Value *Known = Op0, *Unknown = Op1, *TheBO = VN.canonicalize(BO, Top); @@ -2009,10 +2075,8 @@ case Instruction::UDiv: case Instruction::SDiv: if (Unknown == Op1) break; - if (isRelatedBy(Known, Zero, ICmpInst::ICMP_NE)) { - Constant *One = ConstantInt::get(Ty, 1); + if (isRelatedBy(Known, Zero, ICmpInst::ICMP_NE)) add(Unknown, One, ICmpInst::ICMP_EQ, NewContext); - } break; } } @@ -2488,7 +2552,7 @@ void PredicateSimplifier::Forwards::visitLoadInst(LoadInst &LI) { Value *Ptr = LI.getPointerOperand(); - // avoid "load uint* null" -> null NE null. + // avoid "load i8* null" -> null NE null. if (isa(Ptr)) return; VRPSolver VRP(VN, IG, UB, VR, PS->DTDFS, PS->modified, &LI); @@ -2624,8 +2688,8 @@ if (!Op1->getValue().isAllOnesValue()) NextVal = ConstantInt::get(Op1->getValue()+1); break; - } + if (NextVal) { VRPSolver VRP(VN, IG, UB, VR, PS->DTDFS, PS->modified, &IC); if (VRP.isRelatedBy(IC.getOperand(0), NextVal, From clattner at apple.com Thu Oct 23 23:13:33 2008 From: clattner at apple.com (Chris Lattner) Date: Thu, 23 Oct 2008 21:13:33 -0700 Subject: [llvm-commits] [llvm] r58066 - in /llvm/trunk: include/llvm/CodeGen/MachineCodeEmitter.h lib/Target/X86/X86CodeEmitter.cpp lib/Target/X86/X86Relocations.h In-Reply-To: <200810240157.m9O1vsJJ025520@zion.cs.uiuc.edu> References: <200810240157.m9O1vsJJ025520@zion.cs.uiuc.edu> Message-ID: <9A1CA032-C234-42E9-BC6E-616127193301@apple.com> On Oct 23, 2008, at 6:57 PM, Dan Gohman wrote: > Author: djg > Date: Thu Oct 23 20:57:54 2008 > New Revision: 58066 > > URL: http://llvm.org/viewvc/llvm-project?rev=58066&view=rev > Log: > Fix constant-offset emission for x86-64 absolute addresses. This > fixes a bunch of test-suite JIT failures on x86-64 in > -relocation-model=static mode. Hi Dan, Does this potentially help with any of the linux/x86-64 jit regressions that we're seeing in the 2.4 release branch? -Chris > > > Modified: > llvm/trunk/include/llvm/CodeGen/MachineCodeEmitter.h > llvm/trunk/lib/Target/X86/X86CodeEmitter.cpp > llvm/trunk/lib/Target/X86/X86Relocations.h > > Modified: llvm/trunk/include/llvm/CodeGen/MachineCodeEmitter.h > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/MachineCodeEmitter.h?rev=58066&r1=58065&r2=58066&view=diff > > = > = > = > = > = > = > = > = > ====================================================================== > --- llvm/trunk/include/llvm/CodeGen/MachineCodeEmitter.h (original) > +++ llvm/trunk/include/llvm/CodeGen/MachineCodeEmitter.h Thu Oct 23 > 20:57:54 2008 > @@ -125,6 +125,42 @@ > } > } > > + /// emitDWordLE - This callback is invoked when a 64-bit word > needs to be > + /// written to the output stream in little-endian format. > + /// > + void emitDWordLE(uint64_t W) { > + if (CurBufferPtr+8 <= BufferEnd) { > + *CurBufferPtr++ = (unsigned char)(W >> 0); > + *CurBufferPtr++ = (unsigned char)(W >> 8); > + *CurBufferPtr++ = (unsigned char)(W >> 16); > + *CurBufferPtr++ = (unsigned char)(W >> 24); > + *CurBufferPtr++ = (unsigned char)(W >> 32); > + *CurBufferPtr++ = (unsigned char)(W >> 40); > + *CurBufferPtr++ = (unsigned char)(W >> 48); > + *CurBufferPtr++ = (unsigned char)(W >> 56); > + } else { > + CurBufferPtr = BufferEnd; > + } > + } > + > + /// emitDWordBE - This callback is invoked when a 64-bit word > needs to be > + /// written to the output stream in big-endian format. > + /// > + void emitDWordBE(uint64_t W) { > + if (CurBufferPtr+8 <= BufferEnd) { > + *CurBufferPtr++ = (unsigned char)(W >> 56); > + *CurBufferPtr++ = (unsigned char)(W >> 48); > + *CurBufferPtr++ = (unsigned char)(W >> 40); > + *CurBufferPtr++ = (unsigned char)(W >> 32); > + *CurBufferPtr++ = (unsigned char)(W >> 24); > + *CurBufferPtr++ = (unsigned char)(W >> 16); > + *CurBufferPtr++ = (unsigned char)(W >> 8); > + *CurBufferPtr++ = (unsigned char)(W >> 0); > + } else { > + CurBufferPtr = BufferEnd; > + } > + } > + > /// emitAlignment - Move the CurBufferPtr pointer up the the > specified > /// alignment (saturated to BufferEnd of course). > void emitAlignment(unsigned Alignment) { > > Modified: llvm/trunk/lib/Target/X86/X86CodeEmitter.cpp > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86CodeEmitter.cpp?rev=58066&r1=58065&r2=58066&view=diff > > = > = > = > = > = > = > = > = > ====================================================================== > --- llvm/trunk/lib/Target/X86/X86CodeEmitter.cpp (original) > +++ llvm/trunk/lib/Target/X86/X86CodeEmitter.cpp Thu Oct 23 20:57:54 > 2008 > @@ -72,10 +72,10 @@ > private: > void emitPCRelativeBlockAddress(MachineBasicBlock *MBB); > void emitGlobalAddress(GlobalValue *GV, unsigned Reloc, > - int Disp = 0, intptr_t PCAdj = 0, > + intptr_t Disp = 0, intptr_t PCAdj = 0, > bool NeedStub = false, bool IsLazy = > false); > void emitExternalSymbolAddress(const char *ES, unsigned Reloc); > - void emitConstPoolAddress(unsigned CPI, unsigned Reloc, int > Disp = 0, > + void emitConstPoolAddress(unsigned CPI, unsigned Reloc, > intptr_t Disp = 0, > intptr_t PCAdj = 0); > void emitJumpTableAddress(unsigned JTI, unsigned Reloc, > intptr_t PCAdj = 0); > @@ -152,7 +152,8 @@ > /// this is part of a "take the address of a global" instruction. > /// > void Emitter::emitGlobalAddress(GlobalValue *GV, unsigned Reloc, > - int Disp /* = 0 */, intptr_t PCAdj / > * = 0 */, > + intptr_t Disp /* = 0 */, > + intptr_t PCAdj /* = 0 */, > bool NeedStub /* = false */, > bool isLazy /* = false */) { > intptr_t RelocCST = 0; > @@ -166,9 +167,11 @@ > : MachineRelocation::getGV(MCE.getCurrentPCOffset(), Reloc, > GV, RelocCST, NeedStub); > MCE.addRelocation(MR); > + // The relocated value will be added to the displacement > if (Reloc == X86::reloc_absolute_dword) > - MCE.emitWordLE(0); > - MCE.emitWordLE(Disp); // The relocated value will be added to the > displacement > + MCE.emitDWordLE(Disp); > + else > + MCE.emitWordLE((int32_t)Disp); > } > > /// emitExternalSymbolAddress - Arrange for the address of an > external symbol to > @@ -179,15 +182,16 @@ > > MCE > .addRelocation(MachineRelocation::getExtSym(MCE.getCurrentPCOffset(), > Reloc, ES, > RelocCST)); > if (Reloc == X86::reloc_absolute_dword) > + MCE.emitDWordLE(0); > + else > MCE.emitWordLE(0); > - MCE.emitWordLE(0); > } > > /// emitConstPoolAddress - Arrange for the address of an constant pool > /// to be emitted to the current location in the function, and allow > it to be PC > /// relative. > void Emitter::emitConstPoolAddress(unsigned CPI, unsigned Reloc, > - int Disp /* = 0 */, > + intptr_t Disp /* = 0 */, > intptr_t PCAdj /* = 0 */) { > intptr_t RelocCST = 0; > if (Reloc == X86::reloc_picrel_word) > @@ -196,9 +200,11 @@ > RelocCST = PCAdj; > > MCE > .addRelocation > (MachineRelocation::getConstPool(MCE.getCurrentPCOffset(), > Reloc, CPI, > RelocCST)); > + // The relocated value will be added to the displacement > if (Reloc == X86::reloc_absolute_dword) > - MCE.emitWordLE(0); > - MCE.emitWordLE(Disp); // The relocated value will be added to the > displacement > + MCE.emitDWordLE(Disp); > + else > + MCE.emitWordLE((int32_t)Disp); > } > > /// emitJumpTableAddress - Arrange for the address of a jump table to > @@ -213,9 +219,11 @@ > RelocCST = PCAdj; > > MCE > .addRelocation > (MachineRelocation::getJumpTable(MCE.getCurrentPCOffset(), > Reloc, JTI, > RelocCST)); > + // The relocated value will be added to the displacement > if (Reloc == X86::reloc_absolute_dword) > + MCE.emitDWordLE(0); > + else > MCE.emitWordLE(0); > - MCE.emitWordLE(0); // The relocated value will be added to the > displacement > } > > unsigned Emitter::getX86RegNum(unsigned RegNo) const { > @@ -554,7 +562,7 @@ > TM.getSubtarget().isTargetDarwin())) || > Opcode == X86::TAILJMPd; > emitGlobalAddress(MO.getGlobal(), X86::reloc_pcrel_word, > - 0, 0, NeedStub); > + MO.getOffset(), 0, NeedStub); > } else if (MO.isSymbol()) { > emitExternalSymbolAddress(MO.getSymbolName(), > X86::reloc_pcrel_word); > } else if (MO.isImm()) { > > Modified: llvm/trunk/lib/Target/X86/X86Relocations.h > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86Relocations.h?rev=58066&r1=58065&r2=58066&view=diff > > = > = > = > = > = > = > = > = > ====================================================================== > --- llvm/trunk/lib/Target/X86/X86Relocations.h (original) > +++ llvm/trunk/lib/Target/X86/X86Relocations.h Thu Oct 23 20:57:54 > 2008 > @@ -18,6 +18,9 @@ > > namespace llvm { > namespace X86 { > + /// RelocationType - An enum for the x86 relocation codes. Note > that > + /// the terminology here doesn't follow x86 convention - word > means > + /// 32-bit and dword means 64-bit. > enum RelocationType { > // reloc_pcrel_word - PC relative relocation, add the > relocated value to > // the value already in memory, after we adjust it for where > the PC is. > > > _______________________________________________ > llvm-commits mailing list > llvm-commits at cs.uiuc.edu > http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits From gohman at apple.com Thu Oct 23 23:47:38 2008 From: gohman at apple.com (Dan Gohman) Date: Thu, 23 Oct 2008 21:47:38 -0700 (PDT) Subject: [llvm-commits] [llvm] r58066 - in /llvm/trunk: include/llvm/CodeGen/MachineCodeEmitter.h lib/Target/X86/X86CodeEmitter.cpp lib/Target/X86/X86Relocations.h In-Reply-To: <9A1CA032-C234-42E9-BC6E-616127193301@apple.com> References: <200810240157.m9O1vsJJ025520@zion.cs.uiuc.edu> <9A1CA032-C234-42E9-BC6E-616127193301@apple.com> Message-ID: <34208.76.220.41.203.1224823658.squirrel@webmail.apple.com> On Thu, October 23, 2008 9:13 pm, Chris Lattner wrote: > > On Oct 23, 2008, at 6:57 PM, Dan Gohman wrote: > >> Author: djg >> Date: Thu Oct 23 20:57:54 2008 >> New Revision: 58066 >> >> URL: http://llvm.org/viewvc/llvm-project?rev=58066&view=rev >> Log: >> Fix constant-offset emission for x86-64 absolute addresses. This >> fixes a bunch of test-suite JIT failures on x86-64 in >> -relocation-model=static mode. > > Hi Dan, > > Does this potentially help with any of the linux/x86-64 jit > regressions that we're seeing in the 2.4 release branch? The failures I was seeing were due to bugs uncovered by r57748, which isn't in the release branch. But the bugs themselves are present in the release branch, and they could theoretically be causing problems. A quick way to test this would be to run lli with -relocation-model=pic to see if that hides the failures. If so, it's likely that this fix is relevant. Dan From evan.cheng at apple.com Fri Oct 24 00:53:44 2008 From: evan.cheng at apple.com (Evan Cheng) Date: Fri, 24 Oct 2008 05:53:44 -0000 Subject: [llvm-commits] [llvm] r58072 - /llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp Message-ID: <200810240553.m9O5riPT000741@zion.cs.uiuc.edu> Author: evancheng Date: Fri Oct 24 00:53:44 2008 New Revision: 58072 URL: http://llvm.org/viewvc/llvm-project?rev=58072&view=rev Log: Fix a end() dereference; remove an abort() that wasn't meant to be left in. Modified: llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp Modified: llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp?rev=58072&r1=58071&r2=58072&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp (original) +++ llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp Fri Oct 24 00:53:44 2008 @@ -381,13 +381,13 @@ LastMO = Uses[0]; LastMI = LastMO->getParent(); } else { + MachineBasicBlock::iterator MEE = MBB->begin(); MachineBasicBlock::iterator MII; - if (MBB == BarrierMBB) { + if (MBB == BarrierMBB) MII = Barrier; - --MII; - } else + else MII = MBB->end(); - for (MachineBasicBlock::iterator MEE = MBB->begin(); MII != MEE; --MII) { + while (--MII != MEE) { MachineInstr *UseMI = &*MII; if (!UseMIs.count(UseMI)) continue; @@ -460,7 +460,6 @@ } else { // Remove entire live range of the bb out of the live interval. CurrLI->removeRange(LIs->getMBBStartIdx(MBB), LIs->getMBBEndIdx(MBB)+1); - abort(); // FIXME } if (MBB == DefMBB) From nicholas at mxc.ca Fri Oct 24 01:14:27 2008 From: nicholas at mxc.ca (Nick Lewycky) Date: Fri, 24 Oct 2008 06:14:27 -0000 Subject: [llvm-commits] [llvm] r58075 - in /llvm/trunk: lib/Analysis/ConstantFolding.cpp test/Transforms/InstCombine/2008-10-23-ConstFoldWithoutMask.ll Message-ID: <200810240614.m9O6ERKO001462@zion.cs.uiuc.edu> Author: nicholas Date: Fri Oct 24 01:14:27 2008 New Revision: 58075 URL: http://llvm.org/viewvc/llvm-project?rev=58075&view=rev Log: Don't try to create a mask when we don't need one. Fixes a crash. Added: llvm/trunk/test/Transforms/InstCombine/2008-10-23-ConstFoldWithoutMask.ll Modified: llvm/trunk/lib/Analysis/ConstantFolding.cpp Modified: llvm/trunk/lib/Analysis/ConstantFolding.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/ConstantFolding.cpp?rev=58075&r1=58074&r2=58075&view=diff ============================================================================== --- llvm/trunk/lib/Analysis/ConstantFolding.cpp (original) +++ llvm/trunk/lib/Analysis/ConstantFolding.cpp Fri Oct 24 01:14:27 2008 @@ -368,10 +368,12 @@ if (TD && CE->getOpcode() == Instruction::IntToPtr) { Constant *Input = CE->getOperand(0); unsigned InWidth = Input->getType()->getPrimitiveSizeInBits(); - Constant *Mask = - ConstantInt::get(APInt::getLowBitsSet(InWidth, - TD->getPointerSizeInBits())); - Input = ConstantExpr::getAnd(Input, Mask); + if (TD->getPointerSizeInBits() < InWidth) { + Constant *Mask = + ConstantInt::get(APInt::getLowBitsSet(InWidth, + TD->getPointerSizeInBits())); + Input = ConstantExpr::getAnd(Input, Mask); + } // Do a zext or trunc to get to the dest size. return ConstantExpr::getIntegerCast(Input, DestTy, false); } Added: llvm/trunk/test/Transforms/InstCombine/2008-10-23-ConstFoldWithoutMask.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/2008-10-23-ConstFoldWithoutMask.ll?rev=58075&view=auto ============================================================================== --- llvm/trunk/test/Transforms/InstCombine/2008-10-23-ConstFoldWithoutMask.ll (added) +++ llvm/trunk/test/Transforms/InstCombine/2008-10-23-ConstFoldWithoutMask.ll Fri Oct 24 01:14:27 2008 @@ -0,0 +1,8 @@ +; RUN: llvm-as < %s | opt -instcombine +; PR2940 + +define i32 @tstid() { + %var0 = inttoptr i32 1 to i8* ; [#uses=1] + %var2 = ptrtoint i8* %var0 to i32 ; [#uses=1] + ret i32 %var2 +} From baldrick at free.fr Fri Oct 24 03:18:40 2008 From: baldrick at free.fr (Duncan Sands) Date: Fri, 24 Oct 2008 10:18:40 +0200 Subject: [llvm-commits] [test-suite] r58064 - /test-suite/trunk/MultiSource/Applications/ClamAV/Makefile In-Reply-To: <200810240148.m9O1mwjg025237@zion.cs.uiuc.edu> References: <200810240148.m9O1mwjg025237@zion.cs.uiuc.edu> Message-ID: <200810241018.40939.baldrick@free.fr> Hi, > Fix the correct soname for libz on "Linux" hosts, fixing a JIT failure. ... > +ifeq ($(OS),Linux) > +EXTRA_LLI_OPTS += -load=libz.so.1 > +EXTRA_JIT_OPTS += -load=libz.so.1 > +else I was going to say that this linux system was setup wrong, and should have a symbolic link from libz.so to libz.so.1, but then I checked the "Linux Standard Base" and saw that libz.so.1 is the canonical name: http://refspecs.linux-foundation.org/LSB_3.2.0/LSB-Core-generic/LSB-Core-generic/libz.html So this patch seems to be correct :) Ciao, Duncan. From edwintorok at gmail.com Fri Oct 24 03:26:15 2008 From: edwintorok at gmail.com (=?ISO-8859-1?Q?T=F6r=F6k_Edwin?=) Date: Fri, 24 Oct 2008 11:26:15 +0300 Subject: [llvm-commits] [test-suite] r58064 - /test-suite/trunk/MultiSource/Applications/ClamAV/Makefile In-Reply-To: <200810241018.40939.baldrick@free.fr> References: <200810240148.m9O1mwjg025237@zion.cs.uiuc.edu> <200810241018.40939.baldrick@free.fr> Message-ID: <490186A7.8010504@gmail.com> On 2008-10-24 11:18, Duncan Sands wrote: > Hi, > > >> Fix the correct soname for libz on "Linux" hosts, fixing a JIT failure. >> > ... > >> +ifeq ($(OS),Linux) >> +EXTRA_LLI_OPTS += -load=libz.so.1 >> +EXTRA_JIT_OPTS += -load=libz.so.1 >> +else >> > > I was going to say that this linux system was setup wrong, and > should have a symbolic link from libz.so to libz.so.1, but then > I checked the "Linux Standard Base" and saw that libz.so.1 is > the canonical name: > http://refspecs.linux-foundation.org/LSB_3.2.0/LSB-Core-generic/LSB-Core-generic/libz.html > So this patch seems to be correct :) > > Ciao, > ldconfig usually creates those symbolic links, at least on Debian. Best regards, --Edwin From snaroff at apple.com Fri Oct 24 05:38:58 2008 From: snaroff at apple.com (Steve Naroff) Date: Fri, 24 Oct 2008 10:38:58 -0000 Subject: [llvm-commits] [llvm] r58089 - /llvm/trunk/win32/Analysis/Analysis.vcproj Message-ID: <200810241038.m9OAcw49019604@zion.cs.uiuc.edu> Author: snaroff Date: Fri Oct 24 05:38:57 2008 New Revision: 58089 URL: http://llvm.org/viewvc/llvm-project?rev=58089&view=rev Log: Add a file to VC++ proj. Modified: llvm/trunk/win32/Analysis/Analysis.vcproj Modified: llvm/trunk/win32/Analysis/Analysis.vcproj URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/win32/Analysis/Analysis.vcproj?rev=58089&r1=58088&r2=58089&view=diff ============================================================================== --- llvm/trunk/win32/Analysis/Analysis.vcproj (original) +++ llvm/trunk/win32/Analysis/Analysis.vcproj Fri Oct 24 05:38:57 2008 @@ -89,11 +89,11 @@ /> + + From cedric.venet at laposte.net Fri Oct 24 06:24:34 2008 From: cedric.venet at laposte.net (Cedric Venet) Date: Fri, 24 Oct 2008 11:24:34 -0000 Subject: [llvm-commits] [llvm] r58090 - in /llvm/trunk: cmake/config-w32.cmake lib/AsmParser/CMakeLists.txt Message-ID: <200810241124.m9OBOYBb021030@zion.cs.uiuc.edu> Author: venet Date: Fri Oct 24 06:24:33 2008 New Revision: 58090 URL: http://llvm.org/viewvc/llvm-project?rev=58090&view=rev Log: Modify the cmake build system so that if it doesn't find bison, it will use the pregenerated file in from the svn (.cvs). Work only for windows for the moment. Tested on Vista64 with MSVC2008express. Modified: llvm/trunk/cmake/config-w32.cmake llvm/trunk/lib/AsmParser/CMakeLists.txt Modified: llvm/trunk/cmake/config-w32.cmake URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/config-w32.cmake?rev=58090&r1=58089&r2=58090&view=diff ============================================================================== --- llvm/trunk/cmake/config-w32.cmake (original) +++ llvm/trunk/cmake/config-w32.cmake Fri Oct 24 06:24:33 2008 @@ -1,9 +1,9 @@ # tbi: Configurar ficheros. -configure_file(${llvm_include_path}/llvm/ADT/hash_map.h.in ${llvm_builded_incs_dir}/ADT/hash_map.h) -configure_file(${llvm_include_path}/llvm/ADT/hash_set.h.in ${llvm_builded_incs_dir}/ADT/hash_set.h) -configure_file(${llvm_include_path}/llvm/ADT/iterator.h.in ${llvm_builded_incs_dir}/ADT/iterator.h) -configure_file(${llvm_include_path}/llvm/Support/DataTypes.h.in ${llvm_builded_incs_dir}/Support/DataTypes.h) -configure_file(${llvm_include_path}/llvm/Config/config.h.in ${llvm_builded_incs_dir}/Config/config.h) +configure_file(${llvm_include_path}/llvm/ADT/hash_map.h.in ${llvm_builded_incs_dir}/ADT/hash_map.h COPYONLY) +configure_file(${llvm_include_path}/llvm/ADT/hash_set.h.in ${llvm_builded_incs_dir}/ADT/hash_set.h COPYONLY) +configure_file(${llvm_include_path}/llvm/ADT/iterator.h.in ${llvm_builded_incs_dir}/ADT/iterator.h COPYONLY) +configure_file(${llvm_include_path}/llvm/Support/DataTypes.h.in ${llvm_builded_incs_dir}/Support/DataTypes.h COPYONLY) +configure_file(${llvm_include_path}/llvm/Config/config.h.in ${llvm_builded_incs_dir}/Config/config.h COPYONLY) file(READ ${llvm_include_path}/../win32/config.h vc_config_text) file(APPEND ${llvm_builded_incs_dir}/Config/config.h ${vc_config_text}) Modified: llvm/trunk/lib/AsmParser/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/CMakeLists.txt?rev=58090&r1=58089&r2=58090&view=diff ============================================================================== --- llvm/trunk/lib/AsmParser/CMakeLists.txt (original) +++ llvm/trunk/lib/AsmParser/CMakeLists.txt Fri Oct 24 06:24:33 2008 @@ -1,15 +1,39 @@ # AsmParser, with a Bison generated parser: include(FindBison) find_bison() + +IF(BISON_EXECUTABLE) bison_generator( "llvmAsm" "${CMAKE_CURRENT_SOURCE_DIR}/llvmAsmParser.y" "${CMAKE_CURRENT_SOURCE_DIR}/llvmAsmParser.h" "${CMAKE_CURRENT_SOURCE_DIR}/llvmAsmParser.cpp" ) +ELSE(BISON_EXECUTABLE) + MESSAGE(STATUS "Bison not found, the pregenerated files will be used") + + IF(WIN32) + FILE(TO_NATIVE_PATH ${CMAKE_CURRENT_SOURCE_DIR} WIN_SOURCE_DIR) + + ADD_CUSTOM_COMMAND( + OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/llvmAsmParser.cpp" + DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/llvmAsmParser.cpp.cvs" + COMMAND copy \"${WIN_SOURCE_DIR}\\llvmAsmParser.cpp.cvs\" \"${WIN_SOURCE_DIR}\\llvmAsmParser.cpp\" + ) + ADD_CUSTOM_COMMAND( + OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/llvmAsmParser.h" + DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/llvmAsmParser.h.cvs" + COMMAND copy \"${WIN_SOURCE_DIR}\\llvmAsmParser.h.cvs\" \"${WIN_SOURCE_DIR}\\llvmAsmParser.h\" + ) + ELSE(WIN32) + MESSAGE(SEND_ERROR "Not implemented") + # fixme do the same with cp instead of copy + ENDIF(WIN32) +ENDIF(BISON_EXECUTABLE) add_llvm_library(LLVMAsmParser - llvmAsmParser.cpp # Generated from llvmAsmParser.y + llvmAsmParser.cpp # Generated from llvmAsmParser.y or copyied from corresponding .cvs + llvmAsmParser.h # needed for the associated custom command to work LLLexer.cpp Parser.cpp ) From baldrick at free.fr Fri Oct 24 08:03:11 2008 From: baldrick at free.fr (Duncan Sands) Date: Fri, 24 Oct 2008 13:03:11 -0000 Subject: [llvm-commits] [llvm] r58092 - in /llvm/trunk: lib/Target/X86/X86ISelLowering.cpp test/CodeGen/X86/2008-10-24-FlippedCompare.ll Message-ID: <200810241303.m9OD3CoL024058@zion.cs.uiuc.edu> Author: baldrick Date: Fri Oct 24 08:03:10 2008 New Revision: 58092 URL: http://llvm.org/viewvc/llvm-project?rev=58092&view=rev Log: Fix translateX86CC: if SetCCOpcode is SETULE and LHS is a foldable load, then LHS and RHS are swapped and SetCCOpcode is changed to SETUGT. But the later code is expecting operands to be the wrong way round for SETUGT, but they are not in this case, resulting in an inverted compare. The solution is to move the load normalization before the correction for SETUGT. This bug was tickled by LegalizeTypes which happened to legalize the testcase slightly differently to LegalizeDAG. Added: llvm/trunk/test/CodeGen/X86/2008-10-24-FlippedCompare.ll Modified: llvm/trunk/lib/Target/X86/X86ISelLowering.cpp Modified: llvm/trunk/lib/Target/X86/X86ISelLowering.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86ISelLowering.cpp?rev=58092&r1=58091&r2=58092&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/X86ISelLowering.cpp (original) +++ llvm/trunk/lib/Target/X86/X86ISelLowering.cpp Fri Oct 24 08:03:10 2008 @@ -1970,28 +1970,25 @@ case ISD::SETUGE: X86CC = X86::COND_AE; break; } } else { - // First determine if it requires or is profitable to flip the operands. - bool Flip = false; + // First determine if it is required or is profitable to flip the operands. + + // If LHS is a foldable load, but RHS is not, flip the condition. + if ((ISD::isNON_EXTLoad(LHS.getNode()) && LHS.hasOneUse()) && + !(ISD::isNON_EXTLoad(RHS.getNode()) && RHS.hasOneUse())) { + SetCCOpcode = getSetCCSwappedOperands(SetCCOpcode); + std::swap(LHS, RHS); + } + switch (SetCCOpcode) { default: break; case ISD::SETOLT: case ISD::SETOLE: case ISD::SETUGT: case ISD::SETUGE: - Flip = true; + std::swap(LHS, RHS); break; } - // If LHS is a foldable load, but RHS is not, flip the condition. - if (!Flip && - (ISD::isNON_EXTLoad(LHS.getNode()) && LHS.hasOneUse()) && - !(ISD::isNON_EXTLoad(RHS.getNode()) && RHS.hasOneUse())) { - SetCCOpcode = getSetCCSwappedOperands(SetCCOpcode); - Flip = true; - } - if (Flip) - std::swap(LHS, RHS); - // On a floating point condition, the flags are set as follows: // ZF PF CF op // 0 | 0 | 0 | X > Y Added: llvm/trunk/test/CodeGen/X86/2008-10-24-FlippedCompare.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2008-10-24-FlippedCompare.ll?rev=58092&view=auto ============================================================================== --- llvm/trunk/test/CodeGen/X86/2008-10-24-FlippedCompare.ll (added) +++ llvm/trunk/test/CodeGen/X86/2008-10-24-FlippedCompare.ll Fri Oct 24 08:03:10 2008 @@ -0,0 +1,17 @@ +; RUN: llvm-as < %s | llc -enable-legalize-types -march=x86 -mattr=+sse2 -o - | not grep {ucomiss\[^,\]*esp} + +define void @f(float %wt) { +entry: + %0 = fcmp ogt float %wt, 0.000000e+00 ; [#uses=1] + %1 = tail call i32 @g(i32 44) ; [#uses=3] + %2 = inttoptr i32 %1 to i8* ; [#uses=2] + br i1 %0, label %bb, label %bb1 + +bb: ; preds = %entry + ret void + +bb1: ; preds = %entry + ret void +} + +declare i32 @g(i32) From evan.cheng at apple.com Fri Oct 24 10:38:42 2008 From: evan.cheng at apple.com (Evan Cheng) Date: Fri, 24 Oct 2008 08:38:42 -0700 Subject: [llvm-commits] [llvm] r58092 - in /llvm/trunk: lib/Target/X86/X86ISelLowering.cpp test/CodeGen/X86/2008-10-24-FlippedCompare.ll In-Reply-To: <200810241303.m9OD3CoL024058@zion.cs.uiuc.edu> References: <200810241303.m9OD3CoL024058@zion.cs.uiuc.edu> Message-ID: Nice catch! Thanks. Evan On Oct 24, 2008, at 6:03 AM, Duncan Sands wrote: > Author: baldrick > Date: Fri Oct 24 08:03:10 2008 > New Revision: 58092 > > URL: http://llvm.org/viewvc/llvm-project?rev=58092&view=rev > Log: > Fix translateX86CC: if SetCCOpcode is SETULE and > LHS is a foldable load, then LHS and RHS are swapped > and SetCCOpcode is changed to SETUGT. But the later > code is expecting operands to be the wrong way round > for SETUGT, but they are not in this case, resulting > in an inverted compare. The solution is to move the > load normalization before the correction for SETUGT. > This bug was tickled by LegalizeTypes which happened > to legalize the testcase slightly differently to > LegalizeDAG. > > Added: > llvm/trunk/test/CodeGen/X86/2008-10-24-FlippedCompare.ll > Modified: > llvm/trunk/lib/Target/X86/X86ISelLowering.cpp > > Modified: llvm/trunk/lib/Target/X86/X86ISelLowering.cpp > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86ISelLowering.cpp?rev=58092&r1=58091&r2=58092&view=diff > > = > = > = > = > = > = > = > = > ====================================================================== > --- llvm/trunk/lib/Target/X86/X86ISelLowering.cpp (original) > +++ llvm/trunk/lib/Target/X86/X86ISelLowering.cpp Fri Oct 24 > 08:03:10 2008 > @@ -1970,28 +1970,25 @@ > case ISD::SETUGE: X86CC = X86::COND_AE; break; > } > } else { > - // First determine if it requires or is profitable to flip the > operands. > - bool Flip = false; > + // First determine if it is required or is profitable to flip > the operands. > + > + // If LHS is a foldable load, but RHS is not, flip the condition. > + if ((ISD::isNON_EXTLoad(LHS.getNode()) && LHS.hasOneUse()) && > + !(ISD::isNON_EXTLoad(RHS.getNode()) && RHS.hasOneUse())) { > + SetCCOpcode = getSetCCSwappedOperands(SetCCOpcode); > + std::swap(LHS, RHS); > + } > + > switch (SetCCOpcode) { > default: break; > case ISD::SETOLT: > case ISD::SETOLE: > case ISD::SETUGT: > case ISD::SETUGE: > - Flip = true; > + std::swap(LHS, RHS); > break; > } > > - // If LHS is a foldable load, but RHS is not, flip the condition. > - if (!Flip && > - (ISD::isNON_EXTLoad(LHS.getNode()) && LHS.hasOneUse()) && > - !(ISD::isNON_EXTLoad(RHS.getNode()) && RHS.hasOneUse())) { > - SetCCOpcode = getSetCCSwappedOperands(SetCCOpcode); > - Flip = true; > - } > - if (Flip) > - std::swap(LHS, RHS); > - > // On a floating point condition, the flags are set as follows: > // ZF PF CF op > // 0 | 0 | 0 | X > Y > > Added: llvm/trunk/test/CodeGen/X86/2008-10-24-FlippedCompare.ll > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2008-10-24-FlippedCompare.ll?rev=58092&view=auto > > = > = > = > = > = > = > = > = > ====================================================================== > --- llvm/trunk/test/CodeGen/X86/2008-10-24-FlippedCompare.ll (added) > +++ llvm/trunk/test/CodeGen/X86/2008-10-24-FlippedCompare.ll Fri Oct > 24 08:03:10 2008 > @@ -0,0 +1,17 @@ > +; RUN: llvm-as < %s | llc -enable-legalize-types -march=x86 -mattr= > +sse2 -o - | not grep {ucomiss\[^,\]*esp} > + > +define void @f(float %wt) { > +entry: > + %0 = fcmp ogt float %wt, 0.000000e+00 ; [#uses=1] > + %1 = tail call i32 @g(i32 44) ; [#uses=3] > + %2 = inttoptr i32 %1 to i8* ; [#uses=2] > + br i1 %0, label %bb, label %bb1 > + > +bb: ; preds = %entry > + ret void > + > +bb1: ; preds = %entry > + ret void > +} > + > +declare i32 @g(i32) > > > _______________________________________________ > llvm-commits mailing list > llvm-commits at cs.uiuc.edu > http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits From alenhar2 at cs.uiuc.edu Fri Oct 24 10:43:06 2008 From: alenhar2 at cs.uiuc.edu (Andrew Lenharth) Date: Fri, 24 Oct 2008 15:43:06 -0000 Subject: [llvm-commits] [poolalloc] r58095 - in /poolalloc/trunk: include/dsa/CallTargets.h lib/AssistDS/Devirt.cpp Message-ID: <200810241543.m9OFh6iW029936@zion.cs.uiuc.edu> Author: alenhar2 Date: Fri Oct 24 10:43:06 2008 New Revision: 58095 URL: http://llvm.org/viewvc/llvm-project?rev=58095&view=rev Log: Old devirt pass, needs updating and a couple flavors to capture some of the easier cases in the best possible way Added: poolalloc/trunk/lib/AssistDS/Devirt.cpp Modified: poolalloc/trunk/include/dsa/CallTargets.h Modified: poolalloc/trunk/include/dsa/CallTargets.h URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/include/dsa/CallTargets.h?rev=58095&r1=58094&r2=58095&view=diff ============================================================================== --- poolalloc/trunk/include/dsa/CallTargets.h (original) +++ poolalloc/trunk/include/dsa/CallTargets.h Fri Oct 24 10:43:06 2008 @@ -20,6 +20,7 @@ #include #include +#include namespace llvm { Added: poolalloc/trunk/lib/AssistDS/Devirt.cpp URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/AssistDS/Devirt.cpp?rev=58095&view=auto ============================================================================== --- poolalloc/trunk/lib/AssistDS/Devirt.cpp (added) +++ poolalloc/trunk/lib/AssistDS/Devirt.cpp Fri Oct 24 10:43:06 2008 @@ -0,0 +1,256 @@ +//===- Devirt.cpp - Devirtualize using the sig match intrinsic in llva ----===// +// +// The LLVM Compiler Infrastructure +// +// This file was developed by the LLVM research group and is distributed under +// the University of Illinois Open Source License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// +#define DEBUG_TYPE "devirt" +#include "llvm/Constants.h" +#include "llvm/Transforms/IPO.h" +#include "dsa/CallTargets.h" +#include "llvm/Pass.h" +#include "llvm/Module.h" +#include "llvm/Function.h" +#include "llvm/Instructions.h" +#include "llvm/DerivedTypes.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/ADT/Statistic.h" + +#include +#include +#include + +using namespace llvm; + +#if 0 + +// +// Function: castTo() +// +// Description: // Given an LLVM value, insert a cast instruction to make it a given type. +// +static inline Value * +castTo (Value * V, const Type * Ty, Instruction * InsertPt) { // + // Don't bother creating a cast if it's already the correct type. + // + if (V->getType() == Ty) + return V; + + // + // If it's a constant, just create a constant expression. + // + if (Constant * C = dyn_cast(V)) { + Constant * CE = ConstantExpr::getCast (C, Ty); + return CE; + } + + // + // Otherwise, insert a cast instruction. + // + return new CastInst::Create(V, Ty, "cast", InsertPt); +} + +namespace { + + static cl::opt + VirtualLimit("devirt-limit", cl::Hidden, cl::init(16), + cl::desc("Maximum number of callees to devirtualize at a call site")); + STATISTIC(FuncAdded, "Number of bounce functions added"); + STATISTIC(CSConvert, "Number of call sites converted"); + + + class Devirtualize : public ModulePass { + + + Function * IndirectFuncFail; + + std::map >, Function*> cache; + int fnum; + + // + // Method: buildBounce() + // + // Description: + // Replaces the given call site with a call to a bounce function. The + // bounce function compares the function pointer to one of the given + // target functions and calls the function directly if the pointer + // matches. + Function* buildBounce (CallSite cs, + std::vector& Targets, + Module& M) { + + Value* ptr = cs.getCalledValue(); + const FunctionType* OrigType = + cast(cast(ptr->getType())->getElementType());; + ++FuncAdded; + + std::vector< const Type *> TP(OrigType->param_begin(), OrigType->param_end()); + TP.insert(TP.begin(), ptr->getType()); + const FunctionType* NewTy = FunctionType::get(OrigType->getReturnType(), TP, false); + Function* F = new Function(NewTy, GlobalValue::InternalLinkage, "devirtbounce", &M); + std::map targets; + + F->arg_begin()->setName("funcPtr"); + std::vector fargs; + for(Function::arg_iterator ai = F->arg_begin(), ae = F->arg_end(); ai != ae; ++ai) + if (ai != F->arg_begin()) { + fargs.push_back(ai); + ai->setName("arg"); + } + + for (std::vector::iterator i = Targets.begin(), e = Targets.end(); + i != e; ++i) { + Function* FL = *i; + BasicBlock* BL = new BasicBlock(FL->getName(), F); + targets[FL] = BL; + + //Make call + Value* call = new CallInst(FL, fargs, "", BL); + + //return correctly + if (OrigType->getReturnType() == Type::VoidTy) + new ReturnInst(0, BL); + else + new ReturnInst(call, BL); + } + + // Create a set of tests that search for the correct function target + // and call it directly. If none of the target functions match, + // call pchk_ind_fail() to note the failure. + + // + // Create the failure basic block. Then, add the following: + // o the terminating instruction + // o the indirect call to the original function + // o a call to phck_ind_fail() + // + BasicBlock* tail = new BasicBlock("fail", F, &F->getEntryBlock()); + Instruction * InsertPt; +#if 0 + InsertPt = new UnreachableInst(tail); +#else + Value* p = F->arg_begin(); + Instruction * realCall = new CallInst (p, fargs, "", tail); + if (OrigType->getReturnType() == Type::VoidTy) + InsertPt = new ReturnInst(0, tail); + else + InsertPt = new ReturnInst(realCall, tail); +#endif + Value * FuncVoidPtr = castTo (p, + PointerType::get(Type::SByteTy), + realCall); + new CallInst (IndirectFuncFail, FuncVoidPtr, "", realCall); + + + // Create basic blocks for valid target functions + for (std::vector::iterator i = Targets.begin(), e = Targets.end(); + i != e; ++i) { + BasicBlock* TB = targets[*i]; + BasicBlock* newB = new BasicBlock("test." + (*i)->getName(), F, &F->getEntryBlock()); + SetCondInst* setcc = new SetCondInst(Instruction::SetEQ, *i, p, "sc", newB); + new BranchInst(TB, tail, setcc, newB); + tail = newB; + } + return F; + } + + public: + static char ID; + Devirtualize() : ModulePass(&ID) {} + + virtual bool runOnModule(Module &M) { + CallTargetFinder* CTF = &getAnalysis(); + + // Get references to functions that are needed in the module + Function* ams = M.getNamedFunction ("llva_assert_match_sig"); + if (!ams) + return false; + + IndirectFuncFail = M.getOrInsertFunction ("pchk_ind_fail", + Type::VoidTy, + PointerType::getUnqual(Type::Int8Ty), + NULL); + + std::set safecalls; + std::vector toDelete; + + for (Value::use_iterator ii = ams->use_begin(), ee = ams->use_end(); + ii != ee; ++ii) { + if (CallInst* CI = dyn_cast(*ii)) { + std::cerr << "Found safe call site in " + << CI->getParent()->getParent()->getName() << "\n"; + Value* V = CI->getOperand(1); + toDelete.push_back(CI); + do { + //V->dump(); + safecalls.insert(V); + if (CastInst* CV = dyn_cast(V)) + V = CV->getOperand(0); + else V = 0; + } while (V); + } + } + + for(std::set::iterator i = safecalls.begin(), e = safecalls.end(); + i != e; ++i) { + for (Value::use_iterator uii = (*i)->use_begin(), uie = (*i)->use_end(); + uii != uie; ++uii) { + CallSite cs = CallSite::get(*uii); + bool isSafeCall = cs.getInstruction() && + safecalls.find(cs.getCalledValue()) != safecalls.end(); + if (cs.getInstruction() && !cs.getCalledFunction() && + (isSafeCall || CTF->isComplete(cs))) { + std::vector Targets; + for (std::vector::iterator ii = CTF->begin(cs), ee = CTF->end(cs); + ii != ee; ++ii) + if (!isSafeCall || (*ii)->getType() == cs.getCalledValue()->getType()) + Targets.push_back(*ii); + + if (Targets.size() > 0) { + std::cerr << "Target count: " << Targets.size() << " in " << cs.getInstruction()->getParent()->getParent()->getName() << "\n"; + Function* NF = buildBounce(cs, Targets, M); + if (CallInst* ci = dyn_cast(cs.getInstruction())) { + ++CSConvert; + std::vector Par(ci->op_begin(), ci->op_end()); + CallInst* cn = CallInst::Create(NF, Par.begin(), Par.end(), + ci->getName() + ".dv", ci); + ci->replaceAllUsesWith(cn); + toDelete.push_back(ci); + } else if (InvokeInst* ci = dyn_cast(cs.getInstruction())) { + ++CSConvert; + std::vector Par(ci->op_begin(), ci->op_end()); + InvokeInst* cn = InvokeInst::Create(NF, ci->getNormalDest(), + ci->getUnwindDest(), + Par, ci->getName()+".dv", + ci); + ci->replaceAllUsesWith(cn); + toDelete.push_back(ci); + } + } else //Target size == 0 + std::cerr << "Call site found, but no Targets\n"; + } + } + } + + bool changed = false; + for (std::vector::iterator ii = toDelete.begin(), ee = toDelete.end(); + ii != ee; ++ii) { + changed = true; + (*ii)->eraseFromParent(); + } + return changed; + } + + virtual void getAnalysisUsage(AnalysisUsage &AU) const { + AU.addRequired(); + } + + }; + + RegisterPass X("devirt", "Devirtualization"); + +} + +#endif From kremenek at apple.com Fri Oct 24 12:35:43 2008 From: kremenek at apple.com (Ted Kremenek) Date: Fri, 24 Oct 2008 10:35:43 -0700 Subject: [llvm-commits] [llvm] r58048 - in /llvm/trunk: include/llvm/Support/DataTypes.h.in win32/VMCore/VMCore.vcproj win32/clang.sln In-Reply-To: <200810232328.m9NNSObW020740@zion.cs.uiuc.edu> References: <200810232328.m9NNSObW020740@zion.cs.uiuc.edu> Message-ID: On Oct 23, 2008, at 4:28 PM, Steve Naroff wrote: > = > = > = > = > = > = > = > = > ====================================================================== > --- llvm/trunk/include/llvm/Support/DataTypes.h.in (original) > +++ llvm/trunk/include/llvm/Support/DataTypes.h.in Thu Oct 23 > 18:28:23 2008 > @@ -37,6 +37,11 @@ > # error "Must #define __STDC_LIMIT_MACROS before #including Support/ > DataTypes.h" > #endif > > +#if !defined(__STDC_CONSTANT_MACROS) > +# error "Must #define __STDC_CONSTANT_MACROS before " \ > + "#including Support/DataTypes.h" > +#endif > + Hi Steve, This breaks building Clang in Xcode (164 errors). Everywhere that DataTypes.h is included I see the error "Must #define __STDC_CONSTANT_MACROS before #including Support/DataTypes.h". What was the motivation for these lines? Ted From daniel at zuster.org Fri Oct 24 13:17:56 2008 From: daniel at zuster.org (Daniel Dunbar) Date: Fri, 24 Oct 2008 18:17:56 -0000 Subject: [llvm-commits] [llvm-gcc-4.2] r58101 - /llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp Message-ID: <200810241817.m9OIHusR004002@zion.cs.uiuc.edu> Author: ddunbar Date: Fri Oct 24 13:17:55 2008 New Revision: 58101 URL: http://llvm.org/viewvc/llvm-project?rev=58101&view=rev Log: Revert r58018, bug fixes were causing unintended regressions in gcc test suite. Will investigate further. Modified: llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp Modified: llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp?rev=58101&r1=58100&r2=58101&view=diff ============================================================================== --- llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp (original) +++ llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp Fri Oct 24 13:17:55 2008 @@ -379,8 +379,19 @@ // FIXME: AT -O0/O1, we should stream out functions at a time. PerModulePasses = new PassManager(); PerModulePasses->add(new TargetData(*TheTarget->getTargetData())); + bool HasPerModulePasses = false; + bool NeedAlwaysInliner = false; + // Check if AlwaysInliner is needed to handle functions that are + // marked as always_inline. + for (Module::iterator I = TheModule->begin(), E = TheModule->end(); + I != E; ++I) + if (I->hasFnAttr(Attribute::AlwaysInline)) { + NeedAlwaysInliner = true; + break; + } if (optimize > 0 && !DisableLLVMOptimizations) { + HasPerModulePasses = true; PassManager *PM = PerModulePasses; if (flag_unit_at_a_time) PM->add(createRaiseAllocationsPass()); // call %malloc -> malloc inst @@ -401,7 +412,7 @@ } if (flag_inline_trees > 1) // respect -fno-inline-functions PM->add(createFunctionInliningPass()); // Inline small functions - else + else if (NeedAlwaysInliner) PM->add(createAlwaysInlinerPass()); // Inline always_inline functions if (optimize > 2) PM->add(createArgumentPromotionPass()); // Scalarize uninlined fn args @@ -445,18 +456,21 @@ if (optimize > 1 && flag_unit_at_a_time) PM->add(createConstantMergePass()); // Merge dup global constants - } else { - PerModulePasses->add(createAlwaysInlinerPass()); } + if (!HasPerModulePasses && NeedAlwaysInliner) + PerModulePasses->add(createAlwaysInlinerPass()); + if (emit_llvm_bc) { // Emit an LLVM .bc file to the output. This is used when passed // -emit-llvm -c to the GCC driver. PerModulePasses->add(CreateBitcodeWriterPass(*AsmOutStream)); + HasPerModulePasses = true; } else if (emit_llvm) { // Emit an LLVM .ll file to the output. This is used when passed // -emit-llvm -S to the GCC driver. PerModulePasses->add(createPrintModulePass(AsmOutRawStream)); + HasPerModulePasses = true; } else { FunctionPassManager *PM; @@ -464,7 +478,7 @@ // as a separate "pass" after that happens. // FIXME: This is disabled right now until bugs can be worked out. Reenable // this for fast -O0 compiles! - if (1) { + if (HasPerModulePasses || 1) { CodeGenPasses = PM = new FunctionPassManager(new ExistingModuleProvider(TheModule)); PM->add(new TargetData(*TheTarget->getTargetData())); @@ -500,6 +514,10 @@ delete PerFunctionPasses; PerFunctionPasses = 0; } + if (!HasPerModulePasses) { + delete PerModulePasses; + PerModulePasses = 0; + } } From evan.cheng at apple.com Fri Oct 24 13:46:45 2008 From: evan.cheng at apple.com (Evan Cheng) Date: Fri, 24 Oct 2008 18:46:45 -0000 Subject: [llvm-commits] [llvm] r58102 - /llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp Message-ID: <200810241846.m9OIkjYi005243@zion.cs.uiuc.edu> Author: evancheng Date: Fri Oct 24 13:46:44 2008 New Revision: 58102 URL: http://llvm.org/viewvc/llvm-project?rev=58102&view=rev Log: Fix a pasto. Modified: llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp Modified: llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp?rev=58102&r1=58101&r2=58102&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp (original) +++ llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp Fri Oct 24 13:46:44 2008 @@ -214,7 +214,7 @@ do { --MII; unsigned Index = LIs->getInstructionIndex(MII); - unsigned Gap = LIs->hasGapBeforeInstr(Index); + unsigned Gap = LIs->findGapBeforeInstr(Index); if (Gap) { Pt = MII; RestoreIndex = Gap; From zaimoni at zaimoni.com Fri Oct 24 13:47:28 2008 From: zaimoni at zaimoni.com (Kenneth Boyd) Date: Fri, 24 Oct 2008 13:47:28 -0500 Subject: [llvm-commits] [llvm] r58048 - in /llvm/trunk: include/llvm/Support/DataTypes.h.in win32/VMCore/VMCore.vcproj win32/clang.sln In-Reply-To: References: <200810232328.m9NNSObW020740@zion.cs.uiuc.edu> Message-ID: <49021840.8040507@zaimoni.com> Ted Kremenek wrote: > On Oct 23, 2008, at 4:28 PM, Steve Naroff wrote: > > >> = >> = >> = >> = >> = >> = >> = >> = >> ====================================================================== >> --- llvm/trunk/include/llvm/Support/DataTypes.h.in (original) >> +++ llvm/trunk/include/llvm/Support/DataTypes.h.in Thu Oct 23 >> 18:28:23 2008 >> @@ -37,6 +37,11 @@ >> # error "Must #define __STDC_LIMIT_MACROS before #including Support/ >> DataTypes.h" >> #endif >> >> +#if !defined(__STDC_CONSTANT_MACROS) >> +# error "Must #define __STDC_CONSTANT_MACROS before " \ >> + "#including Support/DataTypes.h" >> +#endif >> + >> > > Hi Steve, > > This breaks building Clang in Xcode (164 errors). Everywhere that > DataTypes.h is included I see the error "Must #define > __STDC_CONSTANT_MACROS before #including Support/DataTypes.h". What > was the motivation for these lines? > C99 and the current C0X draft both have a bogus suggestion [C99 footnote 220 to 7.18.2p1] (prohbited by C++0X 18.3.1p2, do not have C++03 on hand to check) that this macro be defined to enable a number of macros in stdint.h in C++. [E.g., the INT64_C macro.] As this suggestion has no observable effect in a C program, it should be removed from C0X. I'm certain I'm not the first to have this idea, so I would want to research whether this has been officially rejected before proposing it. In my opinion, the correct way to handle this is to test for the definition of the INT64_C macro after including stdint.h. If INT64_C is not defined, then you know you have a broken stdint.h and should error immediately. If furthermore __STDC_CONSTANT_MACROS is not defined, then we can suggest that could be the problem (it would fix the problem on GCC, which has a C99-compliant stdint.h). Kenneth From edwintorok at gmail.com Fri Oct 24 14:20:06 2008 From: edwintorok at gmail.com (Torok Edwin) Date: Fri, 24 Oct 2008 19:20:06 -0000 Subject: [llvm-commits] [llvm] r58103 - /llvm/trunk/lib/Target/README.txt Message-ID: <200810241920.m9OJK6ds006594@zion.cs.uiuc.edu> Author: edwin Date: Fri Oct 24 14:20:05 2008 New Revision: 58103 URL: http://llvm.org/viewvc/llvm-project?rev=58103&view=rev Log: add note about va_arg code on x86 and x86-64 Modified: llvm/trunk/lib/Target/README.txt Modified: llvm/trunk/lib/Target/README.txt URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/README.txt?rev=58103&r1=58102&r2=58103&view=diff ============================================================================== --- llvm/trunk/lib/Target/README.txt (original) +++ llvm/trunk/lib/Target/README.txt Fri Oct 24 14:20:05 2008 @@ -985,3 +985,97 @@ //===---------------------------------------------------------------------===// +This code: + +int foo(const char *str,...) +{ + __builtin_va_list a; int x; + __builtin_va_start(a,str); x = __builtin_va_arg(a,int); __builtin_va_end(a); + return x; +} + +gets compiled into this on x86-64: + subq $200, %rsp + movaps %xmm7, 160(%rsp) + movaps %xmm6, 144(%rsp) + movaps %xmm5, 128(%rsp) + movaps %xmm4, 112(%rsp) + movaps %xmm3, 96(%rsp) + movaps %xmm2, 80(%rsp) + movaps %xmm1, 64(%rsp) + movaps %xmm0, 48(%rsp) + movq %r9, 40(%rsp) + movq %r8, 32(%rsp) + movq %rcx, 24(%rsp) + movq %rdx, 16(%rsp) + movq %rsi, 8(%rsp) + leaq (%rsp), %rax + movq %rax, 192(%rsp) + leaq 208(%rsp), %rax + movq %rax, 184(%rsp) + movl $48, 180(%rsp) + movl $8, 176(%rsp) + movl 176(%rsp), %eax + cmpl $47, %eax + jbe .LBB1_3 # bb +.LBB1_1: # bb3 + movq 184(%rsp), %rcx + leaq 8(%rcx), %rax + movq %rax, 184(%rsp) +.LBB1_2: # bb4 + movl (%rcx), %eax + addq $200, %rsp + ret +.LBB1_3: # bb + movl %eax, %ecx + addl $8, %eax + addq 192(%rsp), %rcx + movl %eax, 176(%rsp) + jmp .LBB1_2 # bb4 + +gcc 4.3 generates: + subq $96, %rsp +.LCFI0: + leaq 104(%rsp), %rax + movq %rsi, -80(%rsp) + movl $8, -120(%rsp) + movq %rax, -112(%rsp) + leaq -88(%rsp), %rax + movq %rax, -104(%rsp) + movl $8, %eax + cmpl $48, %eax + jb .L6 + movq -112(%rsp), %rdx + movl (%rdx), %eax + addq $96, %rsp + ret + .p2align 4,,10 + .p2align 3 +.L6: + mov %eax, %edx + addq -104(%rsp), %rdx + addl $8, %eax + movl %eax, -120(%rsp) + movl (%rdx), %eax + addq $96, %rsp + ret + +and it gets compiled into this on x86: + pushl %ebp + movl %esp, %ebp + subl $4, %esp + leal 12(%ebp), %eax + movl %eax, -4(%ebp) + leal 16(%ebp), %eax + movl %eax, -4(%ebp) + movl 12(%ebp), %eax + addl $4, %esp + popl %ebp + ret + +gcc 4.3 generates: + pushl %ebp + movl %esp, %ebp + movl 12(%ebp), %eax + popl %ebp + ret From edwintorok at gmail.com Fri Oct 24 14:23:07 2008 From: edwintorok at gmail.com (Torok Edwin) Date: Fri, 24 Oct 2008 19:23:07 -0000 Subject: [llvm-commits] [llvm] r58104 - in /llvm/trunk/lib/Target: README.txt X86/README.txt Message-ID: <200810241923.m9OJN8J8006693@zion.cs.uiuc.edu> Author: edwin Date: Fri Oct 24 14:23:07 2008 New Revision: 58104 URL: http://llvm.org/viewvc/llvm-project?rev=58104&view=rev Log: move the note to the correct README Modified: llvm/trunk/lib/Target/README.txt llvm/trunk/lib/Target/X86/README.txt Modified: llvm/trunk/lib/Target/README.txt URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/README.txt?rev=58104&r1=58103&r2=58104&view=diff ============================================================================== --- llvm/trunk/lib/Target/README.txt (original) +++ llvm/trunk/lib/Target/README.txt Fri Oct 24 14:23:07 2008 @@ -984,98 +984,3 @@ } //===---------------------------------------------------------------------===// - -This code: - -int foo(const char *str,...) -{ - __builtin_va_list a; int x; - __builtin_va_start(a,str); x = __builtin_va_arg(a,int); __builtin_va_end(a); - return x; -} - -gets compiled into this on x86-64: - subq $200, %rsp - movaps %xmm7, 160(%rsp) - movaps %xmm6, 144(%rsp) - movaps %xmm5, 128(%rsp) - movaps %xmm4, 112(%rsp) - movaps %xmm3, 96(%rsp) - movaps %xmm2, 80(%rsp) - movaps %xmm1, 64(%rsp) - movaps %xmm0, 48(%rsp) - movq %r9, 40(%rsp) - movq %r8, 32(%rsp) - movq %rcx, 24(%rsp) - movq %rdx, 16(%rsp) - movq %rsi, 8(%rsp) - leaq (%rsp), %rax - movq %rax, 192(%rsp) - leaq 208(%rsp), %rax - movq %rax, 184(%rsp) - movl $48, 180(%rsp) - movl $8, 176(%rsp) - movl 176(%rsp), %eax - cmpl $47, %eax - jbe .LBB1_3 # bb -.LBB1_1: # bb3 - movq 184(%rsp), %rcx - leaq 8(%rcx), %rax - movq %rax, 184(%rsp) -.LBB1_2: # bb4 - movl (%rcx), %eax - addq $200, %rsp - ret -.LBB1_3: # bb - movl %eax, %ecx - addl $8, %eax - addq 192(%rsp), %rcx - movl %eax, 176(%rsp) - jmp .LBB1_2 # bb4 - -gcc 4.3 generates: - subq $96, %rsp -.LCFI0: - leaq 104(%rsp), %rax - movq %rsi, -80(%rsp) - movl $8, -120(%rsp) - movq %rax, -112(%rsp) - leaq -88(%rsp), %rax - movq %rax, -104(%rsp) - movl $8, %eax - cmpl $48, %eax - jb .L6 - movq -112(%rsp), %rdx - movl (%rdx), %eax - addq $96, %rsp - ret - .p2align 4,,10 - .p2align 3 -.L6: - mov %eax, %edx - addq -104(%rsp), %rdx - addl $8, %eax - movl %eax, -120(%rsp) - movl (%rdx), %eax - addq $96, %rsp - ret - -and it gets compiled into this on x86: - pushl %ebp - movl %esp, %ebp - subl $4, %esp - leal 12(%ebp), %eax - movl %eax, -4(%ebp) - leal 16(%ebp), %eax - movl %eax, -4(%ebp) - movl 12(%ebp), %eax - addl $4, %esp - popl %ebp - ret - -gcc 4.3 generates: - pushl %ebp - movl %esp, %ebp - movl 12(%ebp), %eax - popl %ebp - ret Modified: llvm/trunk/lib/Target/X86/README.txt URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/README.txt?rev=58104&r1=58103&r2=58104&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/README.txt (original) +++ llvm/trunk/lib/Target/X86/README.txt Fri Oct 24 14:23:07 2008 @@ -1676,3 +1676,100 @@ ret it would be better to codegen as: x+~y (notl+addl) + +//===---------------------------------------------------------------------===// + +This code: + +int foo(const char *str,...) +{ + __builtin_va_list a; int x; + __builtin_va_start(a,str); x = __builtin_va_arg(a,int); __builtin_va_end(a); + return x; +} + +gets compiled into this on x86-64: + subq $200, %rsp + movaps %xmm7, 160(%rsp) + movaps %xmm6, 144(%rsp) + movaps %xmm5, 128(%rsp) + movaps %xmm4, 112(%rsp) + movaps %xmm3, 96(%rsp) + movaps %xmm2, 80(%rsp) + movaps %xmm1, 64(%rsp) + movaps %xmm0, 48(%rsp) + movq %r9, 40(%rsp) + movq %r8, 32(%rsp) + movq %rcx, 24(%rsp) + movq %rdx, 16(%rsp) + movq %rsi, 8(%rsp) + leaq (%rsp), %rax + movq %rax, 192(%rsp) + leaq 208(%rsp), %rax + movq %rax, 184(%rsp) + movl $48, 180(%rsp) + movl $8, 176(%rsp) + movl 176(%rsp), %eax + cmpl $47, %eax + jbe .LBB1_3 # bb +.LBB1_1: # bb3 + movq 184(%rsp), %rcx + leaq 8(%rcx), %rax + movq %rax, 184(%rsp) +.LBB1_2: # bb4 + movl (%rcx), %eax + addq $200, %rsp + ret +.LBB1_3: # bb + movl %eax, %ecx + addl $8, %eax + addq 192(%rsp), %rcx + movl %eax, 176(%rsp) + jmp .LBB1_2 # bb4 + +gcc 4.3 generates: + subq $96, %rsp +.LCFI0: + leaq 104(%rsp), %rax + movq %rsi, -80(%rsp) + movl $8, -120(%rsp) + movq %rax, -112(%rsp) + leaq -88(%rsp), %rax + movq %rax, -104(%rsp) + movl $8, %eax + cmpl $48, %eax + jb .L6 + movq -112(%rsp), %rdx + movl (%rdx), %eax + addq $96, %rsp + ret + .p2align 4,,10 + .p2align 3 +.L6: + mov %eax, %edx + addq -104(%rsp), %rdx + addl $8, %eax + movl %eax, -120(%rsp) + movl (%rdx), %eax + addq $96, %rsp + ret + +and it gets compiled into this on x86: + pushl %ebp + movl %esp, %ebp + subl $4, %esp + leal 12(%ebp), %eax + movl %eax, -4(%ebp) + leal 16(%ebp), %eax + movl %eax, -4(%ebp) + movl 12(%ebp), %eax + addl $4, %esp + popl %ebp + ret + +gcc 4.3 generates: + pushl %ebp + movl %esp, %ebp + movl 12(%ebp), %eax + popl %ebp + ret From dalej at apple.com Fri Oct 24 16:20:26 2008 From: dalej at apple.com (Dale Johannesen) Date: Fri, 24 Oct 2008 21:20:26 -0000 Subject: [llvm-commits] [llvm] r58113 - in /llvm/trunk/test/CodeGen/X86: 2008-10-16-VecUnaryOp.ll isint.ll Message-ID: <200810242120.m9OLKQBm011316@zion.cs.uiuc.edu> Author: johannes Date: Fri Oct 24 16:20:25 2008 New Revision: 58113 URL: http://llvm.org/viewvc/llvm-project?rev=58113&view=rev Log: Be kind to non-x86 hosts. Modified: llvm/trunk/test/CodeGen/X86/2008-10-16-VecUnaryOp.ll llvm/trunk/test/CodeGen/X86/isint.ll Modified: llvm/trunk/test/CodeGen/X86/2008-10-16-VecUnaryOp.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2008-10-16-VecUnaryOp.ll?rev=58113&r1=58112&r2=58113&view=diff ============================================================================== --- llvm/trunk/test/CodeGen/X86/2008-10-16-VecUnaryOp.ll (original) +++ llvm/trunk/test/CodeGen/X86/2008-10-16-VecUnaryOp.ll Fri Oct 24 16:20:25 2008 @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -enable-legalize-types +; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 -enable-legalize-types ; PR2762 define void @foo(<4 x i32>* %p, <4 x double>* %q) { %n = load <4 x i32>* %p Modified: llvm/trunk/test/CodeGen/X86/isint.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/isint.ll?rev=58113&r1=58112&r2=58113&view=diff ============================================================================== --- llvm/trunk/test/CodeGen/X86/isint.ll (original) +++ llvm/trunk/test/CodeGen/X86/isint.ll Fri Oct 24 16:20:25 2008 @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 > %t +; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 > %t ; RUN: not grep cmp %t ; RUN: not grep xor %t ; RUN: grep jne %t | count 1 From dalej at apple.com Fri Oct 24 16:24:24 2008 From: dalej at apple.com (Dale Johannesen) Date: Fri, 24 Oct 2008 21:24:24 -0000 Subject: [llvm-commits] [llvm] r58116 - in /llvm/trunk/lib/Target/PowerPC: PPCMachineFunctionInfo.h PPCRegisterInfo.cpp Message-ID: <200810242124.m9OLOO9s011469@zion.cs.uiuc.edu> Author: johannes Date: Fri Oct 24 16:24:23 2008 New Revision: 58116 URL: http://llvm.org/viewvc/llvm-project?rev=58116&view=rev Log: Rewrite logic to figure out whether LR needs to be saved/restored in the prolog/epilog. We need to do this iff something in the function stores into it. Modified: llvm/trunk/lib/Target/PowerPC/PPCMachineFunctionInfo.h llvm/trunk/lib/Target/PowerPC/PPCRegisterInfo.cpp Modified: llvm/trunk/lib/Target/PowerPC/PPCMachineFunctionInfo.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/PPCMachineFunctionInfo.h?rev=58116&r1=58115&r2=58116&view=diff ============================================================================== --- llvm/trunk/lib/Target/PowerPC/PPCMachineFunctionInfo.h (original) +++ llvm/trunk/lib/Target/PowerPC/PPCMachineFunctionInfo.h Fri Oct 24 16:24:23 2008 @@ -31,9 +31,10 @@ /// int ReturnAddrSaveIndex; - /// UsesLR - Indicates whether LR is used in the current function. This is - /// only valid after the initial scan of the function by PEI. - bool UsesLR; + /// MustSaveLR - Indicates whether LR is defined (or clobbered) in the current + /// function. This is only valid after the initial scan of the function by + /// PEI. + bool MustSaveLR; /// SpillsCR - Indicates whether CR is spilled in the current function. bool SpillsCR; @@ -79,12 +80,13 @@ int getTailCallSPDelta() const { return TailCallSPDelta; } void setTailCallSPDelta(int size) { TailCallSPDelta = size; } - /// UsesLR - This is set when the prolog/epilog inserter does its initial scan - /// of the function, it is true if the LR/LR8 register is ever explicitly - /// accessed/clobbered in the machine function (e.g. by calls and movpctolr, - /// which is used in PIC generation). - void setUsesLR(bool U) { UsesLR = U; } - bool usesLR() const { return UsesLR; } + /// MustSaveLR - This is set when the prolog/epilog inserter does its initial + /// scan of the function. It is true if the LR/LR8 register is ever explicitly + /// defined/clobbered in the machine function (e.g. by calls and movpctolr, + /// which is used in PIC generation), or if the LR stack slot is explicitly + /// referenced by builtin_return_address. + void setMustSaveLR(bool U) { MustSaveLR = U; } + bool mustSaveLR() const { return MustSaveLR; } void setSpillsCR() { SpillsCR = true; } bool isCRSpilled() const { return SpillsCR; } Modified: llvm/trunk/lib/Target/PowerPC/PPCRegisterInfo.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/PPCRegisterInfo.cpp?rev=58116&r1=58115&r2=58116&view=diff ============================================================================== --- llvm/trunk/lib/Target/PowerPC/PPCRegisterInfo.cpp (original) +++ llvm/trunk/lib/Target/PowerPC/PPCRegisterInfo.cpp Fri Oct 24 16:24:23 2008 @@ -389,15 +389,15 @@ /// MustSaveLR - Return true if this function requires that we save the LR /// register onto the stack in the prolog and restore it in the epilog of the /// function. -static bool MustSaveLR(const MachineFunction &MF) { +static bool MustSaveLR(const MachineFunction &MF, unsigned LR) { const PPCFunctionInfo *MFI = MF.getInfo(); - // We need an save/restore of LR if there is any use/def of LR explicitly, or - // if there is some use of the LR stack slot (e.g. for builtin_return_address. - return MFI->usesLR() || MFI->isLRStoreRequired() || - // FIXME: Anything that has a call should clobber the LR register, - // isn't this redundant?? - MF.getFrameInfo()->hasCalls(); + // We need a save/restore of LR if there is any def of LR (which is + // defined by calls, including the PIC setup sequence), or if there is + // some use of the LR stack slot (e.g. for builtin_return_address). + // (LR comes in 32 and 64 bit versions.) + MachineRegisterInfo::def_iterator RI = MF.getRegInfo().def_begin(LR); + return RI !=MF.getRegInfo().def_end() || MFI->isLRStoreRequired(); } @@ -406,7 +406,7 @@ eliminateCallFramePseudoInstr(MachineFunction &MF, MachineBasicBlock &MBB, MachineBasicBlock::iterator I) const { if (PerformTailCallOpt && I->getOpcode() == PPC::ADJCALLSTACKUP) { - // Add (actually substract) back the amount the callee popped on return. + // Add (actually subtract) back the amount the callee popped on return. if (int CalleeAmt = I->getOperand(1).getImm()) { bool is64Bit = Subtarget.isPPC64(); CalleeAmt *= -1; @@ -934,7 +934,7 @@ // Save and clear the LR state. PPCFunctionInfo *FI = MF.getInfo(); unsigned LR = getRARegister(); - FI->setUsesLR(MF.getRegInfo().isPhysRegUsed(LR)); + FI->setMustSaveLR(MustSaveLR(MF, LR)); MF.getRegInfo().setPhysRegUnused(LR); // Save R31 if necessary @@ -1015,8 +1015,9 @@ bool IsPPC64 = Subtarget.isPPC64(); // Get operating system bool IsMachoABI = Subtarget.isMachoABI(); - // Check if the link register (LR) has been used. - bool UsesLR = MustSaveLR(MF); + // Check if the link register (LR) must be saved. + PPCFunctionInfo *FI = MF.getInfo(); + bool MustSaveLR = FI->mustSaveLR(); // Do we have a frame pointer for this function? bool HasFP = hasFP(MF) && FrameSize; @@ -1024,7 +1025,7 @@ int FPOffset = PPCFrameInfo::getFramePointerSaveOffset(IsPPC64, IsMachoABI); if (IsPPC64) { - if (UsesLR) + if (MustSaveLR) BuildMI(MBB, MBBI, TII.get(PPC::MFLR8), PPC::X0); if (HasFP) @@ -1033,13 +1034,13 @@ .addImm(FPOffset/4) .addReg(PPC::X1); - if (UsesLR) + if (MustSaveLR) BuildMI(MBB, MBBI, TII.get(PPC::STD)) .addReg(PPC::X0) .addImm(LROffset / 4) .addReg(PPC::X1); } else { - if (UsesLR) + if (MustSaveLR) BuildMI(MBB, MBBI, TII.get(PPC::MFLR), PPC::R0); if (HasFP) @@ -1048,7 +1049,7 @@ .addImm(FPOffset) .addReg(PPC::R1); - if (UsesLR) + if (MustSaveLR) BuildMI(MBB, MBBI, TII.get(PPC::STW)) .addReg(PPC::R0) .addImm(LROffset) @@ -1222,8 +1223,9 @@ bool IsPPC64 = Subtarget.isPPC64(); // Get operating system bool IsMachoABI = Subtarget.isMachoABI(); - // Check if the link register (LR) has been used. - bool UsesLR = MustSaveLR(MF); + // Check if the link register (LR) has been saved. + PPCFunctionInfo *FI = MF.getInfo(); + bool MustSaveLR = FI->mustSaveLR(); // Do we have a frame pointer for this function? bool HasFP = hasFP(MF) && FrameSize; @@ -1237,8 +1239,6 @@ RetOpcode == PPC::TCRETURNdi8 || RetOpcode == PPC::TCRETURNai8; - PPCFunctionInfo *FI = MF.getInfo(); - if (UsesTCRet) { int MaxTCRetDelta = FI->getTailCallSPDelta(); MachineOperand &StackAdjust = MBBI->getOperand(1); @@ -1309,7 +1309,7 @@ } if (IsPPC64) { - if (UsesLR) + if (MustSaveLR) BuildMI(MBB, MBBI, TII.get(PPC::LD), PPC::X0) .addImm(LROffset/4).addReg(PPC::X1); @@ -1317,10 +1317,10 @@ BuildMI(MBB, MBBI, TII.get(PPC::LD), PPC::X31) .addImm(FPOffset/4).addReg(PPC::X1); - if (UsesLR) + if (MustSaveLR) BuildMI(MBB, MBBI, TII.get(PPC::MTLR8)).addReg(PPC::X0); } else { - if (UsesLR) + if (MustSaveLR) BuildMI(MBB, MBBI, TII.get(PPC::LWZ), PPC::R0) .addImm(LROffset).addReg(PPC::R1); @@ -1328,7 +1328,7 @@ BuildMI(MBB, MBBI, TII.get(PPC::LWZ), PPC::R31) .addImm(FPOffset).addReg(PPC::R1); - if (UsesLR) + if (MustSaveLR) BuildMI(MBB, MBBI, TII.get(PPC::MTLR)).addReg(PPC::R0); } From kremenek at apple.com Fri Oct 24 16:26:24 2008 From: kremenek at apple.com (Ted Kremenek) Date: Fri, 24 Oct 2008 21:26:24 -0000 Subject: [llvm-commits] [llvm] r58117 - /llvm/tags/checker/checker-117/ Message-ID: <200810242126.m9OLQOSW011541@zion.cs.uiuc.edu> Author: kremenek Date: Fri Oct 24 16:26:23 2008 New Revision: 58117 URL: http://llvm.org/viewvc/llvm-project?rev=58117&view=rev Log: Tagging checker-117. Added: llvm/tags/checker/checker-117/ - copied from r58116, llvm/trunk/ From monping at apple.com Fri Oct 24 16:49:22 2008 From: monping at apple.com (Mon Ping Wang) Date: Fri, 24 Oct 2008 14:49:22 -0700 Subject: [llvm-commits] memory intrinsic use patch Message-ID: This is a patch provides an interface to allow the DAG to build target intrinsic node. When looking at a intrinsic, it asks the target to see if the intrinsic is a target memory intrinsic and if so, it returns information about the type of access (read/write and size) so the DAG can build a memintrinsic node. Please let me know if you have any comments. -- Mon Ping -------------- next part -------------- A non-text attachment was scrubbed... Name: memintrin.patch Type: application/octet-stream Size: 3145 bytes Desc: not available Url : http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20081024/17805728/attachment.obj From kremenek at apple.com Fri Oct 24 16:53:05 2008 From: kremenek at apple.com (Ted Kremenek) Date: Fri, 24 Oct 2008 14:53:05 -0700 Subject: [llvm-commits] [llvm] r58048 - in /llvm/trunk: include/llvm/Support/DataTypes.h.in win32/VMCore/VMCore.vcproj win32/clang.sln In-Reply-To: <49021840.8040507@zaimoni.com> References: <200810232328.m9NNSObW020740@zion.cs.uiuc.edu> <49021840.8040507@zaimoni.com> Message-ID: <2C8D9E55-D93D-452B-9652-937C29EAF282@apple.com> On Oct 24, 2008, at 11:47 AM, Kenneth Boyd wrote: > Ted Kremenek wrote: >> On Oct 23, 2008, at 4:28 PM, Steve Naroff wrote: >> >> >>> = >>> = >>> = >>> = >>> = >>> = >>> = >>> = >>> = >>> = >>> ==================================================================== >>> --- llvm/trunk/include/llvm/Support/DataTypes.h.in (original) >>> +++ llvm/trunk/include/llvm/Support/DataTypes.h.in Thu Oct 23 >>> 18:28:23 2008 >>> @@ -37,6 +37,11 @@ >>> # error "Must #define __STDC_LIMIT_MACROS before #including Support/ >>> DataTypes.h" >>> #endif >>> >>> +#if !defined(__STDC_CONSTANT_MACROS) >>> +# error "Must #define __STDC_CONSTANT_MACROS before " \ >>> + "#including Support/DataTypes.h" >>> +#endif >>> + >>> >> >> Hi Steve, >> >> This breaks building Clang in Xcode (164 errors). Everywhere that >> DataTypes.h is included I see the error "Must #define >> __STDC_CONSTANT_MACROS before #including Support/DataTypes.h". What >> was the motivation for these lines? >> > C99 and the current C0X draft both have a bogus suggestion [C99 > footnote > 220 to 7.18.2p1] (prohbited by C++0X 18.3.1p2, do not have C++03 on > hand > to check) that this macro be defined to enable a number of macros in > stdint.h in C++. [E.g., the INT64_C macro.] As this suggestion has > no > observable effect in a C program, it should be removed from C0X. > > I'm certain I'm not the first to have this idea, so I would want to > research whether this has been officially rejected before proposing > it. > > In my opinion, the correct way to handle this is to test for the > definition of the INT64_C macro after including stdint.h. If > INT64_C is > not defined, then you know you have a broken stdint.h and should error > immediately. > > If furthermore __STDC_CONSTANT_MACROS is not defined, then we can > suggest that could be the problem (it would fix the problem on GCC, > which has a C99-compliant stdint.h). > > Kenneth Thanks Kenneth. I noticed that "__STDC_CONSTANT_MACROS" is explicitly passed as a -D option by make: Makefile.rules:CPP.BaseFlags += -D_GNU_SOURCE -D__STDC_LIMIT_MACROS - D__STDC_CONSTANT_MACROS Modifying the Xcode project to also add this option is trivial; I'm not certain if your last comment implies that the compiler (gcc) should be defining __STDC_CONSTANT_MACROS on its own. From dalej at apple.com Fri Oct 24 17:08:02 2008 From: dalej at apple.com (Dale Johannesen) Date: Fri, 24 Oct 2008 22:08:02 -0000 Subject: [llvm-commits] [llvm] r58121 - /llvm/trunk/lib/Target/PowerPC/PPCInstrInfo.td Message-ID: <200810242208.m9OM82Lh013179@zion.cs.uiuc.edu> Author: johannes Date: Fri Oct 24 17:08:01 2008 New Revision: 58121 URL: http://llvm.org/viewvc/llvm-project?rev=58121&view=rev Log: Mark MFCR as reading all condition code registers. Prevents some more overzealous deletions (mostly in AltiVec code). Modified: llvm/trunk/lib/Target/PowerPC/PPCInstrInfo.td Modified: llvm/trunk/lib/Target/PowerPC/PPCInstrInfo.td URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/PPCInstrInfo.td?rev=58121&r1=58120&r2=58121&view=diff ============================================================================== --- llvm/trunk/lib/Target/PowerPC/PPCInstrInfo.td (original) +++ llvm/trunk/lib/Target/PowerPC/PPCInstrInfo.td Fri Oct 24 17:08:01 2008 @@ -1095,8 +1095,10 @@ def MTCRF : XFXForm_5<31, 144, (outs), (ins crbitm:$FXM, GPRC:$rS), "mtcrf $FXM, $rS", BrMCRX>, PPC970_MicroCode, PPC970_Unit_CRU; +let Uses = [CR0, CR1, CR2, CR3, CR4, CR5, CR6, CR7] in { def MFCR : XFXForm_3<31, 19, (outs GPRC:$rT), (ins), "mfcr $rT", SprMFCR>, PPC970_MicroCode, PPC970_Unit_CRU; +} def MFOCRF: XFXForm_5a<31, 19, (outs GPRC:$rT), (ins crbitm:$FXM), "mfcr $rT, $FXM", SprMFCR>, PPC970_DGroup_First, PPC970_Unit_CRU; From gohman at apple.com Fri Oct 24 17:36:05 2008 From: gohman at apple.com (Dan Gohman) Date: Fri, 24 Oct 2008 22:36:05 -0000 Subject: [llvm-commits] [test-suite] r58126 - in /test-suite/trunk: External/SPEC/Sandbox.sh MultiSource/Benchmarks/MallocBench/gawk/version.sh MultiSource/Benchmarks/MallocBench/perl/config.sh autoconf/AutoRegen.sh autoconf/ltmain.sh Message-ID: <200810242236.m9OMa5fV014293@zion.cs.uiuc.edu> Author: djg Date: Fri Oct 24 17:36:05 2008 New Revision: 58126 URL: http://llvm.org/viewvc/llvm-project?rev=58126&view=rev Log: Change the svn:mime-type from application/x-sh to text/x-sh for these files so that svn doesn't decline to diff them. Modified: test-suite/trunk/External/SPEC/Sandbox.sh (props changed) test-suite/trunk/MultiSource/Benchmarks/MallocBench/gawk/version.sh (props changed) test-suite/trunk/MultiSource/Benchmarks/MallocBench/perl/config.sh (props changed) test-suite/trunk/autoconf/AutoRegen.sh (props changed) test-suite/trunk/autoconf/ltmain.sh (props changed) Propchange: test-suite/trunk/External/SPEC/Sandbox.sh ------------------------------------------------------------------------------ --- svn:mime-type (original) +++ svn:mime-type Fri Oct 24 17:36:05 2008 @@ -1 +1 @@ -application/x-sh +text/x-sh Propchange: test-suite/trunk/MultiSource/Benchmarks/MallocBench/gawk/version.sh ------------------------------------------------------------------------------ --- svn:mime-type (original) +++ svn:mime-type Fri Oct 24 17:36:05 2008 @@ -1 +1 @@ -application/x-sh +text/x-sh Propchange: test-suite/trunk/MultiSource/Benchmarks/MallocBench/perl/config.sh ------------------------------------------------------------------------------ --- svn:mime-type (original) +++ svn:mime-type Fri Oct 24 17:36:05 2008 @@ -1 +1 @@ -application/x-sh +text/x-sh Propchange: test-suite/trunk/autoconf/AutoRegen.sh ------------------------------------------------------------------------------ --- svn:mime-type (original) +++ svn:mime-type Fri Oct 24 17:36:05 2008 @@ -1 +1 @@ -application/x-sh +text/x-sh Propchange: test-suite/trunk/autoconf/ltmain.sh ------------------------------------------------------------------------------ --- svn:mime-type (original) +++ svn:mime-type Fri Oct 24 17:36:05 2008 @@ -1 +1 @@ -application/x-sh +text/x-sh From evan.cheng at apple.com Fri Oct 24 19:52:42 2008 From: evan.cheng at apple.com (Evan Cheng) Date: Sat, 25 Oct 2008 00:52:42 -0000 Subject: [llvm-commits] [llvm] r58129 - in /llvm/trunk: lib/CodeGen/PreAllocSplitting.cpp test/CodeGen/X86/pre-split4.ll Message-ID: <200810250052.m9P0qgjR018770@zion.cs.uiuc.edu> Author: evancheng Date: Fri Oct 24 19:52:41 2008 New Revision: 58129 URL: http://llvm.org/viewvc/llvm-project?rev=58129&view=rev Log: If val# def is ~0U, meaning it's defined by a PHI, and it's previously split, spill before the barrier because it's impossible to determine if all the defs are spilled in the same spill slot. Added: llvm/trunk/test/CodeGen/X86/pre-split4.ll Modified: llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp Modified: llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp?rev=58129&r1=58128&r2=58129&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp (original) +++ llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp Fri Oct 24 19:52:41 2008 @@ -527,21 +527,23 @@ int SS; unsigned SpillIndex = 0; MachineInstr *SpillMI = NULL; - if (isAlreadySplit(CurrLI->reg, ValNo->id, SS)) { - // If it's already split, just restore the value. There is no need to spill - // the def again. - } else if (ValNo->def == ~0U) { + bool PrevSpilled = isAlreadySplit(CurrLI->reg, ValNo->id, SS); + if (ValNo->def == ~0U) { // If it's defined by a phi, we must split just before the barrier. MachineBasicBlock::iterator SpillPt = findSpillPoint(BarrierMBB, Barrier, RefsInMBB, SpillIndex); if (SpillPt == BarrierMBB->begin()) return false; // No gap to insert spill. // Add spill. - SS = MFI->CreateStackObject(RC->getSize(), RC->getAlignment()); + if (!PrevSpilled) + // If previously split, reuse the spill slot. + SS = MFI->CreateStackObject(RC->getSize(), RC->getAlignment()); TII->storeRegToStackSlot(*BarrierMBB, SpillPt, CurrLI->reg, true, SS, RC); SpillMI = prior(SpillPt); LIs->InsertMachineInstrInMaps(SpillMI, SpillIndex); - } else { + } else if (!PrevSpilled) { + // If it's already split, just restore the value. There is no need to spill + // the def again. // Check if it's possible to insert a spill after the def MI. MachineBasicBlock::iterator SpillPt = findNextEmptySlot(DefMBB, DefMI, SpillIndex); @@ -549,8 +551,8 @@ return false; // No gap to insert spill. SS = MFI->CreateStackObject(RC->getSize(), RC->getAlignment()); - // Add spill. The store instruction kills the register if def is before the - // barrier in the barrier block. + // Add spill. The store instruction kills the register if def is before + // the barrier in the barrier block. TII->storeRegToStackSlot(*DefMBB, SpillPt, CurrLI->reg, DefMBB == BarrierMBB, SS, RC); SpillMI = prior(SpillPt); @@ -567,7 +569,7 @@ // If live interval is spilled in the same block as the barrier, just // create a hole in the interval. if (!DefMBB || - (SpillIndex && SpillMI->getParent() == BarrierMBB)) { + (SpillMI && SpillMI->getParent() == BarrierMBB)) { UpdateIntervalForSplit(ValNo, LIs->getUseIndex(SpillIndex)+1, LIs->getDefIndex(RestoreIndex)); Added: llvm/trunk/test/CodeGen/X86/pre-split4.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/pre-split4.ll?rev=58129&view=auto ============================================================================== --- llvm/trunk/test/CodeGen/X86/pre-split4.ll (added) +++ llvm/trunk/test/CodeGen/X86/pre-split4.ll Fri Oct 24 19:52:41 2008 @@ -0,0 +1,24 @@ +; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 -pre-alloc-split -stats |& \ +; RUN: grep {pre-alloc-split} | grep {Number of intervals split} | grep 4 + +define i32 @main(i32 %argc, i8** %argv) nounwind { +entry: + br label %bb + +bb: ; preds = %bb, %entry + %k.0.reg2mem.0 = phi double [ 1.000000e+00, %entry ], [ %6, %bb ] ; [#uses=2] + %Flint.0.reg2mem.0 = phi double [ 0.000000e+00, %entry ], [ %5, %bb ] ; [#uses=1] + %twoThrd.0.reg2mem.0 = phi double [ 0.000000e+00, %entry ], [ %1, %bb ] ; [#uses=1] + %0 = tail call double @llvm.pow.f64(double 0x3FE5555555555555, double 0.000000e+00) ; [#uses=1] + %1 = add double %0, %twoThrd.0.reg2mem.0 ; [#uses=1] + %2 = tail call double @sin(double %k.0.reg2mem.0) nounwind readonly ; [#uses=1] + %3 = mul double 0.000000e+00, %2 ; [#uses=1] + %4 = fdiv double 1.000000e+00, %3 ; [#uses=1] + %5 = add double %4, %Flint.0.reg2mem.0 ; [#uses=1] + %6 = add double %k.0.reg2mem.0, 1.000000e+00 ; [#uses=1] + br label %bb +} + +declare double @llvm.pow.f64(double, double) nounwind readonly + +declare double @sin(double) nounwind readonly From zaimoni at zaimoni.com Fri Oct 24 20:13:36 2008 From: zaimoni at zaimoni.com (Kenneth Boyd) Date: Fri, 24 Oct 2008 20:13:36 -0500 Subject: [llvm-commits] [llvm] r58048 - in /llvm/trunk: include/llvm/Support/DataTypes.h.in win32/VMCore/VMCore.vcproj win32/clang.sln In-Reply-To: <2C8D9E55-D93D-452B-9652-937C29EAF282@apple.com> References: <200810232328.m9NNSObW020740@zion.cs.uiuc.edu> <49021840.8040507@zaimoni.com> <2C8D9E55-D93D-452B-9652-937C29EAF282@apple.com> Message-ID: <490272C0.6040907@zaimoni.com> Ted Kremenek wrote: > Thanks Kenneth. > > I noticed that "__STDC_CONSTANT_MACROS" is explicitly passed as a -D > option by make: > > Makefile.rules:CPP.BaseFlags += -D_GNU_SOURCE -D__STDC_LIMIT_MACROS - > D__STDC_CONSTANT_MACROS > > Modifying the Xcode project to also add this option is trivial; I'm > not certain if your last comment implies that the compiler (gcc) > should be defining __STDC_CONSTANT_MACROS on its own. > The wording of the C standards is paradoxical here. My impression is that the C99 standard committee was thinking of __STDC_CONSTANT_MACROS acting on stdint.h (in C++) like the POSIX feature test macro _POSIX_C_SOURCE does on limits.h ; the compiler has no business defining _POSIX_C_SOURCE automatically. I'm not comfortable with application source code defining any macros reserved to either the implementation, or the C/C++ standards. Doing it at the command line feels like the most reasonable way to do it. Kenneth From ofv at wanadoo.es Fri Oct 24 22:19:13 2008 From: ofv at wanadoo.es (Oscar Fuentes) Date: Sat, 25 Oct 2008 03:19:13 -0000 Subject: [llvm-commits] [llvm] r58130 - /llvm/trunk/lib/AsmParser/CMakeLists.txt Message-ID: <200810250319.m9P3JEMx023237@zion.cs.uiuc.edu> Author: ofv Date: Fri Oct 24 22:19:08 2008 New Revision: 58130 URL: http://llvm.org/viewvc/llvm-project?rev=58130&view=rev Log: CMake: Cross-platform support for using pre-generated llvmAsmParser.cpp and llvmAsmParser.h. Modified: llvm/trunk/lib/AsmParser/CMakeLists.txt Modified: llvm/trunk/lib/AsmParser/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/CMakeLists.txt?rev=58130&r1=58129&r2=58130&view=diff ============================================================================== --- llvm/trunk/lib/AsmParser/CMakeLists.txt (original) +++ llvm/trunk/lib/AsmParser/CMakeLists.txt Fri Oct 24 22:19:08 2008 @@ -2,34 +2,27 @@ include(FindBison) find_bison() -IF(BISON_EXECUTABLE) -bison_generator( - "llvmAsm" - "${CMAKE_CURRENT_SOURCE_DIR}/llvmAsmParser.y" - "${CMAKE_CURRENT_SOURCE_DIR}/llvmAsmParser.h" - "${CMAKE_CURRENT_SOURCE_DIR}/llvmAsmParser.cpp" - ) -ELSE(BISON_EXECUTABLE) - MESSAGE(STATUS "Bison not found, the pregenerated files will be used") - - IF(WIN32) - FILE(TO_NATIVE_PATH ${CMAKE_CURRENT_SOURCE_DIR} WIN_SOURCE_DIR) +if(BISON_EXECUTABLE) + bison_generator( + "llvmAsm" + "${CMAKE_CURRENT_SOURCE_DIR}/llvmAsmParser.y" + "${CMAKE_CURRENT_SOURCE_DIR}/llvmAsmParser.h" + "${CMAKE_CURRENT_SOURCE_DIR}/llvmAsmParser.cpp" + ) +else(BISON_EXECUTABLE) + message(STATUS "Bison not found, the pregenerated files will be used") - ADD_CUSTOM_COMMAND( - OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/llvmAsmParser.cpp" - DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/llvmAsmParser.cpp.cvs" - COMMAND copy \"${WIN_SOURCE_DIR}\\llvmAsmParser.cpp.cvs\" \"${WIN_SOURCE_DIR}\\llvmAsmParser.cpp\" + add_custom_command( + OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/llvmAsmParser.cpp" + DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/llvmAsmParser.cpp.cvs" + COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/llvmAsmParser.cpp.cvs" "${CMAKE_CURRENT_SOURCE_DIR}/llvmAsmParser.cpp" ) - ADD_CUSTOM_COMMAND( - OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/llvmAsmParser.h" - DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/llvmAsmParser.h.cvs" - COMMAND copy \"${WIN_SOURCE_DIR}\\llvmAsmParser.h.cvs\" \"${WIN_SOURCE_DIR}\\llvmAsmParser.h\" + add_custom_command( + OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/llvmAsmParser.h" + DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/llvmAsmParser.h.cvs" + COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/llvmAsmParser.h.cvs" "${CMAKE_CURRENT_SOURCE_DIR}/llvmAsmParser.h" ) - ELSE(WIN32) - MESSAGE(SEND_ERROR "Not implemented") - # fixme do the same with cp instead of copy - ENDIF(WIN32) -ENDIF(BISON_EXECUTABLE) +endif(BISON_EXECUTABLE) add_llvm_library(LLVMAsmParser llvmAsmParser.cpp # Generated from llvmAsmParser.y or copyied from corresponding .cvs From ofv at wanadoo.es Fri Oct 24 22:25:11 2008 From: ofv at wanadoo.es (Oscar Fuentes) Date: Sat, 25 Oct 2008 03:25:11 -0000 Subject: [llvm-commits] [llvm] r58131 - /llvm/trunk/include/llvm/Support/DataTypes.h.cmake Message-ID: <200810250325.m9P3PBg6023402@zion.cs.uiuc.edu> Author: ofv Date: Fri Oct 24 22:25:11 2008 New Revision: 58131 URL: http://llvm.org/viewvc/llvm-project?rev=58131&view=rev Log: CMake: Sync'ed DataTypes.h.cmake with DataTypes.h.in. Modified: llvm/trunk/include/llvm/Support/DataTypes.h.cmake Modified: llvm/trunk/include/llvm/Support/DataTypes.h.cmake URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/DataTypes.h.cmake?rev=58131&r1=58130&r2=58131&view=diff ============================================================================== --- llvm/trunk/include/llvm/Support/DataTypes.h.cmake (original) +++ llvm/trunk/include/llvm/Support/DataTypes.h.cmake Fri Oct 24 22:25:11 2008 @@ -40,6 +40,11 @@ # error "Must #define __STDC_LIMIT_MACROS before #including Support/DataTypes.h" #endif +#if !defined(__STDC_CONSTANT_MACROS) +# error "Must #define __STDC_CONSTANT_MACROS before " \ + "#including Support/DataTypes.h" +#endif + // Note that includes , if this is a C99 system. #ifdef HAVE_SYS_TYPES_H #include @@ -108,6 +113,14 @@ #define INT32_MAX 2147483647 #define INT32_MIN -2147483648 #define UINT32_MAX 4294967295U +#define INT8_C(C) C +#define UINT8_C(C) C +#define INT16_C(C) C +#define UINT16_C(C) C +#define INT32_C(C) C +#define UINT32_C(C) C ## U +#define INT64_C(C) ((int64_t) C ## LL) +#define UINT64_C(C) ((uint64_t) C ## ULL) #endif /* _MSC_VER */ /* Set defaults for constants which we cannot find. */ From ofv at wanadoo.es Fri Oct 24 22:29:37 2008 From: ofv at wanadoo.es (Oscar Fuentes) Date: Sat, 25 Oct 2008 03:29:37 -0000 Subject: [llvm-commits] [llvm] r58132 - in /llvm/trunk: CMakeLists.txt cmake/config-ix.cmake cmake/config-w32.cmake include/llvm/Config/config.h.cmake Message-ID: <200810250329.m9P3TbxG023531@zion.cs.uiuc.edu> Author: ofv Date: Fri Oct 24 22:29:36 2008 New Revision: 58132 URL: http://llvm.org/viewvc/llvm-project?rev=58132&view=rev Log: CMake: MSVC++ no longer uses a special configuration method. Removed: llvm/trunk/cmake/config-w32.cmake Modified: llvm/trunk/CMakeLists.txt llvm/trunk/cmake/config-ix.cmake llvm/trunk/include/llvm/Config/config.h.cmake Modified: llvm/trunk/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/CMakeLists.txt?rev=58132&r1=58131&r2=58132&view=diff ============================================================================== --- llvm/trunk/CMakeLists.txt (original) +++ llvm/trunk/CMakeLists.txt Fri Oct 24 22:29:36 2008 @@ -65,13 +65,7 @@ # find_file(HAVE_LLVM_CONFIG llvm-config ${LLVM_TOOLS_BINARY_DIR}) # message(STATUS ${HAVE_LLVM_CONFIG}) -if( MSVC ) - message(STATUS "Configuring using MSVC hack.") - include(config-w32) -else( MSVC ) - message(STATUS "Configuring traditional style.") - include(config-ix) -endif( MSVC ) +include(config-ix) set( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${LLVM_TOOLS_BINARY_DIR} ) set( CMAKE_LIBRARY_OUTPUT_DIRECTORY ${LLVM_BINARY_DIR}/lib ) Modified: llvm/trunk/cmake/config-ix.cmake URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/config-ix.cmake?rev=58132&r1=58131&r2=58132&view=diff ============================================================================== --- llvm/trunk/cmake/config-ix.cmake (original) +++ llvm/trunk/cmake/config-ix.cmake Fri Oct 24 22:29:36 2008 @@ -23,6 +23,7 @@ check_include_file(stdint.h HAVE_STDINT_H) check_include_file(stdio.h HAVE_STDIO_H) check_include_file(stdlib.h HAVE_STDLIB_H) +check_include_file(string.h HAVE_STRING_H) check_include_file(sys/dir.h HAVE_SYS_DIR_H) check_include_file(sys/dl.h HAVE_SYS_DL_H) check_include_file(sys/mman.h HAVE_SYS_MMAN_H) @@ -34,6 +35,7 @@ check_include_file(sys/types.h HAVE_SYS_TYPES_H) check_include_file(unistd.h HAVE_UNISTD_H) check_include_file(utime.h HAVE_UTIME_H) +check_include_file(windows.h HAVE_WINDOWS_H) # function checks include(CheckSymbolExists) @@ -44,8 +46,11 @@ check_symbol_exists(isinf math.h HAVE_ISINF_IN_MATH_H) check_symbol_exists(isnan cmath HAVE_ISNAN_IN_CMATH) check_symbol_exists(isnan math.h HAVE_ISNAN_IN_MATH_H) +check_symbol_exists(ceilf math.h HAVE_CEILF) +check_symbol_exists(floorf math.h HAVE_FLOORF) check_symbol_exists(mallinfo malloc.h HAVE_MALLINFO) check_symbol_exists(pthread_mutex_lock pthread.h HAVE_PTHREAD_MUTEX_LOCK) +check_symbol_exists(strtoll stdlib.h HAVE_STRTOLL) if( MINGW ) # tbi: Comprobar que existen las librerias: @@ -55,11 +60,31 @@ # CHECK_LIBRARY_EXISTS(imagehlp ??? . HAVE_LIBIMAGEHLP) endif( MINGW ) -# Classes -include(CheckCxxHashmap) -include(CheckCxxHashset) -check_hashmap() -check_hashset() +if( MSVC ) + set(error_t int) + set(LTDL_SHLIBPATH_VAR "PATH") + set(LTDL_SYSSEARCHPATH "") + set(LTDL_DLOPEN_DEPLIBS 1) + set(SHLIBEXT ".lib") + set(LTDL_OBJDIR "_libs") + set(HAVE_STRTOLL 1) + set(strtoll "_strtoi64") + set(strtoull "_strtoui64") + set(stricmp "_stricmp") + set(strdup "_strdup") +else( MSVC ) + set(LTDL_SHLIBPATH_VAR "LD_LIBRARY_PATH") + set(LTDL_SYSSEARCHPATH "") # TODO + set(LTDL_DLOPEN_DEPLIBS 0) # TODO +endif( MSVC ) + +if( NOT MSVC ) + # hash_map.h.in and hash_set.h.in contain a special case for MSVC + include(CheckCxxHashmap) + include(CheckCxxHashset) + check_hashmap() + check_hashset() +endif( NOT MSVC ) # FIXME: Signal handler return type, currently hardcoded to 'void' set(RETSIGTYPE void) Removed: llvm/trunk/cmake/config-w32.cmake URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/config-w32.cmake?rev=58131&view=auto ============================================================================== --- llvm/trunk/cmake/config-w32.cmake (original) +++ llvm/trunk/cmake/config-w32.cmake (removed) @@ -1,9 +0,0 @@ -# tbi: Configurar ficheros. -configure_file(${llvm_include_path}/llvm/ADT/hash_map.h.in ${llvm_builded_incs_dir}/ADT/hash_map.h COPYONLY) -configure_file(${llvm_include_path}/llvm/ADT/hash_set.h.in ${llvm_builded_incs_dir}/ADT/hash_set.h COPYONLY) -configure_file(${llvm_include_path}/llvm/ADT/iterator.h.in ${llvm_builded_incs_dir}/ADT/iterator.h COPYONLY) -configure_file(${llvm_include_path}/llvm/Support/DataTypes.h.in ${llvm_builded_incs_dir}/Support/DataTypes.h COPYONLY) -configure_file(${llvm_include_path}/llvm/Config/config.h.in ${llvm_builded_incs_dir}/Config/config.h COPYONLY) - -file(READ ${llvm_include_path}/../win32/config.h vc_config_text) -file(APPEND ${llvm_builded_incs_dir}/Config/config.h ${vc_config_text}) Modified: llvm/trunk/include/llvm/Config/config.h.cmake URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Config/config.h.cmake?rev=58132&r1=58131&r2=58132&view=diff ============================================================================== --- llvm/trunk/include/llvm/Config/config.h.cmake (original) +++ llvm/trunk/include/llvm/Config/config.h.cmake Fri Oct 24 22:29:36 2008 @@ -61,7 +61,7 @@ #undef HAVE_BI_ITERATOR /* Define to 1 if you have the `ceilf' function. */ -#undef HAVE_CEILF +#cmakedefine HAVE_CEILF ${HAVE_CEILF} /* Define to 1 if you have the `closedir' function. */ #undef HAVE_CLOSEDIR @@ -116,7 +116,7 @@ #undef HAVE_FINITE_IN_IEEEFP_H /* Define to 1 if you have the `floorf' function. */ -#undef HAVE_FLOORF +#cmakedefine HAVE_FLOORF ${HAVE_FLOORF} /* Does not have forward iterator */ #undef HAVE_FWD_ITERATOR @@ -367,13 +367,13 @@ #undef HAVE_STRINGS_H /* Define to 1 if you have the header file. */ -#undef HAVE_STRING_H +#cmakedefine HAVE_STRING_H ${HAVE_STRING_H} /* Define to 1 if you have the `strrchr' function. */ #undef HAVE_STRRCHR /* Define to 1 if you have the `strtoll' function. */ -#undef HAVE_STRTOLL +#cmakedefine HAVE_STRTOLL ${HAVE_STRTOLL} /* Define to 1 if you have the `strtoq' function. */ #undef HAVE_STRTOQ @@ -426,7 +426,7 @@ #undef HAVE_U_INT64_T /* Define to 1 if you have the header file. */ -#undef HAVE_WINDOWS_H +#cmakedefine HAVE_WINDOWS_H ${HAVE_WINDOWS_H} /* Installation directory for binary executables */ #undef LLVM_BINDIR @@ -477,7 +477,7 @@ #undef LLVM_PREFIX /* Define if the OS needs help to load dependent libraries for dlopen(). */ -#undef LTDL_DLOPEN_DEPLIBS +#cmakedefine LTDL_DLOPEN_DEPLIBS ${LTDL_DLOPEN_DEPLIBS} /* Define to the sub-directory in which libtool stores uninstalled libraries. */ @@ -485,13 +485,13 @@ /* Define to the name of the environment variable that determines the dynamic library search path. */ -#undef LTDL_SHLIBPATH_VAR +#cmakedefine LTDL_SHLIBPATH_VAR "${LTDL_SHLIBPATH_VAR}" /* Define to the extension used for shared libraries, say, ".so". */ #cmakedefine LTDL_SHLIB_EXT "${LTDL_SHLIB_EXT}" /* Define to the system default library search path. */ -#undef LTDL_SYSSEARCHPATH +#cmakedefine LTDL_SYSSEARCHPATH "${LTDL_SYSSEARCHPATH}" /* Define if /dev/zero should be used when mapping RWX memory, or undefine if its not necessary */ @@ -549,10 +549,22 @@ #undef const /* Define to a type to use for `error_t' if it is not otherwise available. */ -#undef error_t +#cmakedefine error_t ${error_t} /* Define to `int' if does not define. */ #undef pid_t /* Define to `unsigned int' if does not define. */ #undef size_t + +/* Define to a function replacing strtoll */ +#cmakedefine strtoll ${strtoll} + +/* Define to a function implementing strtoull */ +#cmakedefine strtoull ${strtoull} + +/* Define to a function implementing stricmp */ +#cmakedefine stricmp ${stricmp} + +/* Define to a function implementing strdup */ +#cmakedefine strdup ${strdup} From ofv at wanadoo.es Fri Oct 24 22:40:32 2008 From: ofv at wanadoo.es (Oscar Fuentes) Date: Sat, 25 Oct 2008 03:40:32 -0000 Subject: [llvm-commits] [llvm] r58133 - /llvm/trunk/lib/Target/ARM/AsmPrinter/CMakeLists.txt Message-ID: <200810250340.m9P3eWPV023855@zion.cs.uiuc.edu> Author: ofv Date: Fri Oct 24 22:40:32 2008 New Revision: 58133 URL: http://llvm.org/viewvc/llvm-project?rev=58133&view=rev Log: CMake: lib/Target/ARM/AsmPrinter/CMakeLists.txt added. Added: llvm/trunk/lib/Target/ARM/AsmPrinter/CMakeLists.txt Added: llvm/trunk/lib/Target/ARM/AsmPrinter/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/AsmPrinter/CMakeLists.txt?rev=58133&view=auto ============================================================================== --- llvm/trunk/lib/Target/ARM/AsmPrinter/CMakeLists.txt (added) +++ llvm/trunk/lib/Target/ARM/AsmPrinter/CMakeLists.txt Fri Oct 24 22:40:32 2008 @@ -0,0 +1,9 @@ +include_directories( ${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/.. ) + +add_partially_linked_object(LLVMARMAsmPrinter + ARMAsmPrinter.cpp + ) + +target_name_of_partially_linked_object(LLVMARMCodeGen n) + +add_dependencies(LLVMARMAsmPrinter ${n}) From ofv at wanadoo.es Fri Oct 24 22:49:35 2008 From: ofv at wanadoo.es (Oscar Fuentes) Date: Sat, 25 Oct 2008 03:49:35 -0000 Subject: [llvm-commits] [llvm] r58134 - /llvm/trunk/CMakeLists.txt Message-ID: <200810250349.m9P3nZOA024132@zion.cs.uiuc.edu> Author: ofv Date: Fri Oct 24 22:49:35 2008 New Revision: 58134 URL: http://llvm.org/viewvc/llvm-project?rev=58134&view=rev Log: CMake: Directed bug reports to llvmbugs. Modified: llvm/trunk/CMakeLists.txt Modified: llvm/trunk/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/CMakeLists.txt?rev=58134&r1=58133&r2=58134&view=diff ============================================================================== --- llvm/trunk/CMakeLists.txt (original) +++ llvm/trunk/CMakeLists.txt Fri Oct 24 22:49:35 2008 @@ -2,8 +2,7 @@ set(PACKAGE_NAME llvm) set(PACKAGE_VERSION svn) -set(PACKAGE_BUGREPORT "ofv at wanadoo.es") -#set(PACKAGE_BUGREPORT "llvmbugs at cs.uiuc.edu") +set(PACKAGE_BUGREPORT "llvmbugs at cs.uiuc.edu") include(FindPerl) From bruno.cardoso at gmail.com Sat Oct 25 09:56:31 2008 From: bruno.cardoso at gmail.com (Bruno Cardoso Lopes) Date: Sat, 25 Oct 2008 14:56:31 -0000 Subject: [llvm-commits] [llvm] r58139 - /llvm/trunk/docs/ReleaseNotes.html Message-ID: <200810251456.m9PEuWKL022457@zion.cs.uiuc.edu> Author: bruno Date: Sat Oct 25 09:56:26 2008 New Revision: 58139 URL: http://llvm.org/viewvc/llvm-project?rev=58139&view=rev Log: Added MIPS release notes. Modified: llvm/trunk/docs/ReleaseNotes.html Modified: llvm/trunk/docs/ReleaseNotes.html URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/ReleaseNotes.html?rev=58139&r1=58138&r2=58139&view=diff ============================================================================== --- llvm/trunk/docs/ReleaseNotes.html (original) +++ llvm/trunk/docs/ReleaseNotes.html Sat Oct 25 09:56:26 2008 @@ -447,7 +447,12 @@
  • Position Independent Code (PIC) is now supported on Linux/x86-64.
  • @llvm.frameaddress now supports getting the frame address of stack frames > 0 on x86/x86-64.
    • -
  • MIPS floating point support? [BRUNO]
    • +
  • MIPS has improved a lot since last release, the most important changes + are: Little endian support, floating point support, allegrex core and + intrinsics support. O32 ABI is improved but isn't complete. The EABI + was implemented and is fully supported. We also have support for small + sections and gp_rel relocation for its access, a threshold in bytes can be + specified through command line.
  • The PowerPC backend now supports trampolines.
    • @@ -700,6 +705,20 @@
    + Known problems with the MIPS back-end +
    + +
    + +
      +
    • The O32 ABI is not fully supported.
      • +
    • 64-bit MIPS targets are not supported yet.
      • +
    + +
    + + +
    Known problems with the Alpha back-end
    From nicolas.geoffray at lip6.fr Sat Oct 25 10:22:07 2008 From: nicolas.geoffray at lip6.fr (Nicolas Geoffray) Date: Sat, 25 Oct 2008 15:22:07 -0000 Subject: [llvm-commits] [llvm] r58141 - in /llvm/trunk/lib/Target/X86: X86CodeEmitter.cpp X86InstrInfo.cpp X86InstrInfo.td Message-ID: <200810251522.m9PFM8Ix023387@zion.cs.uiuc.edu> Author: geoffray Date: Sat Oct 25 10:22:06 2008 New Revision: 58141 URL: http://llvm.org/viewvc/llvm-project?rev=58141&view=rev Log: Generate code for TLS instructions. Modified: llvm/trunk/lib/Target/X86/X86CodeEmitter.cpp llvm/trunk/lib/Target/X86/X86InstrInfo.cpp llvm/trunk/lib/Target/X86/X86InstrInfo.td Modified: llvm/trunk/lib/Target/X86/X86CodeEmitter.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86CodeEmitter.cpp?rev=58141&r1=58140&r2=58141&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/X86CodeEmitter.cpp (original) +++ llvm/trunk/lib/Target/X86/X86CodeEmitter.cpp Sat Oct 25 10:22:06 2008 @@ -527,6 +527,23 @@ case X86::DWARF_LOC: case X86::FP_REG_KILL: break; + case X86::TLS_tp: { + MCE.emitByte(BaseOpcode); + unsigned RegOpcodeField = getX86RegNum(MI.getOperand(0).getReg()); + MCE.emitByte(ModRMByte(0, RegOpcodeField, 5)); + emitConstant(0, 4); + break; + } + case X86::TLS_gs_ri: { + MCE.emitByte(BaseOpcode); + unsigned RegOpcodeField = getX86RegNum(MI.getOperand(0).getReg()); + MCE.emitByte(ModRMByte(0, RegOpcodeField, 5)); + GlobalValue* GV = MI.getOperand(1).getGlobal(); + unsigned rt = Is64BitMode ? X86::reloc_pcrel_word + : (IsPIC ? X86::reloc_picrel_word : X86::reloc_absolute_word); + emitGlobalAddress(GV, rt); + break; + } case X86::MOVPC32r: { // This emits the "call" portion of this pseudo instruction. MCE.emitByte(BaseOpcode); Modified: llvm/trunk/lib/Target/X86/X86InstrInfo.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86InstrInfo.cpp?rev=58141&r1=58140&r2=58141&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/X86InstrInfo.cpp (original) +++ llvm/trunk/lib/Target/X86/X86InstrInfo.cpp Sat Oct 25 10:22:06 2008 @@ -2798,6 +2798,11 @@ FinalSize += sizeConstant(X86InstrInfo::sizeOfImm(Desc)); break; } + case X86::TLS_tp: + case X86::TLS_gs_ri: + FinalSize += 2; + FinalSize += sizeGlobalAddress(false); + break; } CurOp = NumOps; break; Modified: llvm/trunk/lib/Target/X86/X86InstrInfo.td URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86InstrInfo.td?rev=58141&r1=58140&r2=58141&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/X86InstrInfo.td (original) +++ llvm/trunk/lib/Target/X86/X86InstrInfo.td Sat Oct 25 10:22:06 2008 @@ -2618,14 +2618,15 @@ [(set GR32:$dst, (load (add X86TLStp, GR32:$src)))]>; let AddedComplexity = 15 in -def TLS_gs_ri : I<0, Pseudo, (outs GR32:$dst), (ins i32imm:$src), +def TLS_gs_ri : I<0x8B, Pseudo, (outs GR32:$dst), (ins i32imm:$src), "movl\t%gs:${src:mem}, $dst", [(set GR32:$dst, - (load (add X86TLStp, (X86Wrapper tglobaltlsaddr:$src))))]>; + (load (add X86TLStp, (X86Wrapper tglobaltlsaddr:$src))))]>, + SegGS; -def TLS_tp : I<0, Pseudo, (outs GR32:$dst), (ins), +def TLS_tp : I<0x8B, Pseudo, (outs GR32:$dst), (ins), "movl\t%gs:0, $dst", - [(set GR32:$dst, X86TLStp)]>; + [(set GR32:$dst, X86TLStp)]>, SegGS; //===----------------------------------------------------------------------===// // DWARF Pseudo Instructions From nicolas.geoffray at lip6.fr Sat Oct 25 10:41:44 2008 From: nicolas.geoffray at lip6.fr (Nicolas Geoffray) Date: Sat, 25 Oct 2008 15:41:44 -0000 Subject: [llvm-commits] [llvm] r58142 - in /llvm/trunk: include/llvm/ExecutionEngine/ExecutionEngine.h include/llvm/Target/TargetJITInfo.h lib/ExecutionEngine/ExecutionEngine.cpp lib/ExecutionEngine/JIT/JIT.cpp lib/ExecutionEngine/JIT/JIT.h lib/Target/X86/X86JITInfo.cpp lib/Target/X86/X86JITInfo.h Message-ID: <200810251541.m9PFfiHG023970@zion.cs.uiuc.edu> Author: geoffray Date: Sat Oct 25 10:41:43 2008 New Revision: 58142 URL: http://llvm.org/viewvc/llvm-project?rev=58142&view=rev Log: Support for allocation of TLS variables in the JIT. Allocation of a global variable is moved to the execution engine. The JIT calls the TargetJITInfo to allocate thread local storage. Currently, only linux/x86 knows how to allocate thread local global variables. Modified: llvm/trunk/include/llvm/ExecutionEngine/ExecutionEngine.h llvm/trunk/include/llvm/Target/TargetJITInfo.h llvm/trunk/lib/ExecutionEngine/ExecutionEngine.cpp llvm/trunk/lib/ExecutionEngine/JIT/JIT.cpp llvm/trunk/lib/ExecutionEngine/JIT/JIT.h llvm/trunk/lib/Target/X86/X86JITInfo.cpp llvm/trunk/lib/Target/X86/X86JITInfo.h Modified: llvm/trunk/include/llvm/ExecutionEngine/ExecutionEngine.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ExecutionEngine/ExecutionEngine.h?rev=58142&r1=58141&r2=58142&view=diff ============================================================================== --- llvm/trunk/include/llvm/ExecutionEngine/ExecutionEngine.h (original) +++ llvm/trunk/include/llvm/ExecutionEngine/ExecutionEngine.h Sat Oct 25 10:41:43 2008 @@ -76,6 +76,9 @@ void setTargetData(const TargetData *td) { TD = td; } + + /// getMemoryforGV - Allocate memory for a global variable. + virtual char* getMemoryForGV(const GlobalVariable* GV); // To avoid having libexecutionengine depend on the JIT and interpreter // libraries, the JIT and Interpreter set these functions to ctor pointers Modified: llvm/trunk/include/llvm/Target/TargetJITInfo.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/TargetJITInfo.h?rev=58142&r1=58141&r2=58142&view=diff ============================================================================== --- llvm/trunk/include/llvm/Target/TargetJITInfo.h (original) +++ llvm/trunk/include/llvm/Target/TargetJITInfo.h Sat Oct 25 10:41:43 2008 @@ -93,6 +93,14 @@ unsigned NumRelocs, unsigned char* GOTBase) { assert(NumRelocs == 0 && "This target does not have relocations!"); } + + + /// allocateThreadLocalMemory - Each target has its own way of + /// handling thread local variables. This method returns a value only + /// meaningful to the target. + virtual char* allocateThreadLocalMemory(size_t size) { + assert(0 && "This target does not implement thread local storage!"); + } /// needsGOT - Allows a target to specify that it would like the // JIT to manage a GOT for it. Modified: llvm/trunk/lib/ExecutionEngine/ExecutionEngine.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/ExecutionEngine.cpp?rev=58142&r1=58141&r2=58142&view=diff ============================================================================== --- llvm/trunk/lib/ExecutionEngine/ExecutionEngine.cpp (original) +++ llvm/trunk/lib/ExecutionEngine/ExecutionEngine.cpp Sat Oct 25 10:41:43 2008 @@ -52,6 +52,12 @@ delete Modules[i]; } +char* ExecutionEngine::getMemoryForGV(const GlobalVariable* GV) { + const Type *ElTy = GV->getType()->getElementType(); + size_t GVSize = (size_t)getTargetData()->getABITypeSize(ElTy); + return new char[GVSize]; +} + /// removeModuleProvider - Remove a ModuleProvider from the list of modules. /// Release module from ModuleProvider. Module* ExecutionEngine::removeModuleProvider(ModuleProvider *P, @@ -873,7 +879,6 @@ /// their initializers into the memory. /// void ExecutionEngine::emitGlobals() { - const TargetData *TD = getTargetData(); // Loop over all of the global variables in the program, allocating the memory // to hold them. If there is more than one module, do a prepass over globals @@ -934,12 +939,7 @@ } if (!I->isDeclaration()) { - // Get the type of the global. - const Type *Ty = I->getType()->getElementType(); - - // Allocate some memory for it! - unsigned Size = TD->getABITypeSize(Ty); - addGlobalMapping(I, new char[Size]); + addGlobalMapping(I, getMemoryForGV(I)); } else { // External variable reference. Try to use the dynamic loader to // get a pointer to it. @@ -991,15 +991,18 @@ void *GA = getPointerToGlobalIfAvailable(GV); DOUT << "Global '" << GV->getName() << "' -> " << GA << "\n"; - const Type *ElTy = GV->getType()->getElementType(); - size_t GVSize = (size_t)getTargetData()->getABITypeSize(ElTy); if (GA == 0) { // If it's not already specified, allocate memory for the global. - GA = new char[GVSize]; + GA = getMemoryForGV(GV); addGlobalMapping(GV, GA); } - - InitializeMemory(GV->getInitializer(), GA); + + // Don't initialize if it's thread local, let the client do it. + if (!GV->isThreadLocal()) + InitializeMemory(GV->getInitializer(), GA); + + const Type *ElTy = GV->getType()->getElementType(); + size_t GVSize = (size_t)getTargetData()->getABITypeSize(ElTy); NumInitBytes += (unsigned)GVSize; ++NumGlobals; } Modified: llvm/trunk/lib/ExecutionEngine/JIT/JIT.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/JIT/JIT.cpp?rev=58142&r1=58141&r2=58142&view=diff ============================================================================== --- llvm/trunk/lib/ExecutionEngine/JIT/JIT.cpp (original) +++ llvm/trunk/lib/ExecutionEngine/JIT/JIT.cpp Sat Oct 25 10:41:43 2008 @@ -562,7 +562,12 @@ const Type *GlobalType = GV->getType()->getElementType(); size_t S = getTargetData()->getABITypeSize(GlobalType); size_t A = getTargetData()->getPreferredAlignment(GV); - Ptr = MCE->allocateSpace(S, A); + if (GV->isThreadLocal()) { + MutexGuard locked(lock); + Ptr = TJI.allocateThreadLocalMemory(S); + } else { + Ptr = MCE->allocateSpace(S, A); + } addGlobalMapping(GV, Ptr); EmitGlobalVariable(GV); } @@ -594,3 +599,17 @@ return Addr; } +/// getMemoryForGV - This method abstracts memory allocation of global +/// variable so that the JIT can allocate thread local variables depending +/// on the target. +/// +char* JIT::getMemoryForGV(const GlobalVariable* GV) { + const Type *ElTy = GV->getType()->getElementType(); + size_t GVSize = (size_t)getTargetData()->getABITypeSize(ElTy); + if (GV->isThreadLocal()) { + MutexGuard locked(lock); + return TJI.allocateThreadLocalMemory(GVSize); + } else { + return new char[GVSize]; + } +} Modified: llvm/trunk/lib/ExecutionEngine/JIT/JIT.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/JIT/JIT.h?rev=58142&r1=58141&r2=58142&view=diff ============================================================================== --- llvm/trunk/lib/ExecutionEngine/JIT/JIT.h (original) +++ llvm/trunk/lib/ExecutionEngine/JIT/JIT.h Sat Oct 25 10:41:43 2008 @@ -134,6 +134,12 @@ private: static MachineCodeEmitter *createEmitter(JIT &J, JITMemoryManager *JMM); void runJITOnFunction (Function *F); + +protected: + + /// getMemoryforGV - Allocate memory for a global variable. + virtual char* getMemoryForGV(const GlobalVariable* GV); + }; } // End llvm namespace Modified: llvm/trunk/lib/Target/X86/X86JITInfo.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86JITInfo.cpp?rev=58142&r1=58141&r2=58142&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/X86JITInfo.cpp (original) +++ llvm/trunk/lib/Target/X86/X86JITInfo.cpp Sat Oct 25 10:41:43 2008 @@ -518,3 +518,13 @@ } } } + +char* X86JITInfo::allocateThreadLocalMemory(size_t size) { +#if defined(X86_32_JIT) && !defined(__APPLE__) && !defined(_MSC_VER) + TLSOffset -= size; + return TLSOffset; +#else + assert(0 && "Cannot allocate thread local storage on this arch!\n"); + return 0; +#endif +} Modified: llvm/trunk/lib/Target/X86/X86JITInfo.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86JITInfo.h?rev=58142&r1=58141&r2=58142&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/X86JITInfo.h (original) +++ llvm/trunk/lib/Target/X86/X86JITInfo.h Sat Oct 25 10:41:43 2008 @@ -23,8 +23,12 @@ class X86JITInfo : public TargetJITInfo { X86TargetMachine &TM; intptr_t PICBase; + char* TLSOffset; public: - explicit X86JITInfo(X86TargetMachine &tm) : TM(tm) {useGOT = 0;} + explicit X86JITInfo(X86TargetMachine &tm) : TM(tm) { + useGOT = 0; + TLSOffset = 0; + } /// replaceMachineCodeForFunction - Make it so that calling the function /// whose machine code is at OLD turns into a call to NEW, perhaps by @@ -56,6 +60,11 @@ /// referenced global symbols. virtual void relocate(void *Function, MachineRelocation *MR, unsigned NumRelocs, unsigned char* GOTBase); + + /// allocateThreadLocalMemory - Each target has its own way of + /// handling thread local variables. This method returns a value only + /// meaningful to the target. + virtual char* allocateThreadLocalMemory(size_t size); /// setPICBase / getPICBase - Getter / setter of PICBase, used to compute /// PIC jumptable entry. From gordonhenriksen at mac.com Sat Oct 25 11:28:35 2008 From: gordonhenriksen at mac.com (Gordon Henriksen) Date: Sat, 25 Oct 2008 16:28:35 -0000 Subject: [llvm-commits] [llvm] r58143 - in /llvm/trunk: lib/VMCore/Verifier.cpp test/CodeGen/Generic/GC/fat.ll Message-ID: <200810251628.m9PGSah5025470@zion.cs.uiuc.edu> Author: gordon Date: Sat Oct 25 11:28:35 2008 New Revision: 58143 URL: http://llvm.org/viewvc/llvm-project?rev=58143&view=rev Log: Related to PR2911, reject as invalid non-pointer GC roots. Added: llvm/trunk/test/CodeGen/Generic/GC/fat.ll Modified: llvm/trunk/lib/VMCore/Verifier.cpp Modified: llvm/trunk/lib/VMCore/Verifier.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Verifier.cpp?rev=58143&r1=58142&r2=58143&view=diff ============================================================================== --- llvm/trunk/lib/VMCore/Verifier.cpp (original) +++ llvm/trunk/lib/VMCore/Verifier.cpp Sat Oct 25 11:28:35 2008 @@ -1347,8 +1347,10 @@ case Intrinsic::gcwrite: case Intrinsic::gcread: if (ID == Intrinsic::gcroot) { - Assert1(isa(CI.getOperand(1)->stripPointerCasts()), - "llvm.gcroot parameter #1 must be an alloca.", &CI); + AllocaInst *AI = + dyn_cast(CI.getOperand(1)->stripPointerCasts()); + Assert1(AI && isa(AI->getType()->getElementType()), + "llvm.gcroot parameter #1 must be a pointer alloca.", &CI); Assert1(isa(CI.getOperand(2)), "llvm.gcroot parameter #2 must be a constant.", &CI); } Added: llvm/trunk/test/CodeGen/Generic/GC/fat.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Generic/GC/fat.ll?rev=58143&view=auto ============================================================================== --- llvm/trunk/test/CodeGen/Generic/GC/fat.ll (added) +++ llvm/trunk/test/CodeGen/Generic/GC/fat.ll Sat Oct 25 11:28:35 2008 @@ -0,0 +1,10 @@ +; RUN: not llvm-as < %s >& /dev/null + +declare void @llvm.gcroot(i8**, i8*) nounwind + +define void @f() gc "x" { + %st = alloca { i8*, i1 } ; <{ i8*, i1 }*> [#uses=1] + %st_ptr = bitcast { i8*, i1 }* %st to i8** ; [#uses=1] + call void @llvm.gcroot(i8** %st_ptr, i8* null) + ret void +} From gohman at apple.com Sat Oct 25 12:46:53 2008 From: gohman at apple.com (Dan Gohman) Date: Sat, 25 Oct 2008 17:46:53 -0000 Subject: [llvm-commits] [llvm] r58144 - in /llvm/trunk/lib: CodeGen/LLVMTargetMachine.cpp Target/X86/X86TargetMachine.cpp Message-ID: <200810251746.m9PHkr9O028391@zion.cs.uiuc.edu> Author: djg Date: Sat Oct 25 12:46:52 2008 New Revision: 58144 URL: http://llvm.org/viewvc/llvm-project?rev=58144&view=rev Log: Move the code that adds the DeadMachineInstructionElimPass from target-independent code to target-specific code. This prevents it from running on targets that aren't using fast-isel. In addition to saving compile time, this addresses the problem that not all targets are prepared for it. In order to use this pass, all instructions must declare all their fixed uses and defs of physical registers. Modified: llvm/trunk/lib/CodeGen/LLVMTargetMachine.cpp llvm/trunk/lib/Target/X86/X86TargetMachine.cpp Modified: llvm/trunk/lib/CodeGen/LLVMTargetMachine.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/LLVMTargetMachine.cpp?rev=58144&r1=58143&r2=58144&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/LLVMTargetMachine.cpp (original) +++ llvm/trunk/lib/CodeGen/LLVMTargetMachine.cpp Sat Oct 25 12:46:52 2008 @@ -185,10 +185,6 @@ if (PrintMachineCode) PM.add(createMachineFunctionPrinterPass(cerr)); - // If we're using Fast-ISel, clean up the mess. - if (EnableFastISel) - PM.add(createDeadMachineInstructionElimPass()); - if (EnableLICM) PM.add(createMachineLICMPass()); Modified: llvm/trunk/lib/Target/X86/X86TargetMachine.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86TargetMachine.cpp?rev=58144&r1=58143&r2=58144&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/X86TargetMachine.cpp (original) +++ llvm/trunk/lib/Target/X86/X86TargetMachine.cpp Sat Oct 25 12:46:52 2008 @@ -183,6 +183,11 @@ bool X86TargetMachine::addInstSelector(PassManagerBase &PM, bool Fast) { // Install an instruction selector. PM.add(createX86ISelDag(*this, Fast)); + + // If we're using Fast-ISel, clean up the mess. + if (EnableFastISel) + PM.add(createDeadMachineInstructionElimPass()); + return false; } From gohman at apple.com Sat Oct 25 12:51:24 2008 From: gohman at apple.com (Dan Gohman) Date: Sat, 25 Oct 2008 17:51:24 -0000 Subject: [llvm-commits] [llvm] r58145 - /llvm/trunk/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp Message-ID: <200810251751.m9PHpPns028573@zion.cs.uiuc.edu> Author: djg Date: Sat Oct 25 12:51:24 2008 New Revision: 58145 URL: http://llvm.org/viewvc/llvm-project?rev=58145&view=rev Log: SDNodes may have at most one Flag result. Update this comment to reflect that. Modified: llvm/trunk/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp Modified: llvm/trunk/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp?rev=58145&r1=58144&r2=58145&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp Sat Oct 25 12:51:24 2008 @@ -351,8 +351,8 @@ /// CountOperands - The inputs to target nodes have any actual inputs first, /// followed by special operands that describe memory references, then an -/// optional chain operand, then flag operands. Compute the number of -/// actual operands that will go into the resulting MachineInstr. +/// optional chain operand, then an optional flag operand. Compute the number +/// of actual operands that will go into the resulting MachineInstr. unsigned ScheduleDAG::CountOperands(SDNode *Node) { unsigned N = ComputeMemOperandsEnd(Node); while (N && isa(Node->getOperand(N - 1).getNode())) From gohman at apple.com Sat Oct 25 12:57:23 2008 From: gohman at apple.com (Dan Gohman) Date: Sat, 25 Oct 2008 17:57:23 -0000 Subject: [llvm-commits] [llvm] r58146 - in /llvm/trunk: include/llvm/Linker.h lib/Linker/Linker.cpp Message-ID: <200810251757.m9PHvORH028752@zion.cs.uiuc.edu> Author: djg Date: Sat Oct 25 12:57:20 2008 New Revision: 58146 URL: http://llvm.org/viewvc/llvm-project?rev=58146&view=rev Log: Make comments and code for QuietWarnings and QuietErrors actually correspond to what their names suggest. Modified: llvm/trunk/include/llvm/Linker.h llvm/trunk/lib/Linker/Linker.cpp Modified: llvm/trunk/include/llvm/Linker.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Linker.h?rev=58146&r1=58145&r2=58146&view=diff ============================================================================== --- llvm/trunk/include/llvm/Linker.h (original) +++ llvm/trunk/include/llvm/Linker.h Sat Oct 25 12:57:20 2008 @@ -52,8 +52,8 @@ /// linker. enum ControlFlags { Verbose = 1, ///< Print to std::cerr what steps the linker is taking - QuietWarnings = 2, ///< Don't print errors and warnings to std::cerr. - QuietErrors = 4 ///< Indicate that this link is for a native executable + QuietWarnings = 2, ///< Don't print warnings to std::cerr. + QuietErrors = 4 ///< Don't print errors to std::cerr. }; /// @} Modified: llvm/trunk/lib/Linker/Linker.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Linker/Linker.cpp?rev=58146&r1=58145&r2=58146&view=diff ============================================================================== --- llvm/trunk/lib/Linker/Linker.cpp (original) +++ llvm/trunk/lib/Linker/Linker.cpp Sat Oct 25 12:57:20 2008 @@ -54,7 +54,7 @@ bool Linker::warning(const std::string& message) { Error = message; - if (!(Flags&QuietErrors)) + if (!(Flags&QuietWarnings)) cerr << ProgramName << ": warning: " << message << "\n"; return false; } From gohman at apple.com Sat Oct 25 15:40:12 2008 From: gohman at apple.com (Dan Gohman) Date: Sat, 25 Oct 2008 20:40:12 -0000 Subject: [llvm-commits] [test-suite] r58151 - /test-suite/trunk/SingleSource/Regression/C/PR491.c Message-ID: <200810252040.m9PKeCtb001401@zion.cs.uiuc.edu> Author: djg Date: Sat Oct 25 15:40:10 2008 New Revision: 58151 URL: http://llvm.org/viewvc/llvm-project?rev=58151&view=rev Log: Make this test return 0 on success instead of 1. Modified: test-suite/trunk/SingleSource/Regression/C/PR491.c Modified: test-suite/trunk/SingleSource/Regression/C/PR491.c URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Regression/C/PR491.c?rev=58151&r1=58150&r2=58151&view=diff ============================================================================== --- test-suite/trunk/SingleSource/Regression/C/PR491.c (original) +++ test-suite/trunk/SingleSource/Regression/C/PR491.c Sat Oct 25 15:40:10 2008 @@ -26,6 +26,6 @@ } int main() { - return test(1) == 1; + return test(1) != 1; } From gohman at apple.com Sat Oct 25 16:36:34 2008 From: gohman at apple.com (Dan Gohman) Date: Sat, 25 Oct 2008 21:36:34 -0000 Subject: [llvm-commits] [test-suite] r58152 - /test-suite/trunk/MultiSource/Applications/sqlite3/Makefile Message-ID: <200810252136.m9PLaYnJ002949@zion.cs.uiuc.edu> Author: djg Date: Sat Oct 25 16:36:33 2008 New Revision: 58152 URL: http://llvm.org/viewvc/llvm-project?rev=58152&view=rev Log: Fix a srcdir != objdir bug. Modified: test-suite/trunk/MultiSource/Applications/sqlite3/Makefile Modified: test-suite/trunk/MultiSource/Applications/sqlite3/Makefile URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/sqlite3/Makefile?rev=58152&r1=58151&r2=58152&view=diff ============================================================================== --- test-suite/trunk/MultiSource/Applications/sqlite3/Makefile (original) +++ test-suite/trunk/MultiSource/Applications/sqlite3/Makefile Sat Oct 25 16:36:33 2008 @@ -5,7 +5,7 @@ PROG = sqlite3 CPPFLAGS += -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=0 -DHAVE_FDATASYNC=0 -DHAVE_USLEEP=0 -DHAVE_LOCALTIME_R=0 -DHAVE_GMTIME_R=0 -DHAVE_READLINE=0 -I. -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION=1 LDFLAGS = -STDIN_FILENAME = commands +STDIN_FILENAME = $(PROJ_SRC_DIR)/commands RUN_OPTIONS = :memory: >/dev/null include $(LEVEL)/Makefile.config From gohman at apple.com Sat Oct 25 16:37:24 2008 From: gohman at apple.com (Dan Gohman) Date: Sat, 25 Oct 2008 21:37:24 -0000 Subject: [llvm-commits] [test-suite] r58153 - /test-suite/trunk/MultiSource/Applications/sqlite3/Makefile Message-ID: <200810252137.m9PLbOTh002988@zion.cs.uiuc.edu> Author: djg Date: Sat Oct 25 16:37:24 2008 New Revision: 58153 URL: http://llvm.org/viewvc/llvm-project?rev=58153&view=rev Log: Don't redirect stdout to /dev/null. This lets the output be included in the test comparison. Modified: test-suite/trunk/MultiSource/Applications/sqlite3/Makefile Modified: test-suite/trunk/MultiSource/Applications/sqlite3/Makefile URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/sqlite3/Makefile?rev=58153&r1=58152&r2=58153&view=diff ============================================================================== --- test-suite/trunk/MultiSource/Applications/sqlite3/Makefile (original) +++ test-suite/trunk/MultiSource/Applications/sqlite3/Makefile Sat Oct 25 16:37:24 2008 @@ -6,7 +6,7 @@ CPPFLAGS += -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=0 -DHAVE_FDATASYNC=0 -DHAVE_USLEEP=0 -DHAVE_LOCALTIME_R=0 -DHAVE_GMTIME_R=0 -DHAVE_READLINE=0 -I. -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION=1 LDFLAGS = STDIN_FILENAME = $(PROJ_SRC_DIR)/commands -RUN_OPTIONS = :memory: >/dev/null +RUN_OPTIONS = :memory: include $(LEVEL)/Makefile.config From gohman at apple.com Sat Oct 25 16:45:37 2008 From: gohman at apple.com (Dan Gohman) Date: Sat, 25 Oct 2008 21:45:37 -0000 Subject: [llvm-commits] [test-suite] r58154 - /test-suite/trunk/RunSafely.sh Message-ID: <200810252145.m9PLjb6b003208@zion.cs.uiuc.edu> Author: djg Date: Sat Oct 25 16:45:37 2008 New Revision: 58154 URL: http://llvm.org/viewvc/llvm-project?rev=58154&view=rev Log: Treat exit statuses that indicate failure to execute the test program and exit statuses that indicate that the test program was terminated by a signal as failures. Also, report failures by writing a string to the output file which will trigger a diff when it is compared with output files from other runs of the test. And, having reported any detected errors in a way that will be visible to the test system, always exit "successfully". RunSafely.sh's own exit status is not used to determine if a test has passed or failed. Modified: test-suite/trunk/RunSafely.sh Modified: test-suite/trunk/RunSafely.sh URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/RunSafely.sh?rev=58154&r1=58153&r2=58154&view=diff ============================================================================== --- test-suite/trunk/RunSafely.sh (original) +++ test-suite/trunk/RunSafely.sh Sat Oct 25 16:45:37 2008 @@ -11,11 +11,13 @@ # fourth argument specified, and outputs a .time file which # contains a timing of the program and the program's exit code. # -# If the parameter is 0 then this script always returns 0, -# regardless of the actual exit of the . -# If the parameter is non-zero then this script returns -# the exit code of the . If there is an error in getting -# the 's exit code, this script returns 99. +# The parameter specifies how the program's exit status +# is interpreted. If the parameter is non-zero, any +# non-zero exit status from the program is considered to indicate +# a test failure. If the parameter is zero, only exit +# statuses that indicates that the program could not be executed +# normally or that the program was terminated as a signal are +# considered to indicate a test failure. # # If optional parameters -r -l are # specified, it execute the program remotely using rsh. @@ -42,6 +44,10 @@ exit 1 fi +# Save a copy of the original arguments in a string before we +# clobber them with the shift command. +ORIG_ARGS="$*" + DIR=${0%%`basename $0`} RHOST= @@ -145,18 +151,34 @@ fi exitval=`grep '^exit ' $OUTFILE.time | sed -e 's/^exit //'` +fail=yes if [ -z "$exitval" ] ; then exitval=99 - echo "TEST $PROGRAM FAILED: CAN'T GET EXIT CODE!" + echo "TEST $PROGRAM FAILED: CAN'T GET EXIT CODE!" +elif test "$exitval" -eq 126 ; then + echo "TEST $PROGRAM FAILED: command not executable (exit status 126)!" +elif test "$exitval" -eq 127 ; then + echo "TEST $PROGRAM FAILED: command not found (exit status 127)!" +elif test "$exitval" -eq 128 ; then + # Exit status 128 doesn't have a standard meaning, but it's unlikely + # to be expected program behavior. + echo "TEST $PROGRAM FAILED: exit status 128!" +elif test "$exitval" -gt 128 ; then + echo "TEST $PROGRAM FAILED: process terminated by signal (exit status $exitval)!" +elif [ "$EXITOK" -ne 0 -a "$exitval" -ne 0 ] ; then + echo "TEST $PROGRAM FAILED: EXIT != 0" +else + fail=no fi echo "exit $exitval" >> $OUTFILE -if [ "$EXITOK" -ne 0 ] ; then - if test "$exitval" -ne 0 ; then - echo "TEST $PROGRAM FAILED: EXIT != 0" - fi -else - exitval=0 +# If we detected a failure, print the name of the test executable to the +# output file. This will cause it to compare as different with other runs +# of the same test even if they fail in the same way, because they'll have +# different command names. +if [ "${fail}" != "no" ]; then + echo "RunSafely.sh detected a failure with these command-line arguments: " \ + "$ORIG_ARGS" >> $OUTFILE fi if ls | egrep "^core" > /dev/null @@ -176,4 +198,5 @@ $GDB -q -batch --command=StackTrace.$$ --core=$corefile $PROGRAM < /dev/null rm -f StackTrace.$$ $corefile fi -exit "$exitval" +# Always return "successful" so that tests will continue to be run. +exit 0 From gohman at apple.com Sat Oct 25 16:48:18 2008 From: gohman at apple.com (Dan Gohman) Date: Sat, 25 Oct 2008 21:48:18 -0000 Subject: [llvm-commits] [test-suite] r58155 - /test-suite/trunk/MultiSource/Applications/lua/Makefile Message-ID: <200810252148.m9PLmItb003293@zion.cs.uiuc.edu> Author: djg Date: Sat Oct 25 16:48:18 2008 New Revision: 58155 URL: http://llvm.org/viewvc/llvm-project?rev=58155&view=rev Log: Workaround for systems where /bin/sh doesn't support {...,...} expansion. Modified: test-suite/trunk/MultiSource/Applications/lua/Makefile Modified: test-suite/trunk/MultiSource/Applications/lua/Makefile URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/lua/Makefile?rev=58155&r1=58154&r2=58155&view=diff ============================================================================== --- test-suite/trunk/MultiSource/Applications/lua/Makefile (original) +++ test-suite/trunk/MultiSource/Applications/lua/Makefile Sat Oct 25 16:48:18 2008 @@ -23,7 +23,9 @@ if [ ! -f ./generate_inputs.sh ]; \ then \ cp -f $(PROJ_SRC_DIR)/generate_inputs.sh . ; \ - cp -f -r $(PROJ_SRC_DIR)/{test,bench,input} . ; \ + cp -f -r $(PROJ_SRC_DIR)/test . ; \ + cp -f -r $(PROJ_SRC_DIR)/bench . ; \ + cp -f -r $(PROJ_SRC_DIR)/input . ; \ cp -f $(PROJ_SRC_DIR)/*.lua . ; \ fi ./generate_inputs.sh From gohman at apple.com Sat Oct 25 16:52:03 2008 From: gohman at apple.com (Dan Gohman) Date: Sat, 25 Oct 2008 21:52:03 -0000 Subject: [llvm-commits] [test-suite] r58156 - /test-suite/trunk/Makefile.programs Message-ID: <200810252152.m9PLq3W5003407@zion.cs.uiuc.edu> Author: djg Date: Sat Oct 25 16:52:03 2008 New Revision: 58156 URL: http://llvm.org/viewvc/llvm-project?rev=58156&view=rev Log: Don't ignore the exit status of RunSafely.sh. It now always exits successfully. Now, if RunSafely.sh somehow doesn't exit successfully because something catestrophic happened, the testsuite won't blindly continue on. Modified: test-suite/trunk/Makefile.programs Modified: test-suite/trunk/Makefile.programs URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/Makefile.programs?rev=58156&r1=58155&r2=58156&view=diff ============================================================================== --- test-suite/trunk/Makefile.programs (original) +++ test-suite/trunk/Makefile.programs Sat Oct 25 16:52:03 2008 @@ -441,37 +441,37 @@ ifndef USE_REFERENCE_OUTPUT $(PROGRAMS_TO_TEST:%=Output/%.out-nat): \ Output/%.out-nat: Output/%.native - -$(RUNSAFELY) $(STDIN_FILENAME) $@ $< $(RUN_OPTIONS) + $(RUNSAFELY) $(STDIN_FILENAME) $@ $< $(RUN_OPTIONS) endif endif $(PROGRAMS_TO_TEST:%=Output/%.out-lli): \ Output/%.out-lli: Output/%.llvm.bc $(LLI) - -$(RUNSAFELY) $(STDIN_FILENAME) $@ $(LLI) $(LLI_OPTS) $< $(RUN_OPTIONS) + $(RUNSAFELY) $(STDIN_FILENAME) $@ $(LLI) $(LLI_OPTS) $< $(RUN_OPTIONS) $(PROGRAMS_TO_TEST:%=Output/%.out-jit): \ Output/%.out-jit: Output/%.llvm.bc $(LLI) - -$(RUNSAFELY) $(STDIN_FILENAME) $@ $(LLI) $(JIT_OPTS) $< $(RUN_OPTIONS) + $(RUNSAFELY) $(STDIN_FILENAME) $@ $(LLI) $(JIT_OPTS) $< $(RUN_OPTIONS) $(PROGRAMS_TO_TEST:%=Output/%.out-jit-beta): \ Output/%.out-jit-beta: Output/%.llvm.bc $(LLI) - -$(RUNSAFELY) $(STDIN_FILENAME) $@ $(LLI) $(LLCBETAOPTION) $(JIT_OPTS) $< $(RUN_OPTIONS) + $(RUNSAFELY) $(STDIN_FILENAME) $@ $(LLI) $(LLCBETAOPTION) $(JIT_OPTS) $< $(RUN_OPTIONS) $(PROGRAMS_TO_TEST:%=Output/%.out-llc): \ Output/%.out-llc: Output/%.llc - -$(RUNSAFELY) $(STDIN_FILENAME) $@ $< $(RUN_OPTIONS) + $(RUNSAFELY) $(STDIN_FILENAME) $@ $< $(RUN_OPTIONS) $(PROGRAMS_TO_TEST:%=Output/%.out-llc-beta): \ Output/%.out-llc-beta: Output/%.llc-beta - -$(RUNSAFELY) $(STDIN_FILENAME) $@ $< $(RUN_OPTIONS) + $(RUNSAFELY) $(STDIN_FILENAME) $@ $< $(RUN_OPTIONS) $(PROGRAMS_TO_TEST:%=Output/%.out-opt-beta): \ Output/%.out-opt-beta: Output/%.opt-beta - -$(RUNSAFELY) $(STDIN_FILENAME) $@ $< $(RUN_OPTIONS) + $(RUNSAFELY) $(STDIN_FILENAME) $@ $< $(RUN_OPTIONS) $(PROGRAMS_TO_TEST:%=Output/%.out-cbe): \ Output/%.out-cbe: Output/%.cbe - -$(RUNSAFELY) $(STDIN_FILENAME) $@ $< $(RUN_OPTIONS) + $(RUNSAFELY) $(STDIN_FILENAME) $@ $< $(RUN_OPTIONS) # The RunSafely.sh script puts an "exit " line at the end of # the program's output. We have to make bugpoint do the same thing @@ -556,7 +556,7 @@ $(PROGRAMS_TO_TEST:%=Output/%.prof): \ Output/%.prof: Output/%.llvm-prof.bc Output/%.out-nat $(LIBPROFILESO) @rm -f $@ - -$(RUNSAFELY) $(STDIN_FILENAME) Output/$*.out-prof $(LLI) $(JIT_OPTS) \ + $(RUNSAFELY) $(STDIN_FILENAME) Output/$*.out-prof $(LLI) $(JIT_OPTS) \ -fake-argv0 'Output/$*.llvm.bc' -load $(LIBPROFILESO) $< -llvmprof-output $@ $(RUN_OPTIONS) @cmp -s Output/$*.out-prof Output/$*.out-nat || \ printf "***\n***\n*** WARNING: Output of profiled program (Output/$*.out-prof)\n*** doesn't match the output of the native program (Output/$*.out-nat)!\n***\n***\n"; From gohman at apple.com Sat Oct 25 16:53:48 2008 From: gohman at apple.com (Dan Gohman) Date: Sat, 25 Oct 2008 21:53:48 -0000 Subject: [llvm-commits] [test-suite] r58157 - /test-suite/trunk/External/SPEC/Sandbox.sh Message-ID: <200810252153.m9PLrmg1003475@zion.cs.uiuc.edu> Author: djg Date: Sat Oct 25 16:53:48 2008 New Revision: 58157 URL: http://llvm.org/viewvc/llvm-project?rev=58157&view=rev Log: Using exec in the Sandbox.sh script. This makes it exit with the same exit status as its child. Currently Sandbox.sh is only used to run RunSafely.sh, so it will continue to always return 0, barring catestrophic problems. Modified: test-suite/trunk/External/SPEC/Sandbox.sh Modified: test-suite/trunk/External/SPEC/Sandbox.sh URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/Sandbox.sh?rev=58157&r1=58156&r2=58157&view=diff ============================================================================== --- test-suite/trunk/External/SPEC/Sandbox.sh (original) +++ test-suite/trunk/External/SPEC/Sandbox.sh Sat Oct 25 16:53:48 2008 @@ -32,9 +32,5 @@ bunzip2 *.bz2 > /dev/null 2>&1 # Run the program now. -echo Running: $* -$* - -# This script is always successful. -exit 0 - +echo Running: "$@" +exec "$@" From gohman at apple.com Sat Oct 25 16:54:57 2008 From: gohman at apple.com (Dan Gohman) Date: Sat, 25 Oct 2008 21:54:57 -0000 Subject: [llvm-commits] [test-suite] r58158 - /test-suite/trunk/External/SPEC/Makefile.spec Message-ID: <200810252154.m9PLsvgS003516@zion.cs.uiuc.edu> Author: djg Date: Sat Oct 25 16:54:57 2008 New Revision: 58158 URL: http://llvm.org/viewvc/llvm-project?rev=58158&view=rev Log: Don't ignore the exit status from Sandbox.sh running RunSafely.sh. They will always exit successfully, unless something catestrophic happens. Modified: test-suite/trunk/External/SPEC/Makefile.spec Modified: test-suite/trunk/External/SPEC/Makefile.spec URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/Makefile.spec?rev=58158&r1=58157&r2=58158&view=diff ============================================================================== --- test-suite/trunk/External/SPEC/Makefile.spec (original) +++ test-suite/trunk/External/SPEC/Makefile.spec Sat Oct 25 16:54:57 2008 @@ -27,7 +27,7 @@ $(PROGRAMS_TO_TEST:%=Output/%.out-nat): \ Output/%.out-nat: Output/%.native - -$(SPEC_SANDBOX) nat-$(RUN_TYPE) $@ $(REF_IN_DIR) \ + $(SPEC_SANDBOX) nat-$(RUN_TYPE) $@ $(REF_IN_DIR) \ $(RUNSAFELY) $(STDIN_FILENAME) $(STDOUT_FILENAME) \ ../$*.native $(RUN_OPTIONS) -(cd Output/nat-$(RUN_TYPE); cat $(LOCAL_OUTPUTS)) | \ @@ -36,7 +36,7 @@ $(PROGRAMS_TO_TEST:%=Output/%.out-lli): \ Output/%.out-lli: Output/%.llvm.bc $(LLI) - -$(SPEC_SANDBOX) lli-$(RUN_TYPE) $@ $(REF_IN_DIR) \ + $(SPEC_SANDBOX) lli-$(RUN_TYPE) $@ $(REF_IN_DIR) \ $(RUNSAFELY) $(STDIN_FILENAME) $(STDOUT_FILENAME) \ $(LLI) $(LLI_OPTS) ../$*.llvm.bc $(RUN_OPTIONS) -(cd Output/lli-$(RUN_TYPE); cat $(LOCAL_OUTPUTS)) | \ @@ -45,7 +45,7 @@ $(PROGRAMS_TO_TEST:%=Output/%.out-jit): \ Output/%.out-jit: Output/%.llvm.bc $(LLI) - -$(SPEC_SANDBOX) jit-$(RUN_TYPE) $@ $(REF_IN_DIR) \ + $(SPEC_SANDBOX) jit-$(RUN_TYPE) $@ $(REF_IN_DIR) \ $(RUNSAFELY) $(STDIN_FILENAME) $(STDOUT_FILENAME) \ $(LLI) $(JIT_OPTS) ../$*.llvm.bc $(RUN_OPTIONS) -(cd Output/jit-$(RUN_TYPE); cat $(LOCAL_OUTPUTS)) | \ @@ -54,7 +54,7 @@ $(PROGRAMS_TO_TEST:%=Output/%.out-jit-beta): \ Output/%.out-jit-beta: Output/%.llvm.bc $(LLI) - -$(SPEC_SANDBOX) jit-beta-$(RUN_TYPE) $@ $(REF_IN_DIR) \ + $(SPEC_SANDBOX) jit-beta-$(RUN_TYPE) $@ $(REF_IN_DIR) \ $(RUNSAFELY) $(STDIN_FILENAME) $(STDOUT_FILENAME) \ $(LLI) $(LLCBETAOPTION) $(JIT_OPTS) ../$*.llvm.bc $(RUN_OPTIONS) -(cd Output/jit-beta-$(RUN_TYPE); cat $(LOCAL_OUTPUTS)) | \ @@ -63,7 +63,7 @@ $(PROGRAMS_TO_TEST:%=Output/%.out-llc): \ Output/%.out-llc: Output/%.llc - -$(SPEC_SANDBOX) llc-$(RUN_TYPE) $@ $(REF_IN_DIR) \ + $(SPEC_SANDBOX) llc-$(RUN_TYPE) $@ $(REF_IN_DIR) \ $(RUNSAFELY) $(STDIN_FILENAME) $(STDOUT_FILENAME) \ ../$*.llc $(RUN_OPTIONS) -(cd Output/llc-$(RUN_TYPE); cat $(LOCAL_OUTPUTS)) | \ @@ -72,7 +72,7 @@ $(PROGRAMS_TO_TEST:%=Output/%.out-llc-beta): \ Output/%.out-llc-beta: Output/%.llc-beta - -$(SPEC_SANDBOX) llc-beta-$(RUN_TYPE) $@ $(REF_IN_DIR) \ + $(SPEC_SANDBOX) llc-beta-$(RUN_TYPE) $@ $(REF_IN_DIR) \ $(RUNSAFELY) $(STDIN_FILENAME) $(STDOUT_FILENAME) \ ../$*.llc-beta $(RUN_OPTIONS) -(cd Output/llc-beta-$(RUN_TYPE); cat $(LOCAL_OUTPUTS)) | \ @@ -81,7 +81,7 @@ $(PROGRAMS_TO_TEST:%=Output/%.out-cbe): \ Output/%.out-cbe: Output/%.cbe - -$(SPEC_SANDBOX) cbe-$(RUN_TYPE) $@ $(REF_IN_DIR) \ + $(SPEC_SANDBOX) cbe-$(RUN_TYPE) $@ $(REF_IN_DIR) \ $(RUNSAFELY) $(STDIN_FILENAME) $(STDOUT_FILENAME) \ ../$*.cbe $(RUN_OPTIONS) -(cd Output/cbe-$(RUN_TYPE); cat $(LOCAL_OUTPUTS)) | \ From gohman at apple.com Sat Oct 25 17:22:45 2008 From: gohman at apple.com (Dan Gohman) Date: Sat, 25 Oct 2008 22:22:45 -0000 Subject: [llvm-commits] [test-suite] r58160 - /test-suite/trunk/SingleSource/Regression/C++/EH/exception_spec_test.cpp Message-ID: <200810252222.m9PMMjcH004361@zion.cs.uiuc.edu> Author: djg Date: Sat Oct 25 17:22:45 2008 New Revision: 58160 URL: http://llvm.org/viewvc/llvm-project?rev=58160&view=rev Log: Fix this test so that it actually works as intended. This lets it actually pass, instead of failing in the llc/jit/cbe runs the same way as the native run, which is judged to be a pass. Modified: test-suite/trunk/SingleSource/Regression/C++/EH/exception_spec_test.cpp Modified: test-suite/trunk/SingleSource/Regression/C++/EH/exception_spec_test.cpp URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Regression/C%2B%2B/EH/exception_spec_test.cpp?rev=58160&r1=58159&r2=58160&view=diff ============================================================================== --- test-suite/trunk/SingleSource/Regression/C++/EH/exception_spec_test.cpp (original) +++ test-suite/trunk/SingleSource/Regression/C++/EH/exception_spec_test.cpp Sat Oct 25 17:22:45 2008 @@ -5,8 +5,13 @@ #include #include -static void TerminateHandler() { - printf("std::terminate called\n"); +static void TerminateHandler0() { + printf("std::terminate called, as expected\n"); + exit(0); +} + +static void TerminateHandler1() { + printf("std::terminate called, but it was not expected!\n"); exit(1); } @@ -31,13 +36,14 @@ } int main() { + std::set_terminate(TerminateHandler1); + try { test(false); } catch (double D) { printf("Double successfully caught!\n"); } - std::set_terminate(TerminateHandler); std::set_unexpected(UnexpectedHandler1); try { @@ -46,6 +52,10 @@ printf("Double successfully caught!\n"); } + std::set_terminate(TerminateHandler0); std::set_unexpected(UnexpectedHandler2); test(true); + + printf("TerminateHandler0 should have been called!\n"); + return 1; } From gohman at apple.com Sat Oct 25 17:26:50 2008 From: gohman at apple.com (Dan Gohman) Date: Sat, 25 Oct 2008 22:26:50 -0000 Subject: [llvm-commits] [test-suite] r58161 - /test-suite/trunk/SingleSource/UnitTests/SignlessTypes/ccc.c Message-ID: <200810252226.m9PMQppO004499@zion.cs.uiuc.edu> Author: djg Date: Sat Oct 25 17:26:50 2008 New Revision: 58161 URL: http://llvm.org/viewvc/llvm-project?rev=58161&view=rev Log: Make this test return 0 instead of TestVal. TestVal is already printed to stdout for comparison. Modified: test-suite/trunk/SingleSource/UnitTests/SignlessTypes/ccc.c Modified: test-suite/trunk/SingleSource/UnitTests/SignlessTypes/ccc.c URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/UnitTests/SignlessTypes/ccc.c?rev=58161&r1=58160&r2=58161&view=diff ============================================================================== --- test-suite/trunk/SingleSource/UnitTests/SignlessTypes/ccc.c (original) +++ test-suite/trunk/SingleSource/UnitTests/SignlessTypes/ccc.c Sat Oct 25 17:26:50 2008 @@ -50,5 +50,5 @@ printf("%d %hd %hu\n", TestVal, sh, ush); - return TestVal; + return 0; } From gohman at apple.com Sat Oct 25 17:29:11 2008 From: gohman at apple.com (Dan Gohman) Date: Sat, 25 Oct 2008 22:29:11 -0000 Subject: [llvm-commits] [test-suite] r58162 - /test-suite/trunk/SingleSource/UnitTests/SignlessTypes/cast-bug.c Message-ID: <200810252229.m9PMTB1h004560@zion.cs.uiuc.edu> Author: djg Date: Sat Oct 25 17:29:11 2008 New Revision: 58162 URL: http://llvm.org/viewvc/llvm-project?rev=58162&view=rev Log: Make this test return a zero exit status on success. Modified: test-suite/trunk/SingleSource/UnitTests/SignlessTypes/cast-bug.c Modified: test-suite/trunk/SingleSource/UnitTests/SignlessTypes/cast-bug.c URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/UnitTests/SignlessTypes/cast-bug.c?rev=58162&r1=58161&r2=58162&view=diff ============================================================================== --- test-suite/trunk/SingleSource/UnitTests/SignlessTypes/cast-bug.c (original) +++ test-suite/trunk/SingleSource/UnitTests/SignlessTypes/cast-bug.c Sat Oct 25 17:29:11 2008 @@ -11,5 +11,5 @@ result = result + 17; } } - return (result); + return result == 35; } From gohman at apple.com Sat Oct 25 18:05:09 2008 From: gohman at apple.com (Dan Gohman) Date: Sat, 25 Oct 2008 23:05:09 -0000 Subject: [llvm-commits] [test-suite] r58163 - /test-suite/trunk/MultiSource/Benchmarks/McCat/08-main/main.c Message-ID: <200810252305.m9PN593D005777@zion.cs.uiuc.edu> Author: djg Date: Sat Oct 25 18:05:09 2008 New Revision: 58163 URL: http://llvm.org/viewvc/llvm-project?rev=58163&view=rev Log: Return 0 on success. Modified: test-suite/trunk/MultiSource/Benchmarks/McCat/08-main/main.c Modified: test-suite/trunk/MultiSource/Benchmarks/McCat/08-main/main.c URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/McCat/08-main/main.c?rev=58163&r1=58162&r2=58163&view=diff ============================================================================== --- test-suite/trunk/MultiSource/Benchmarks/McCat/08-main/main.c (original) +++ test-suite/trunk/MultiSource/Benchmarks/McCat/08-main/main.c Sat Oct 25 18:05:09 2008 @@ -129,5 +129,5 @@ Draw_All(o); - return 1; + return 0; } From evan.cheng at apple.com Sat Oct 25 18:08:23 2008 From: evan.cheng at apple.com (Evan Cheng) Date: Sat, 25 Oct 2008 23:08:23 -0000 Subject: [llvm-commits] [llvm] r58164 - /llvm/trunk/include/llvm/Target/TargetInstrInfo.h Message-ID: <200810252308.m9PN8NHn005895@zion.cs.uiuc.edu> Author: evancheng Date: Sat Oct 25 18:08:22 2008 New Revision: 58164 URL: http://llvm.org/viewvc/llvm-project?rev=58164&view=rev Log: Add storeRegTo{StackSlot|Addr} and loadRegFrom{StackSlot|Addr} descriptions. Modified: llvm/trunk/include/llvm/Target/TargetInstrInfo.h Modified: llvm/trunk/include/llvm/Target/TargetInstrInfo.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/TargetInstrInfo.h?rev=58164&r1=58163&r2=58164&view=diff ============================================================================== --- llvm/trunk/include/llvm/Target/TargetInstrInfo.h (original) +++ llvm/trunk/include/llvm/Target/TargetInstrInfo.h Sat Oct 25 18:08:22 2008 @@ -232,6 +232,11 @@ return false; } + /// storeRegToStackSlot - Store the specified register of the given register + /// class to the specified stack frame index. The store instruction is to be + /// added to the given machine basic block before the specified machine + /// instruction. If isKill is true, the register operand is the last use and + /// must be marked kill. virtual void storeRegToStackSlot(MachineBasicBlock &MBB, MachineBasicBlock::iterator MI, unsigned SrcReg, bool isKill, int FrameIndex, @@ -239,6 +244,11 @@ assert(0 && "Target didn't implement TargetInstrInfo::storeRegToStackSlot!"); } + /// storeRegToAddr - Store the specified register of the given register class + /// to the specified address. The store instruction is to be added to the + /// given machine basic block before the specified machine instruction. If + /// isKill is true, the register operand is the last use and must be marked + /// kill. virtual void storeRegToAddr(MachineFunction &MF, unsigned SrcReg, bool isKill, SmallVectorImpl &Addr, const TargetRegisterClass *RC, @@ -246,6 +256,10 @@ assert(0 && "Target didn't implement TargetInstrInfo::storeRegToAddr!"); } + /// loadRegFromStackSlot - Load the specified register of the given register + /// class from the specified stack frame index. The load instruction is to be + /// added to the given machine basic block before the specified machine + /// instruction. virtual void loadRegFromStackSlot(MachineBasicBlock &MBB, MachineBasicBlock::iterator MI, unsigned DestReg, int FrameIndex, @@ -253,6 +267,9 @@ assert(0 && "Target didn't implement TargetInstrInfo::loadRegFromStackSlot!"); } + /// loadRegFromAddr - Load the specified register of the given register class + /// class from the specified address. The load instruction is to be added to + /// the given machine basic block before the specified machine instruction. virtual void loadRegFromAddr(MachineFunction &MF, unsigned DestReg, SmallVectorImpl &Addr, const TargetRegisterClass *RC, From gohman at apple.com Sat Oct 25 18:09:42 2008 From: gohman at apple.com (Dan Gohman) Date: Sat, 25 Oct 2008 23:09:42 -0000 Subject: [llvm-commits] [test-suite] r58165 - /test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/assembler/assem.c Message-ID: <200810252309.m9PN9gxa005945@zion.cs.uiuc.edu> Author: djg Date: Sat Oct 25 18:09:42 2008 New Revision: 58165 URL: http://llvm.org/viewvc/llvm-project?rev=58165&view=rev Log: Return 0 on success. Modified: test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/assembler/assem.c Modified: test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/assembler/assem.c URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/assembler/assem.c?rev=58165&r1=58164&r2=58165&view=diff ============================================================================== --- test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/assembler/assem.c (original) +++ test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/assembler/assem.c Sat Oct 25 18:09:42 2008 @@ -104,5 +104,5 @@ } } } - return 1; + return 0; } From gohman at apple.com Sat Oct 25 18:14:20 2008 From: gohman at apple.com (Dan Gohman) Date: Sat, 25 Oct 2008 23:14:20 -0000 Subject: [llvm-commits] [test-suite] r58166 - /test-suite/trunk/MultiSource/Benchmarks/MiBench/network-patricia/patricia_test.c Message-ID: <200810252314.m9PNEKwX006080@zion.cs.uiuc.edu> Author: djg Date: Sat Oct 25 18:14:20 2008 New Revision: 58166 URL: http://llvm.org/viewvc/llvm-project?rev=58166&view=rev Log: exit(0) on success, non-zero on failure. Modified: test-suite/trunk/MultiSource/Benchmarks/MiBench/network-patricia/patricia_test.c Modified: test-suite/trunk/MultiSource/Benchmarks/MiBench/network-patricia/patricia_test.c URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/MiBench/network-patricia/patricia_test.c?rev=58166&r1=58165&r2=58166&view=diff ============================================================================== --- test-suite/trunk/MultiSource/Benchmarks/MiBench/network-patricia/patricia_test.c (original) +++ test-suite/trunk/MultiSource/Benchmarks/MiBench/network-patricia/patricia_test.c Sat Oct 25 18:14:20 2008 @@ -78,7 +78,7 @@ */ if ((fp = fopen(argv[1], "r")) == NULL) { printf("File %s doesn't seem to exist\n",argv[1]); - exit(0); + exit(1); } /* @@ -94,21 +94,21 @@ phead = (struct ptree *)malloc(sizeof(struct ptree)); if (!phead) { perror("Allocating p-trie node"); - exit(0); + exit(1); } bzero(phead, sizeof(*phead)); phead->p_m = (struct ptree_mask *)malloc( sizeof(struct ptree_mask)); if (!phead->p_m) { perror("Allocating p-trie mask data"); - exit(0); + exit(1); } bzero(phead->p_m, sizeof(*phead->p_m)); pm = phead->p_m; pm->pm_data = (struct MyNode *)malloc(sizeof(struct MyNode)); if (!pm->pm_data) { perror("Allocating p-trie mask's node data"); - exit(0); + exit(1); } bzero(pm->pm_data, sizeof(*pm->pm_data)); /******* @@ -137,7 +137,7 @@ p = (struct ptree *)malloc(sizeof(struct ptree)); if (!p) { perror("Allocating p-trie node"); - exit(0); + exit(1); } bzero(p, sizeof(*p)); @@ -148,7 +148,7 @@ sizeof(struct ptree_mask)); if (!p->p_m) { perror("Allocating p-trie mask data"); - exit(0); + exit(1); } bzero(p->p_m, sizeof(*p->p_m)); @@ -160,7 +160,7 @@ pm->pm_data = (struct MyNode *)malloc(sizeof(struct MyNode)); if (!pm->pm_data) { perror("Allocating p-trie mask's node data"); - exit(0); + exit(1); } bzero(pm->pm_data, sizeof(*pm->pm_data)); @@ -191,9 +191,9 @@ } if (!p) { fprintf(stderr, "Failed on pat_insert\n"); - exit(0); + exit(1); } } - exit(1); + exit(0); } From gohman at apple.com Sat Oct 25 18:18:48 2008 From: gohman at apple.com (Dan Gohman) Date: Sat, 25 Oct 2008 23:18:48 -0000 Subject: [llvm-commits] [test-suite] r58167 - /test-suite/trunk/MultiSource/Benchmarks/Trimaran/netbench-crc/crc32.c Message-ID: <200810252318.m9PNImPZ006221@zion.cs.uiuc.edu> Author: djg Date: Sat Oct 25 18:18:48 2008 New Revision: 58167 URL: http://llvm.org/viewvc/llvm-project?rev=58167&view=rev Log: Print the value of crc_accum instead of returning it from main. This allows the full value to be compared, since process exit statuses only preserve 8 bits. Return 0 from main on success. Modified: test-suite/trunk/MultiSource/Benchmarks/Trimaran/netbench-crc/crc32.c Modified: test-suite/trunk/MultiSource/Benchmarks/Trimaran/netbench-crc/crc32.c URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Trimaran/netbench-crc/crc32.c?rev=58167&r1=58166&r2=58167&view=diff ============================================================================== --- test-suite/trunk/MultiSource/Benchmarks/Trimaran/netbench-crc/crc32.c (original) +++ test-suite/trunk/MultiSource/Benchmarks/Trimaran/netbench-crc/crc32.c Sat Oct 25 18:18:48 2008 @@ -142,6 +142,7 @@ } fprintf (stdout, "CRC completed for %d packets \n", numpackets); + fprintf (stdout, "crc_accum is %lu\n", crc_accum); - return crc_accum; + return 0; } From gohman at apple.com Sat Oct 25 18:24:57 2008 From: gohman at apple.com (Dan Gohman) Date: Sat, 25 Oct 2008 23:24:57 -0000 Subject: [llvm-commits] [test-suite] r58168 - /test-suite/trunk/MultiSource/Benchmarks/BitBench/five11/Makefile Message-ID: <200810252324.m9PNOv6u006407@zion.cs.uiuc.edu> Author: djg Date: Sat Oct 25 18:24:56 2008 New Revision: 58168 URL: http://llvm.org/viewvc/llvm-project?rev=58168&view=rev Log: Fix for srcdir != objdir. Modified: test-suite/trunk/MultiSource/Benchmarks/BitBench/five11/Makefile Modified: test-suite/trunk/MultiSource/Benchmarks/BitBench/five11/Makefile URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/BitBench/five11/Makefile?rev=58168&r1=58167&r2=58168&view=diff ============================================================================== --- test-suite/trunk/MultiSource/Benchmarks/BitBench/five11/Makefile (original) +++ test-suite/trunk/MultiSource/Benchmarks/BitBench/five11/Makefile Sat Oct 25 18:24:56 2008 @@ -2,5 +2,5 @@ PROG = five11 LDFLAGS = -RUN_OPTIONS = input-file +RUN_OPTIONS = $(PROJ_SRC_DIR)/input-file include $(LEVEL)/MultiSource/Makefile.multisrc From gohman at apple.com Sat Oct 25 18:26:13 2008 From: gohman at apple.com (Dan Gohman) Date: Sat, 25 Oct 2008 23:26:13 -0000 Subject: [llvm-commits] [test-suite] r58169 - /test-suite/trunk/MultiSource/Benchmarks/BitBench/drop3/Makefile Message-ID: <200810252326.m9PNQDI3006457@zion.cs.uiuc.edu> Author: djg Date: Sat Oct 25 18:26:12 2008 New Revision: 58169 URL: http://llvm.org/viewvc/llvm-project?rev=58169&view=rev Log: Fix for srcdir != objdir. Modified: test-suite/trunk/MultiSource/Benchmarks/BitBench/drop3/Makefile Modified: test-suite/trunk/MultiSource/Benchmarks/BitBench/drop3/Makefile URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/BitBench/drop3/Makefile?rev=58169&r1=58168&r2=58169&view=diff ============================================================================== --- test-suite/trunk/MultiSource/Benchmarks/BitBench/drop3/Makefile (original) +++ test-suite/trunk/MultiSource/Benchmarks/BitBench/drop3/Makefile Sat Oct 25 18:26:12 2008 @@ -2,5 +2,5 @@ PROG = drop3 LDFLAGS = -RUN_OPTIONS = input-file +RUN_OPTIONS = $(PROJ_SRC_DIR)/input-file include $(LEVEL)/MultiSource/Makefile.multisrc From gohman at apple.com Sat Oct 25 18:27:37 2008 From: gohman at apple.com (Dan Gohman) Date: Sat, 25 Oct 2008 23:27:37 -0000 Subject: [llvm-commits] [test-suite] r58170 - in /test-suite/trunk/MultiSource/Benchmarks/BitBench: uudecode/Makefile uuencode/Makefile Message-ID: <200810252327.m9PNRbQT006513@zion.cs.uiuc.edu> Author: djg Date: Sat Oct 25 18:27:37 2008 New Revision: 58170 URL: http://llvm.org/viewvc/llvm-project?rev=58170&view=rev Log: Fix for srcdir != objdir. Modified: test-suite/trunk/MultiSource/Benchmarks/BitBench/uudecode/Makefile test-suite/trunk/MultiSource/Benchmarks/BitBench/uuencode/Makefile Modified: test-suite/trunk/MultiSource/Benchmarks/BitBench/uudecode/Makefile URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/BitBench/uudecode/Makefile?rev=58170&r1=58169&r2=58170&view=diff ============================================================================== --- test-suite/trunk/MultiSource/Benchmarks/BitBench/uudecode/Makefile (original) +++ test-suite/trunk/MultiSource/Benchmarks/BitBench/uudecode/Makefile Sat Oct 25 18:27:37 2008 @@ -2,5 +2,5 @@ PROG = uudecode LDFLAGS = -RUN_OPTIONS = input-file +RUN_OPTIONS = $(PROJ_SRC_DIR)/input-file include $(LEVEL)/MultiSource/Makefile.multisrc Modified: test-suite/trunk/MultiSource/Benchmarks/BitBench/uuencode/Makefile URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/BitBench/uuencode/Makefile?rev=58170&r1=58169&r2=58170&view=diff ============================================================================== --- test-suite/trunk/MultiSource/Benchmarks/BitBench/uuencode/Makefile (original) +++ test-suite/trunk/MultiSource/Benchmarks/BitBench/uuencode/Makefile Sat Oct 25 18:27:37 2008 @@ -2,5 +2,5 @@ PROG = uuencode LDFLAGS = -RUN_OPTIONS = uuencode.c +RUN_OPTIONS = $(PROJ_SRC_DIR)/uuencode.c include $(LEVEL)/MultiSource/Makefile.multisrc From gohman at apple.com Sat Oct 25 18:41:09 2008 From: gohman at apple.com (Dan Gohman) Date: Sat, 25 Oct 2008 23:41:09 -0000 Subject: [llvm-commits] [test-suite] r58173 - in /test-suite/trunk: TEST.libcalls.Makefile TEST.nightly2.report Message-ID: <200810252341.m9PNf9A8006924@zion.cs.uiuc.edu> Author: djg Date: Sat Oct 25 18:41:08 2008 New Revision: 58173 URL: http://llvm.org/viewvc/llvm-project?rev=58173&view=rev Log: Remove unnecessary svn:executable property. Modified: test-suite/trunk/TEST.libcalls.Makefile (props changed) test-suite/trunk/TEST.nightly2.report (props changed) Propchange: test-suite/trunk/TEST.libcalls.Makefile ------------------------------------------------------------------------------ --- svn:executable (original) +++ svn:executable (removed) @@ -1 +0,0 @@ -* Propchange: test-suite/trunk/TEST.nightly2.report ------------------------------------------------------------------------------ --- svn:executable (original) +++ svn:executable (removed) @@ -1 +0,0 @@ -* From evan.cheng at apple.com Sat Oct 25 18:49:39 2008 From: evan.cheng at apple.com (Evan Cheng) Date: Sat, 25 Oct 2008 23:49:39 -0000 Subject: [llvm-commits] [llvm] r58174 - in /llvm/trunk: lib/CodeGen/PreAllocSplitting.cpp test/CodeGen/X86/pre-split5.ll Message-ID: <200810252349.m9PNne3m007221@zion.cs.uiuc.edu> Author: evancheng Date: Sat Oct 25 18:49:39 2008 New Revision: 58174 URL: http://llvm.org/viewvc/llvm-project?rev=58174&view=rev Log: Handle cases where there aren't uses in the barrier mbb. Added: llvm/trunk/test/CodeGen/X86/pre-split5.ll Modified: llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp Modified: llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp?rev=58174&r1=58173&r2=58174&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp (original) +++ llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp Sat Oct 25 18:49:39 2008 @@ -457,8 +457,12 @@ DefMI->eraseFromParent(); CurrLI->removeRange(ValNo->def, LIs->getMBBEndIdx(MBB)+1); } + } else if (MBB == BarrierMBB) { + // Remove entire live range from start of mbb to barrier. + CurrLI->removeRange(LIs->getMBBStartIdx(MBB), + LIs->getUseIndex(BarrierIdx)+1); } else { - // Remove entire live range of the bb out of the live interval. + // Remove entire live range of the mbb out of the live interval. CurrLI->removeRange(LIs->getMBBStartIdx(MBB), LIs->getMBBEndIdx(MBB)+1); } Added: llvm/trunk/test/CodeGen/X86/pre-split5.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/pre-split5.ll?rev=58174&view=auto ============================================================================== --- llvm/trunk/test/CodeGen/X86/pre-split5.ll (added) +++ llvm/trunk/test/CodeGen/X86/pre-split5.ll Sat Oct 25 18:49:39 2008 @@ -0,0 +1,56 @@ +; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 -pre-alloc-split + +target triple = "i386-apple-darwin9.5" + %struct.FILE = type { i8*, i32, i32, i16, i16, %struct.__sbuf, i32, i8*, i32 (i8*)*, i32 (i8*, i8*, i32)*, i64 (i8*, i64, i32)*, i32 (i8*, i8*, i32)*, %struct.__sbuf, %struct.__sFILEX*, i32, [3 x i8], [1 x i8], %struct.__sbuf, i32, i64 } + %struct.__sFILEX = type opaque + %struct.__sbuf = type { i8*, i32 } +@"\01LC1" = external constant [48 x i8] ; <[48 x i8]*> [#uses=1] + +define i32 @main() nounwind { +entry: + br label %bb5.us + +bb5.us: ; preds = %bb8.split, %bb5.us, %entry + %i.0.reg2mem.0.ph = phi i32 [ 0, %entry ], [ %indvar.next53, %bb8.split ], [ %i.0.reg2mem.0.ph, %bb5.us ] ; [#uses=2] + %j.0.reg2mem.0.us = phi i32 [ %indvar.next47, %bb5.us ], [ 0, %bb8.split ], [ 0, %entry ] ; [#uses=1] + %indvar.next47 = add i32 %j.0.reg2mem.0.us, 1 ; [#uses=2] + %exitcond48 = icmp eq i32 %indvar.next47, 256 ; [#uses=1] + br i1 %exitcond48, label %bb8.split, label %bb5.us + +bb8.split: ; preds = %bb5.us + %indvar.next53 = add i32 %i.0.reg2mem.0.ph, 1 ; [#uses=2] + %exitcond54 = icmp eq i32 %indvar.next53, 256 ; [#uses=1] + br i1 %exitcond54, label %bb11, label %bb5.us + +bb11: ; preds = %bb11, %bb8.split + %i.1.reg2mem.0 = phi i32 [ %indvar.next44, %bb11 ], [ 0, %bb8.split ] ; [#uses=1] + %indvar.next44 = add i32 %i.1.reg2mem.0, 1 ; [#uses=2] + %exitcond45 = icmp eq i32 %indvar.next44, 63 ; [#uses=1] + br i1 %exitcond45, label %bb14, label %bb11 + +bb14: ; preds = %bb14, %bb11 + %indvar = phi i32 [ %indvar.next40, %bb14 ], [ 0, %bb11 ] ; [#uses=1] + %indvar.next40 = add i32 %indvar, 1 ; [#uses=2] + %exitcond41 = icmp eq i32 %indvar.next40, 32768 ; [#uses=1] + br i1 %exitcond41, label %bb28, label %bb14 + +bb28: ; preds = %bb14 + %0 = fdiv double 2.550000e+02, 0.000000e+00 ; [#uses=1] + br label %bb30 + +bb30: ; preds = %bb36, %bb28 + %m.1.reg2mem.0 = phi i32 [ %m.0, %bb36 ], [ 0, %bb28 ] ; [#uses=1] + %1 = mul double 0.000000e+00, %0 ; [#uses=1] + %2 = fptosi double %1 to i32 ; [#uses=1] + br i1 false, label %bb36, label %bb35 + +bb35: ; preds = %bb30 + %3 = tail call i32 (%struct.FILE*, i8*, ...)* @fprintf(%struct.FILE* null, i8* getelementptr ([48 x i8]* @"\01LC1", i32 0, i32 0), i32 0, i32 0, i32 0, i32 %2) nounwind ; [#uses=0] + br label %bb36 + +bb36: ; preds = %bb35, %bb30 + %m.0 = phi i32 [ 0, %bb35 ], [ %m.1.reg2mem.0, %bb30 ] ; [#uses=1] + br label %bb30 +} + +declare i32 @fprintf(%struct.FILE*, i8*, ...) nounwind From isanbard at gmail.com Sat Oct 25 19:19:56 2008 From: isanbard at gmail.com (Bill Wendling) Date: Sun, 26 Oct 2008 00:19:56 -0000 Subject: [llvm-commits] [llvm] r58175 - /llvm/trunk/lib/VMCore/Constants.cpp Message-ID: <200810260019.m9Q0Jvuq008224@zion.cs.uiuc.edu> Author: void Date: Sat Oct 25 19:19:56 2008 New Revision: 58175 URL: http://llvm.org/viewvc/llvm-project?rev=58175&view=rev Log: Fix type-o in ExprMapKeyType::operator ==(). The "&&" was missing. Patch by Frits van Bommel! Modified: llvm/trunk/lib/VMCore/Constants.cpp Modified: llvm/trunk/lib/VMCore/Constants.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Constants.cpp?rev=58175&r1=58174&r2=58175&view=diff ============================================================================== --- llvm/trunk/lib/VMCore/Constants.cpp (original) +++ llvm/trunk/lib/VMCore/Constants.cpp Sat Oct 25 19:19:56 2008 @@ -1658,7 +1658,7 @@ bool operator==(const ExprMapKeyType& that) const { return this->opcode == that.opcode && this->predicate == that.predicate && - this->operands == that.operands; + this->operands == that.operands && this->indices == that.indices; } bool operator<(const ExprMapKeyType & that) const { From ofv at wanadoo.es Sat Oct 25 19:47:54 2008 From: ofv at wanadoo.es (Oscar Fuentes) Date: Sun, 26 Oct 2008 00:47:54 -0000 Subject: [llvm-commits] [llvm] r58176 - in /llvm/trunk: cmake/config-ix.cmake cmake/modules/GetTargetTriple.cmake include/llvm/Config/config.h.cmake tools/llvm-config/CMakeLists.txt Message-ID: <200810260047.m9Q0lsQV009053@zion.cs.uiuc.edu> Author: ofv Date: Sat Oct 25 19:47:52 2008 New Revision: 58176 URL: http://llvm.org/viewvc/llvm-project?rev=58176&view=rev Log: CMake: GetTargetTriple: new module for determining the target triple. Assign to LLVM_HOSTTRIPLE so it figures in config.h. Added: llvm/trunk/cmake/modules/GetTargetTriple.cmake Modified: llvm/trunk/cmake/config-ix.cmake llvm/trunk/include/llvm/Config/config.h.cmake llvm/trunk/tools/llvm-config/CMakeLists.txt Modified: llvm/trunk/cmake/config-ix.cmake URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/config-ix.cmake?rev=58176&r1=58175&r2=58176&view=diff ============================================================================== --- llvm/trunk/cmake/config-ix.cmake (original) +++ llvm/trunk/cmake/config-ix.cmake Sat Oct 25 19:47:52 2008 @@ -52,6 +52,10 @@ check_symbol_exists(pthread_mutex_lock pthread.h HAVE_PTHREAD_MUTEX_LOCK) check_symbol_exists(strtoll stdlib.h HAVE_STRTOLL) +include(GetTargetTriple) +get_target_triple(LLVM_HOSTTRIPLE) +message(STATUS "LLVM_HOSTTRIPLE: ${LLVM_HOSTTRIPLE}") + if( MINGW ) # tbi: Comprobar que existen las librerias: set(HAVE_LIBIMAGEHLP 1) Added: llvm/trunk/cmake/modules/GetTargetTriple.cmake URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/GetTargetTriple.cmake?rev=58176&view=auto ============================================================================== --- llvm/trunk/cmake/modules/GetTargetTriple.cmake (added) +++ llvm/trunk/cmake/modules/GetTargetTriple.cmake Sat Oct 25 19:47:52 2008 @@ -0,0 +1,19 @@ +# Returns the host triple. +# Invokes config.guess + +function( get_target_triple var ) + if( MSVC ) + set( ${var} "i686-pc-win32" PARENT_SCOPE ) + else( MSVC ) + set(config_guess ${LLVM_MAIN_SRC_DIR}/autoconf/config.guess) + execute_process(COMMAND sh ${config_guess} + RESULT_VARIABLE TT_RV + OUTPUT_VARIABLE TT_OUT + OUTPUT_STRIP_TRAILING_WHITESPACE) + if( NOT TT_RV EQUAL 0 ) + message(FATAL_ERROR "Failed to execute ${config_guess}") + endif( NOT TT_RV EQUAL 0 ) + set( ${var} ${TT_OUT} PARENT_SCOPE ) + message(STATUS "Target triple: ${${var}}") + endif( MSVC ) +endfunction( get_target_triple var ) Modified: llvm/trunk/include/llvm/Config/config.h.cmake URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Config/config.h.cmake?rev=58176&r1=58175&r2=58176&view=diff ============================================================================== --- llvm/trunk/include/llvm/Config/config.h.cmake (original) +++ llvm/trunk/include/llvm/Config/config.h.cmake Sat Oct 25 19:47:52 2008 @@ -440,6 +440,9 @@ /* Installation directory for config files */ #undef LLVM_ETCDIR +/* Host triple we were built on */ +#cmakedefine LLVM_HOSTTRIPLE "${LLVM_HOSTTRIPLE}" + /* Installation directory for include files */ #undef LLVM_INCLUDEDIR Modified: llvm/trunk/tools/llvm-config/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-config/CMakeLists.txt?rev=58176&r1=58175&r2=58176&view=diff ============================================================================== --- llvm/trunk/tools/llvm-config/CMakeLists.txt (original) +++ llvm/trunk/tools/llvm-config/CMakeLists.txt Sat Oct 25 19:47:52 2008 @@ -29,17 +29,10 @@ #EXEEXT already set. set(OS "${CMAKE_SYSTEM}") set(ARCH "X86") # TODO: This gives "i686" in Linux: "${CMAKE_SYSTEM_PROCESSOR}") -# TODO: avoid using autoconf: -set(config_guess ${LLVM_MAIN_SRC_DIR}/autoconf/config.guess) -execute_process(COMMAND sh ${config_guess} - RESULT_VARIABLE TT_RV - OUTPUT_VARIABLE LLVM_TARGET_TRIPLET - OUTPUT_STRIP_TRAILING_WHITESPACE) -message(STATUS "Target triplet: ${LLVM_TARGET_TRIPLET}") -if( NOT TT_RV EQUAL 0 ) - message(FATAL_ERROR "Failed to execute ${config_guess}") -endif( NOT TT_RV EQUAL 0 ) -set(target ${LLVM_TARGET_TRIPLET}) + +include(GetTargetTriple) +get_target_triple(target) + foreach(c ${LLVM_TARGETS_TO_BUILD}) set(TARGETS_BUILT "${TARGETS_BUILT} ${c}") endforeach(c) From ofv at wanadoo.es Sat Oct 25 19:50:03 2008 From: ofv at wanadoo.es (Oscar Fuentes) Date: Sun, 26 Oct 2008 00:50:03 -0000 Subject: [llvm-commits] [llvm] r58177 - /llvm/trunk/CMakeLists.txt Message-ID: <200810260050.m9Q0o3lI009131@zion.cs.uiuc.edu> Author: ofv Date: Sat Oct 25 19:50:03 2008 New Revision: 58177 URL: http://llvm.org/viewvc/llvm-project?rev=58177&view=rev Log: CMake: Removed unnecessary macro definitions. They are defined in config.h Modified: llvm/trunk/CMakeLists.txt Modified: llvm/trunk/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/CMakeLists.txt?rev=58177&r1=58176&r2=58177&view=diff ============================================================================== --- llvm/trunk/CMakeLists.txt (original) +++ llvm/trunk/CMakeLists.txt Sat Oct 25 19:50:03 2008 @@ -75,12 +75,6 @@ add_definitions( -D__STDC_LIMIT_MACROS ) add_definitions( -D__STDC_CONSTANT_MACROS ) -if( LLVM_ON_UNIX ) - add_definitions( -DLLVM_ON_UNIX ) -else( LLVM_ON_UNIX ) - add_definitions( -DLLVM_ON_WIN32 ) -endif( LLVM_ON_UNIX ) - if( MSVC ) add_definitions( -D_CRT_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS ) add_definitions( -D_SCL_SECURE_NO_WARNINGS -DCRT_NONSTDC_NO_WARNINGS ) From ofv at wanadoo.es Sat Oct 25 19:51:06 2008 From: ofv at wanadoo.es (Oscar Fuentes) Date: Sun, 26 Oct 2008 00:51:06 -0000 Subject: [llvm-commits] [llvm] r58178 - /llvm/trunk/cmake/modules/AddLLVM.cmake Message-ID: <200810260051.m9Q0p6Mt009174@zion.cs.uiuc.edu> Author: ofv Date: Sat Oct 25 19:51:05 2008 New Revision: 58178 URL: http://llvm.org/viewvc/llvm-project?rev=58178&view=rev Log: CMake: Support for LLVM_USED_LIBS variable, which is the cmake counterpart of USED_LIBS. Modified: llvm/trunk/cmake/modules/AddLLVM.cmake Modified: llvm/trunk/cmake/modules/AddLLVM.cmake URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/AddLLVM.cmake?rev=58178&r1=58177&r2=58178&view=diff ============================================================================== --- llvm/trunk/cmake/modules/AddLLVM.cmake (original) +++ llvm/trunk/cmake/modules/AddLLVM.cmake Sat Oct 25 19:51:05 2008 @@ -15,6 +15,11 @@ macro(add_llvm_executable name) add_executable(${name} ${ARGN}) + if( LLVM_USED_LIBS ) + foreach(lib ${LLVM_USED_LIBS}) + target_link_libraries( ${name} ${lib} ) + endforeach(lib) + endif( LLVM_USED_LIBS ) if( LLVM_LINK_COMPONENTS ) llvm_config(${name} ${LLVM_LINK_COMPONENTS}) endif( LLVM_LINK_COMPONENTS ) From ofv at wanadoo.es Sat Oct 25 19:52:09 2008 From: ofv at wanadoo.es (Oscar Fuentes) Date: Sun, 26 Oct 2008 00:52:09 -0000 Subject: [llvm-commits] [llvm] r58179 - /llvm/trunk/tools/CMakeLists.txt Message-ID: <200810260052.m9Q0q9Ww009215@zion.cs.uiuc.edu> Author: ofv Date: Sat Oct 25 19:52:09 2008 New Revision: 58179 URL: http://llvm.org/viewvc/llvm-project?rev=58179&view=rev Log: CMake: If we have `clang' under the `tools/' subdirectory, add it to the build. Modified: llvm/trunk/tools/CMakeLists.txt Modified: llvm/trunk/tools/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/CMakeLists.txt?rev=58179&r1=58178&r2=58179&view=diff ============================================================================== --- llvm/trunk/tools/CMakeLists.txt (original) +++ llvm/trunk/tools/CMakeLists.txt Sat Oct 25 19:52:09 2008 @@ -30,3 +30,7 @@ add_subdirectory(llvm-bcanalyzer) add_subdirectory(llvm-stub) add_subdirectory(llvmc2) + +if( EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/clang/CMakeLists.txt ) + add_subdirectory( ${CMAKE_CURRENT_SOURCE_DIR}/clang ) +endif( EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/clang/CMakeLists.txt ) From ofv at wanadoo.es Sat Oct 25 23:26:34 2008 From: ofv at wanadoo.es (Oscar Fuentes) Date: Sun, 26 Oct 2008 04:26:34 -0000 Subject: [llvm-commits] [llvm] r58183 - /llvm/trunk/include/llvm/Target/TargetJITInfo.h Message-ID: <200810260426.m9Q4QYfF015683@zion.cs.uiuc.edu> Author: ofv Date: Sat Oct 25 23:26:33 2008 New Revision: 58183 URL: http://llvm.org/viewvc/llvm-project?rev=58183&view=rev Log: Return something (i.e. NULL) from an unimplemented virtual function. Modified: llvm/trunk/include/llvm/Target/TargetJITInfo.h Modified: llvm/trunk/include/llvm/Target/TargetJITInfo.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/TargetJITInfo.h?rev=58183&r1=58182&r2=58183&view=diff ============================================================================== --- llvm/trunk/include/llvm/Target/TargetJITInfo.h (original) +++ llvm/trunk/include/llvm/Target/TargetJITInfo.h Sat Oct 25 23:26:33 2008 @@ -100,6 +100,7 @@ /// meaningful to the target. virtual char* allocateThreadLocalMemory(size_t size) { assert(0 && "This target does not implement thread local storage!"); + return 0; } /// needsGOT - Allows a target to specify that it would like the From evan.cheng at apple.com Sun Oct 26 02:49:04 2008 From: evan.cheng at apple.com (Evan Cheng) Date: Sun, 26 Oct 2008 07:49:04 -0000 Subject: [llvm-commits] [llvm] r58184 - in /llvm/trunk: lib/CodeGen/PreAllocSplitting.cpp test/CodeGen/X86/pre-split6.ll Message-ID: <200810260749.m9Q7n4qB026696@zion.cs.uiuc.edu> Author: evancheng Date: Sun Oct 26 02:49:03 2008 New Revision: 58184 URL: http://llvm.org/viewvc/llvm-project?rev=58184&view=rev Log: Do not shrink wrap live interval in a mbb if it's livein any of its successor blocks. The mbb can be revisited again after all of the successors are processed. Added: llvm/trunk/test/CodeGen/X86/pre-split6.ll Modified: llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp Modified: llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp?rev=58184&r1=58183&r2=58184&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp (original) +++ llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp Sun Oct 26 02:49:03 2008 @@ -122,7 +122,7 @@ SmallVector&, SmallPtrSet&); - void ShrinkWrapLiveInterval(VNInfo*, MachineBasicBlock*, + void ShrinkWrapLiveInterval(VNInfo*, MachineBasicBlock*, MachineBasicBlock*, MachineBasicBlock*, SmallPtrSet&, DenseMap >&, DenseMap >&, @@ -426,15 +426,29 @@ /// chain to find the new 'kills' and shrink wrap the live interval to the /// new kill indices. void -PreAllocSplitting::ShrinkWrapLiveInterval(VNInfo *ValNo, - MachineBasicBlock *MBB, MachineBasicBlock *DefMBB, +PreAllocSplitting::ShrinkWrapLiveInterval(VNInfo *ValNo, MachineBasicBlock *MBB, + MachineBasicBlock *SuccMBB, MachineBasicBlock *DefMBB, SmallPtrSet &Visited, DenseMap > &Uses, DenseMap > &UseMIs, SmallVector &UseMBBs) { - if (!Visited.insert(MBB)) + if (Visited.count(MBB)) return; + // If live interval is live in another successor path, then we can't process + // this block. But we may able to do so after all the successors have been + // processed. + for (MachineBasicBlock::succ_iterator SI = MBB->succ_begin(), + SE = MBB->succ_end(); SI != SE; ++SI) { + MachineBasicBlock *SMBB = *SI; + if (SMBB == SuccMBB) + continue; + if (CurrLI->liveAt(LIs->getMBBStartIdx(SMBB))) + return; + } + + Visited.insert(MBB); + DenseMap >::iterator UMII = Uses.find(MBB); if (UMII != Uses.end()) { @@ -480,7 +494,8 @@ // Pred is the def bb and the def reaches other val#s, we must // allow the value to be live out of the bb. continue; - ShrinkWrapLiveInterval(ValNo, Pred, DefMBB, Visited, Uses, UseMIs, UseMBBs); + ShrinkWrapLiveInterval(ValNo, Pred, MBB, DefMBB, Visited, + Uses, UseMIs, UseMBBs); } return; @@ -622,7 +637,7 @@ // Walk up the predecessor chains. SmallPtrSet Visited; - ShrinkWrapLiveInterval(ValNo, BarrierMBB, DefMBB, Visited, + ShrinkWrapLiveInterval(ValNo, BarrierMBB, NULL, DefMBB, Visited, Uses, UseMIs, UseMBBs); // Remove live range from barrier to the restore. FIXME: Find a better Added: llvm/trunk/test/CodeGen/X86/pre-split6.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/pre-split6.ll?rev=58184&view=auto ============================================================================== --- llvm/trunk/test/CodeGen/X86/pre-split6.ll (added) +++ llvm/trunk/test/CodeGen/X86/pre-split6.ll Sun Oct 26 02:49:03 2008 @@ -0,0 +1,36 @@ +; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 -pre-alloc-split + + at current_surfaces.b = external global i1 ; [#uses=1] + +declare double @sin(double) nounwind readonly + +declare double @asin(double) nounwind readonly + +define fastcc void @trace_line(i32 %line) nounwind { +entry: + %.b3 = load i1* @current_surfaces.b ; [#uses=1] + br i1 %.b3, label %bb.nph, label %return + +bb.nph: ; preds = %entry + %0 = load double* null, align 8 ; [#uses=1] + %1 = load double* null, align 8 ; [#uses=2] + %2 = fcmp une double %0, 0.000000e+00 ; [#uses=1] + br i1 %2, label %bb9.i, label %bb13.i + +bb9.i: ; preds = %bb.nph + %3 = tail call double @asin(double 0.000000e+00) nounwind readonly ; [#uses=0] + %4 = fdiv double 1.000000e+00, %1 ; [#uses=1] + %5 = mul double %4, 0.000000e+00 ; [#uses=1] + %6 = tail call double @asin(double %5) nounwind readonly ; [#uses=0] + unreachable + +bb13.i: ; preds = %bb.nph + %7 = fdiv double 1.000000e+00, %1 ; [#uses=1] + %8 = tail call double @sin(double 0.000000e+00) nounwind readonly ; [#uses=1] + %9 = mul double %7, %8 ; [#uses=1] + %10 = tail call double @asin(double %9) nounwind readonly ; [#uses=0] + unreachable + +return: ; preds = %entry + ret void +} From cedric.venet at laposte.net Sun Oct 26 10:40:46 2008 From: cedric.venet at laposte.net (Cedric Venet) Date: Sun, 26 Oct 2008 15:40:46 -0000 Subject: [llvm-commits] [llvm] r58185 - /llvm/trunk/utils/TableGen/AsmWriterEmitter.cpp Message-ID: <200810261540.m9QFekk6009665@zion.cs.uiuc.edu> Author: venet Date: Sun Oct 26 10:40:44 2008 New Revision: 58185 URL: http://llvm.org/viewvc/llvm-project?rev=58185&view=rev Log: Add a default constructor to AsmWriterOperand to make VS2008sp1 happy. (AsmWriterOperand is used in a std::pair, and VS need to generate the default constructor of this pair). Modified: llvm/trunk/utils/TableGen/AsmWriterEmitter.cpp Modified: llvm/trunk/utils/TableGen/AsmWriterEmitter.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/AsmWriterEmitter.cpp?rev=58185&r1=58184&r2=58185&view=diff ============================================================================== --- llvm/trunk/utils/TableGen/AsmWriterEmitter.cpp (original) +++ llvm/trunk/utils/TableGen/AsmWriterEmitter.cpp Sun Oct 26 10:40:44 2008 @@ -45,6 +45,9 @@ /// an operand, specified with syntax like ${opname:modifier}. std::string MiModifier; + // To make VS STL happy + AsmWriterOperand():OperandType(isLiteralTextOperand) {} + AsmWriterOperand(const std::string &LitStr) : OperandType(isLiteralTextOperand), Str(LitStr) {} From gohman at apple.com Sun Oct 26 12:24:33 2008 From: gohman at apple.com (Dan Gohman) Date: Sun, 26 Oct 2008 17:24:33 -0000 Subject: [llvm-commits] [test-suite] r58189 - /test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/employ/input.txt Message-ID: <200810261724.m9QHOXOA012927@zion.cs.uiuc.edu> Author: djg Date: Sun Oct 26 12:24:33 2008 New Revision: 58189 URL: http://llvm.org/viewvc/llvm-project?rev=58189&view=rev Log: Fix employ's input file so that it doesn't contain invalid data, so that the test doesn't abort. And add a few more entries, actually covering all the employee types, to make it a little more interesting. Modified: test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/employ/input.txt Modified: test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/employ/input.txt URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Prolangs-C%2B%2B/employ/input.txt?rev=58189&r1=58188&r2=58189&view=diff ============================================================================== --- test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/employ/input.txt (original) +++ test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/employ/input.txt Sun Oct 26 12:24:33 2008 @@ -1,4 +1,12 @@ 1 bob jones 123.00 2 john doe 1232.2 10.21 -0 jane green 1231.123 - +7 jane green 1231.123 +6 Cleveland Carroll 16861.21560 +4 Rosalie Dickerson 4141.2671 +2 Consuelo Vaughan 6190.16185 25.14 +4 Jaclyn Johns 25271.6132 +1 Devon Winters 27146.1647 +6 Kyle Gallagher 16127.206 +7 Nelda Barber 29756.622 +2 Mai Herrera 30762.20377 52.28 +4 Foster Odom 29679.902 From gohman at apple.com Sun Oct 26 12:30:19 2008 From: gohman at apple.com (Dan Gohman) Date: Sun, 26 Oct 2008 17:30:19 -0000 Subject: [llvm-commits] [test-suite] r58191 - in /test-suite/trunk/MultiSource/Benchmarks/BitBench: drop3/drop3.c five11/five11.c uudecode/uudecode.c uuencode/uuencode.c Message-ID: <200810261730.m9QHUKjw013100@zion.cs.uiuc.edu> Author: djg Date: Sun Oct 26 12:30:19 2008 New Revision: 58191 URL: http://llvm.org/viewvc/llvm-project?rev=58191&view=rev Log: Print a newline character after the result value. Modified: test-suite/trunk/MultiSource/Benchmarks/BitBench/drop3/drop3.c test-suite/trunk/MultiSource/Benchmarks/BitBench/five11/five11.c test-suite/trunk/MultiSource/Benchmarks/BitBench/uudecode/uudecode.c test-suite/trunk/MultiSource/Benchmarks/BitBench/uuencode/uuencode.c Modified: test-suite/trunk/MultiSource/Benchmarks/BitBench/drop3/drop3.c URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/BitBench/drop3/drop3.c?rev=58191&r1=58190&r2=58191&view=diff ============================================================================== --- test-suite/trunk/MultiSource/Benchmarks/BitBench/drop3/drop3.c (original) +++ test-suite/trunk/MultiSource/Benchmarks/BitBench/drop3/drop3.c Sun Oct 26 12:30:19 2008 @@ -100,6 +100,6 @@ } gettimeofday(&post,0); time = ((post.tv_sec*1000000+post.tv_usec)-(pre.tv_sec*1000000+pre.tv_usec)); - printf("%d", outsize); + printf("%d\n", outsize); exit(0); -} \ No newline at end of file +} Modified: test-suite/trunk/MultiSource/Benchmarks/BitBench/five11/five11.c URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/BitBench/five11/five11.c?rev=58191&r1=58190&r2=58191&view=diff ============================================================================== --- test-suite/trunk/MultiSource/Benchmarks/BitBench/five11/five11.c (original) +++ test-suite/trunk/MultiSource/Benchmarks/BitBench/five11/five11.c Sun Oct 26 12:30:19 2008 @@ -187,6 +187,6 @@ free_list2(list); } gettimeofday(&post,0); - printf("%d", outsize); + printf("%d\n", outsize); exit(0); } Modified: test-suite/trunk/MultiSource/Benchmarks/BitBench/uudecode/uudecode.c URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/BitBench/uudecode/uudecode.c?rev=58191&r1=58190&r2=58191&view=diff ============================================================================== --- test-suite/trunk/MultiSource/Benchmarks/BitBench/uudecode/uudecode.c (original) +++ test-suite/trunk/MultiSource/Benchmarks/BitBench/uudecode/uudecode.c Sun Oct 26 12:30:19 2008 @@ -171,6 +171,6 @@ outsize = do_decode(inbuf,outbuf,outfilename); } - printf("%d", outsize); + printf("%d\n", outsize); exit(0); -} \ No newline at end of file +} Modified: test-suite/trunk/MultiSource/Benchmarks/BitBench/uuencode/uuencode.c URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/BitBench/uuencode/uuencode.c?rev=58191&r1=58190&r2=58191&view=diff ============================================================================== --- test-suite/trunk/MultiSource/Benchmarks/BitBench/uuencode/uuencode.c (original) +++ test-suite/trunk/MultiSource/Benchmarks/BitBench/uuencode/uuencode.c Sun Oct 26 12:30:19 2008 @@ -192,7 +192,7 @@ gettimeofday(&post,0); time = ((post.tv_sec*1000000+post.tv_usec)-(pre.tv_sec*1000000+pre.tv_usec)); - printf("%d", outsize); + printf("%d\n", outsize); exit(0); -} \ No newline at end of file +} From sabre at nondot.org Sun Oct 26 13:53:07 2008 From: sabre at nondot.org (Chris Lattner) Date: Sun, 26 Oct 2008 18:53:07 -0000 Subject: [llvm-commits] [llvm] r58196 - /llvm/trunk/test/CodeGen/PowerPC/vec_spat.ll Message-ID: <200810261853.m9QIr889015412@zion.cs.uiuc.edu> Author: lattner Date: Sun Oct 26 13:53:07 2008 New Revision: 58196 URL: http://llvm.org/viewvc/llvm-project?rev=58196&view=rev Log: remove eh output from this test. Modified: llvm/trunk/test/CodeGen/PowerPC/vec_spat.ll Modified: llvm/trunk/test/CodeGen/PowerPC/vec_spat.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/PowerPC/vec_spat.ll?rev=58196&r1=58195&r2=58196&view=diff ============================================================================== --- llvm/trunk/test/CodeGen/PowerPC/vec_spat.ll (original) +++ llvm/trunk/test/CodeGen/PowerPC/vec_spat.ll Sun Oct 26 13:53:07 2008 @@ -9,7 +9,7 @@ %f4 = type <4 x float> %i4 = type <4 x i32> -define void @splat(%f4* %P, %f4* %Q, float %X) { +define void @splat(%f4* %P, %f4* %Q, float %X) nounwind { %tmp = insertelement %f4 undef, float %X, i32 0 ; <%f4> [#uses=1] %tmp2 = insertelement %f4 %tmp, float %X, i32 1 ; <%f4> [#uses=1] %tmp4 = insertelement %f4 %tmp2, float %X, i32 2 ; <%f4> [#uses=1] @@ -20,7 +20,7 @@ ret void } -define void @splat_i4(%i4* %P, %i4* %Q, i32 %X) { +define void @splat_i4(%i4* %P, %i4* %Q, i32 %X) nounwind { %tmp = insertelement %i4 undef, i32 %X, i32 0 ; <%i4> [#uses=1] %tmp2 = insertelement %i4 %tmp, i32 %X, i32 1 ; <%i4> [#uses=1] %tmp4 = insertelement %i4 %tmp2, i32 %X, i32 2 ; <%i4> [#uses=1] @@ -31,21 +31,21 @@ ret void } -define void @splat_imm_i32(%i4* %P, %i4* %Q, i32 %X) { +define void @splat_imm_i32(%i4* %P, %i4* %Q, i32 %X) nounwind { %q = load %i4* %Q ; <%i4> [#uses=1] %R = add %i4 %q, < i32 -1, i32 -1, i32 -1, i32 -1 > ; <%i4> [#uses=1] store %i4 %R, %i4* %P ret void } -define void @splat_imm_i16(%i4* %P, %i4* %Q, i32 %X) { +define void @splat_imm_i16(%i4* %P, %i4* %Q, i32 %X) nounwind { %q = load %i4* %Q ; <%i4> [#uses=1] %R = add %i4 %q, < i32 65537, i32 65537, i32 65537, i32 65537 > ; <%i4> [#uses=1] store %i4 %R, %i4* %P ret void } -define void @splat_h(i16 %tmp, <16 x i8>* %dst) { +define void @splat_h(i16 %tmp, <16 x i8>* %dst) nounwind { %tmp.upgrd.1 = insertelement <8 x i16> undef, i16 %tmp, i32 0 %tmp72 = insertelement <8 x i16> %tmp.upgrd.1, i16 %tmp, i32 1 %tmp73 = insertelement <8 x i16> %tmp72, i16 %tmp, i32 2 @@ -59,7 +59,7 @@ ret void } -define void @spltish(<16 x i8>* %A, <16 x i8>* %B) { +define void @spltish(<16 x i8>* %A, <16 x i8>* %B) nounwind { %tmp = load <16 x i8>* %B ; <<16 x i8>> [#uses=1] %tmp.s = bitcast <16 x i8> %tmp to <16 x i8> ; <<16 x i8>> [#uses=1] %tmp4 = sub <16 x i8> %tmp.s, bitcast (<8 x i16> < i16 15, i16 15, i16 15, i16 15, i16 15, i16 From sabre at nondot.org Sun Oct 26 14:20:48 2008 From: sabre at nondot.org (Chris Lattner) Date: Sun, 26 Oct 2008 19:20:48 -0000 Subject: [llvm-commits] [llvm] r58199 - /llvm/trunk/lib/Support/raw_ostream.cpp Message-ID: <200810261920.m9QJKncH016241@zion.cs.uiuc.edu> Author: lattner Date: Sun Oct 26 14:20:47 2008 New Revision: 58199 URL: http://llvm.org/viewvc/llvm-project?rev=58199&view=rev Log: fix PR2953, an off-by-one error handling formatted i/o. Thanks to T?r?k Edwin for the awesome reduced testcase. Modified: llvm/trunk/lib/Support/raw_ostream.cpp Modified: llvm/trunk/lib/Support/raw_ostream.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/raw_ostream.cpp?rev=58199&r1=58198&r2=58199&view=diff ============================================================================== --- llvm/trunk/lib/Support/raw_ostream.cpp (original) +++ llvm/trunk/lib/Support/raw_ostream.cpp Sun Oct 26 14:20:47 2008 @@ -175,7 +175,7 @@ unsigned BytesUsed = Fmt.print(&V[0], NextBufferSize); // If BytesUsed fit into the vector, we win. - if (BytesUsed < NextBufferSize) + if (BytesUsed <= NextBufferSize) return write(&V[0], BytesUsed); // Otherwise, try again with a new size. From edwintorok at gmail.com Sun Oct 26 15:19:41 2008 From: edwintorok at gmail.com (=?UTF-8?B?VMO2csO2ayBFZHdpbg==?=) Date: Sun, 26 Oct 2008 22:19:41 +0200 Subject: [llvm-commits] [llvm] r58199 - /llvm/trunk/lib/Support/raw_ostream.cpp In-Reply-To: <200810261920.m9QJKncH016241@zion.cs.uiuc.edu> References: <200810261920.m9QJKncH016241@zion.cs.uiuc.edu> Message-ID: <4904D0DD.6050001@gmail.com> On 2008-10-26 21:20, Chris Lattner wrote: > Author: lattner > Date: Sun Oct 26 14:20:47 2008 > New Revision: 58199 > > URL: http://llvm.org/viewvc/llvm-project?rev=58199&view=rev > Log: > fix PR2953, an off-by-one error handling formatted i/o. > Thanks to T?r?k Edwin for the awesome reduced testcase. > I think that this fix should be pulled into 2.4. Who knows when it might trigger, there is lots of code using raw_ostream... Best regards, --Edwin From clattner at apple.com Sun Oct 26 15:29:11 2008 From: clattner at apple.com (Chris Lattner) Date: Sun, 26 Oct 2008 13:29:11 -0700 Subject: [llvm-commits] [llvm] r58199 - /llvm/trunk/lib/Support/raw_ostream.cpp In-Reply-To: <4904D0DD.6050001@gmail.com> References: <200810261920.m9QJKncH016241@zion.cs.uiuc.edu> <4904D0DD.6050001@gmail.com> Message-ID: On Oct 26, 2008, at 1:19 PM, T?r?k Edwin wrote: > On 2008-10-26 21:20, Chris Lattner wrote: >> Author: lattner >> Date: Sun Oct 26 14:20:47 2008 >> New Revision: 58199 >> >> URL: http://llvm.org/viewvc/llvm-project?rev=58199&view=rev >> Log: >> fix PR2953, an off-by-one error handling formatted i/o. >> Thanks to T?r?k Edwin for the awesome reduced testcase. >> > > I think that this fix should be pulled into 2.4. > Who knows when it might trigger, there is lots of code using > raw_ostream... This can only happen when formatters are used. I think these are currently only used by Clang, so no bug could manifest in 2.4, -Chris From clattner at apple.com Sun Oct 26 15:31:04 2008 From: clattner at apple.com (Chris Lattner) Date: Sun, 26 Oct 2008 13:31:04 -0700 Subject: [llvm-commits] [llvm] r58199 - /llvm/trunk/lib/Support/raw_ostream.cpp In-Reply-To: References: <200810261920.m9QJKncH016241@zion.cs.uiuc.edu> <4904D0DD.6050001@gmail.com> Message-ID: On Oct 26, 2008, at 1:29 PM, Chris Lattner wrote: > > On Oct 26, 2008, at 1:19 PM, T?r?k Edwin wrote: > >> On 2008-10-26 21:20, Chris Lattner wrote: >>> Author: lattner >>> Date: Sun Oct 26 14:20:47 2008 >>> New Revision: 58199 >>> >>> URL: http://llvm.org/viewvc/llvm-project?rev=58199&view=rev >>> Log: >>> fix PR2953, an off-by-one error handling formatted i/o. >>> Thanks to T?r?k Edwin for the awesome reduced testcase. >>> >> >> I think that this fix should be pulled into 2.4. >> Who knows when it might trigger, there is lots of code using >> raw_ostream... > > This can only happen when formatters are used. I think these are > currently only used by Clang, so no bug could manifest in 2.4, Actually, on further consideration, I agree with Edwin. People with external code could run into this bug, and fixing it has no risk. Tanya, please pull this patch into 2.4, thanks! http://llvm.org/viewvc/llvm-project?rev=58199&view=rev -Chris From clattner at apple.com Sun Oct 26 15:39:18 2008 From: clattner at apple.com (Chris Lattner) Date: Sun, 26 Oct 2008 13:39:18 -0700 Subject: [llvm-commits] [llvm] r57565 - in /llvm/trunk/lib/Target: TargetSelectionDAG.td X86/X86InstrInfo.td X86/X86InstrSSE.td In-Reply-To: <200810150650.m9F6oJpL013574@zion.cs.uiuc.edu> References: <200810150650.m9F6oJpL013574@zion.cs.uiuc.edu> Message-ID: On Oct 14, 2008, at 11:50 PM, Dan Gohman wrote: > Author: djg > Date: Wed Oct 15 01:50:19 2008 > New Revision: 57565 > > URL: http://llvm.org/viewvc/llvm-project?rev=57565&view=rev > Log: > Now that predicates can be composed, simplify several of > the predicates by extending simple predicates to create > more complex predicates instead of duplicating the logic > for the simple predicates. Wow, nice cleanup to the .td files! -Chris From sabre at nondot.org Sun Oct 26 15:46:09 2008 From: sabre at nondot.org (Chris Lattner) Date: Sun, 26 Oct 2008 20:46:09 -0000 Subject: [llvm-commits] [llvm-gcc-4.2] r58202 - /llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp Message-ID: <200810262046.m9QKkAgE018925@zion.cs.uiuc.edu> Author: lattner Date: Sun Oct 26 15:46:08 2008 New Revision: 58202 URL: http://llvm.org/viewvc/llvm-project?rev=58202&view=rev Log: improve some comments and fix an assert that Duncan pointed out. Modified: llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp Modified: llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp?rev=58202&r1=58201&r2=58202&view=diff ============================================================================== --- llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp (original) +++ llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp Sun Oct 26 15:46:08 2008 @@ -90,8 +90,13 @@ static std::vector LLVMValues; typedef DenseMap LLVMValuesMapTy; static LLVMValuesMapTy LLVMValuesMap; + /// LocalLLVMValueIDs - This is the set of local IDs we have in our mapping, -/// this allows us to efficiently identify and remove them. +/// this allows us to efficiently identify and remove them. Local IDs are IDs +/// for values that are local to the current function being processed. These do +/// not need to go into the PCH file, but DECL_LLVM still needs a valid index +/// while converting the function. Using "Local IDs" allows the IDs for +/// function-local decls to be recycled after the function is done. static std::vector LocalLLVMValueIDs; // Remember the LLVM value for GCC tree node. @@ -242,7 +247,7 @@ LocalLLVMValueIDs.pop_back(); if (Value *V = LLVMValues[Idx]) { - assert(!isa(V) && "Found local value"); + assert(!isa(V) && "Found global value"); LLVMValuesMap.erase(V); } From sabre at nondot.org Sun Oct 26 15:46:17 2008 From: sabre at nondot.org (Chris Lattner) Date: Sun, 26 Oct 2008 13:46:17 -0700 Subject: [llvm-commits] [llvm-gcc-4.2] r53079 - /llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp In-Reply-To: <200807031135.58882.baldrick@free.fr> References: <200807030445.m634jkZl009083@zion.cs.uiuc.edu> <200807031135.58882.baldrick@free.fr> Message-ID: <3F9694EA-5574-4687-9BED-9ACB128CC9B4@nondot.org> On Jul 3, 2008, at 2:35 AM, Duncan Sands wrote: > Hi Chris, > >> +/// LocalLLVMValueIDs - This is the set of local IDs we have in >> our mapping, >> +/// this allows us to efficiently identify and remove them. > > how about adding an explanation of what a local value is? > >> + if (Value *V = LLVMValues[Idx]) { >> + assert(!isa(V) && "Found local value"); > > Shouldn't this be "Found global value!"? Yep, fixed thanks! -Chris From isanbard at gmail.com Sun Oct 26 17:45:02 2008 From: isanbard at gmail.com (Bill Wendling) Date: Sun, 26 Oct 2008 22:45:02 -0000 Subject: [llvm-commits] [llvm-gcc-4.2] r58208 - in /llvm-gcc-4.2/tags/llvmgcc42-2077.2: ./ configure configure.in Message-ID: <200810262245.m9QMj3Wa023185@zion.cs.uiuc.edu> Author: void Date: Sun Oct 26 17:45:02 2008 New Revision: 58208 URL: http://llvm.org/viewvc/llvm-project?rev=58208&view=rev Log: Force gcc to default to 32-bit code generation on x86_64 platforms. Added: llvm-gcc-4.2/tags/llvmgcc42-2077.2/ - copied from r58203, llvm-gcc-4.2/tags/Apple/llvmgcc42-2077.1/ Modified: llvm-gcc-4.2/tags/llvmgcc42-2077.2/configure llvm-gcc-4.2/tags/llvmgcc42-2077.2/configure.in Modified: llvm-gcc-4.2/tags/llvmgcc42-2077.2/configure URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/tags/llvmgcc42-2077.2/configure?rev=58208&r1=58203&r2=58208&view=diff ============================================================================== --- llvm-gcc-4.2/tags/llvmgcc42-2077.2/configure (original) +++ llvm-gcc-4.2/tags/llvmgcc42-2077.2/configure Sun Oct 26 17:45:02 2008 @@ -1,83 +1,740 @@ #! /bin/sh - # Guess values for system-dependent variables and create Makefiles. -# Generated automatically using autoconf version 2.13 -# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. +# Generated by GNU Autoconf 2.61. # +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. +## --------------------- ## +## M4sh Initialization. ## +## --------------------- ## + +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh +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+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + +fi + + + + +# PATH needs CR +# 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 + +# Support unset when possible. +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then + as_unset=unset +else + as_unset=false +fi + + +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. +# (If _AS_PATH_WALK were called with IFS unset, it would disable word +# splitting by setting IFS to empty value.) +as_nl=' +' +IFS=" "" $as_nl" + +# Find who we are. Look in the path if we contain no directory separator. +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 +IFS=$as_save_IFS + + ;; +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_myself: error: cannot find myself; rerun with an absolute file name" >&2 + { (exit 1); exit 1; } +fi + +# Work around bugs in pre-3.0 UWIN ksh. +for as_var in ENV MAIL MAILPATH +do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +done +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 -z "`(eval $as_var=C; export $as_var) 2>&1`"); then + eval $as_var=C; export $as_var + else + ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var + fi +done + +# Required to use basename. +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; 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'` + +# CDPATH. +$as_unset CDPATH + + +if test "x$CONFIG_SHELL" = x; then + if (eval ":") 2>/dev/null; then + as_have_required=yes +else + as_have_required=no +fi + + if test $as_have_required = yes && (eval ": +(as_func_return () { + (exit \$1) +} +as_func_success () { + as_func_return 0 +} +as_func_failure () { + as_func_return 1 +} +as_func_ret_success () { + return 0 +} +as_func_ret_failure () { + return 1 +} + +exitcode=0 +if as_func_success; then + : +else + exitcode=1 + echo as_func_success failed. +fi + +if as_func_failure; then + exitcode=1 + echo as_func_failure succeeded. +fi + +if as_func_ret_success; then + : +else + exitcode=1 + echo as_func_ret_success failed. +fi + +if as_func_ret_failure; then + exitcode=1 + echo as_func_ret_failure succeeded. +fi + +if ( set x; as_func_ret_success y && test x = \"\$1\" ); then + : +else + exitcode=1 + echo positional parameters were not saved. +fi + +test \$exitcode = 0) || { (exit 1); exit 1; } + +( + as_lineno_1=\$LINENO + as_lineno_2=\$LINENO + test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && + test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } +") 2> /dev/null; then + : +else + as_candidate_shells= + 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=. + case $as_dir in + /*) + for as_base in sh bash ksh sh5; do + as_candidate_shells="$as_candidate_shells $as_dir/$as_base" + done;; + esac +done +IFS=$as_save_IFS + + + for as_shell in $as_candidate_shells $SHELL; do + # Try only shells that exist, to save several forks. + if { test -f "$as_shell" || test -f "$as_shell.exe"; } && + { ("$as_shell") 2> /dev/null <<\_ASEOF +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+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + +fi + + +: +_ASEOF +}; then + CONFIG_SHELL=$as_shell + as_have_required=yes + if { "$as_shell" 2> /dev/null <<\_ASEOF +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+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + +fi + + +: +(as_func_return () { + (exit $1) +} +as_func_success () { + as_func_return 0 +} +as_func_failure () { + as_func_return 1 +} +as_func_ret_success () { + return 0 +} +as_func_ret_failure () { + return 1 +} + +exitcode=0 +if as_func_success; then + : +else + exitcode=1 + echo as_func_success failed. +fi + +if as_func_failure; then + exitcode=1 + echo as_func_failure succeeded. +fi + +if as_func_ret_success; then + : +else + exitcode=1 + echo as_func_ret_success failed. +fi + +if as_func_ret_failure; then + exitcode=1 + echo as_func_ret_failure succeeded. +fi + +if ( set x; as_func_ret_success y && test x = "$1" ); then + : +else + exitcode=1 + echo positional parameters were not saved. +fi + +test $exitcode = 0) || { (exit 1); exit 1; } + +( + as_lineno_1=$LINENO + as_lineno_2=$LINENO + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } + +_ASEOF +}; then + break +fi + +fi + + done + + if test "x$CONFIG_SHELL" != x; then + for as_var in BASH_ENV ENV + do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var + done + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} +fi + + + if test $as_have_required = no; then + echo This script requires a shell more modern than all the + echo shells that I found on your system. Please install a + echo modern shell, or manually run the script under such a + echo shell if you do have one. + { (exit 1); exit 1; } +fi + + +fi + +fi + + + +(eval "as_func_return () { + (exit \$1) +} +as_func_success () { + as_func_return 0 +} +as_func_failure () { + as_func_return 1 +} +as_func_ret_success () { + return 0 +} +as_func_ret_failure () { + return 1 +} + +exitcode=0 +if as_func_success; then + : +else + exitcode=1 + echo as_func_success failed. +fi + +if as_func_failure; then + exitcode=1 + echo as_func_failure succeeded. +fi + +if as_func_ret_success; then + : +else + exitcode=1 + echo as_func_ret_success failed. +fi + +if as_func_ret_failure; then + exitcode=1 + echo as_func_ret_failure succeeded. +fi + +if ( set x; as_func_ret_success y && test x = \"\$1\" ); then + : +else + exitcode=1 + echo positional parameters were not saved. +fi + +test \$exitcode = 0") || { + echo No shell found that supports shell functions. + echo Please tell autoconf at gnu.org about your system, + echo including any error possibly output before this + echo message +} + + + + as_lineno_1=$LINENO + as_lineno_2=$LINENO + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { + + # 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 after each line using $LINENO; the second 'sed' + # does the real work. The second script uses 'N' to pair each + # line-number line with the line containing $LINENO, 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 + # scripts with optimization help from Paolo Bonzini. Blame Lee + # E. McMahon (1931-1989) for sed's syntax. :-) + sed -n ' + p + /[$]LINENO/= + ' <$as_myself | + sed ' + s/[$]LINENO.*/&-/ + t lineno + b + :lineno + N + :loop + s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ + t loop + s/-\n.*// + ' >$as_me.lineno && + chmod +x "$as_me.lineno" || + { 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 sensitive to this). + . "./$as_me.lineno" + # Exit status is that of the last command. + exit +} + + +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi + +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in +-n*) + case `echo 'x\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + *) ECHO_C='\c';; + esac;; +*) + ECHO_N='-n';; +esac + +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +else + as_expr=false +fi + +rm -f conf$$ conf$$.exe conf$$.file +if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file +else + rm -f conf$$.dir + mkdir conf$$.dir +fi +echo >conf$$.file +if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -p' +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$$.dir/conf$$.file conf$$.file +rmdir conf$$.dir 2>/dev/null + +if mkdir -p . 2>/dev/null; then + as_mkdir_p=: +else + test -d ./-p && rmdir ./-p + as_mkdir_p=false +fi + +if test -x / >/dev/null 2>&1; then + as_test_x='test -x' +else + if ls -dL / >/dev/null 2>&1; then + as_ls_L_option=L + else + as_ls_L_option= + fi + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then + test -d "$1/."; + else + case $1 in + -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' +fi +as_executable_p=$as_test_x + +# Sed expression to map a string onto a valid CPP name. +as_tr_cpp="eval 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="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" -# Defaults: -ac_help= + + +exec 7<&0 &1 + +# Name of the host. +# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, +# so uname gets run too. +ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` + +# +# Initializations. +# ac_default_prefix=/usr/local -# Any additions from configure.in: -ac_help="$ac_help - --with-build-libsubdir=[DIR] Directory where to find libraries for build system" -ac_help="$ac_help - --enable-libada Builds libada directory" -ac_help="$ac_help - --enable-libssp Builds libssp directory" -ac_help="$ac_help - --with-mpfr-dir=PATH This option has been REMOVED" -ac_help="$ac_help - --with-mpfr=PATH Specify prefix directory for installed MPFR package - Equivalent to --with-mpfr-include=PATH/include - plus --with-mpfr-lib=PATH/lib" -ac_help="$ac_help - --with-mpfr-include=PATH - Specify directory for installed MPFR include files" -ac_help="$ac_help - --with-mpfr-lib=PATH Specify the directory for the installed MPFR library" -ac_help="$ac_help - --with-gmp-dir=PATH This option has been REMOVED" -ac_help="$ac_help - --with-gmp=PATH Specify prefix directory for the installed GMP package - Equivalent to --with-gmp-include=PATH/include - plus --with-gmp-lib=PATH/lib" -ac_help="$ac_help - --with-gmp-include=PATH Specify directory for installed GMP include files" -ac_help="$ac_help - --with-gmp-lib=PATH Specify the directory for the installed GMP library" -ac_help="$ac_help - --enable-objc-gc enable the use of Boehm's garbage collector with - the GNU Objective-C runtime." -ac_help="$ac_help - --with-build-sysroot=sysroot - use sysroot as the system root during the build" -ac_help="$ac_help - --enable-bootstrap Enable bootstrapping [yes if native build]" -ac_help="$ac_help - --enable-serial-[{host,target,build}-]configure - Force sequential configuration of - sub-packages for the host, target or build - machine, or all sub-packages" -ac_help="$ac_help - --with-build-time-tools=path - use given path to find target tools during the build" -ac_help="$ac_help - --enable-maintainer-mode enable make rules and dependencies not useful - (and sometimes confusing) to the casual installer" -ac_help="$ac_help - --enable-stage1-checking[=all] choose additional checking for stage1 - of the compiler." -ac_help="$ac_help - --enable-werror enable -Werror in bootstrap stage2 and later" -ac_help="$ac_help - --with-datarootdir Use datarootdir as the data root directory." -ac_help="$ac_help - --with-docdir Install documentation in this directory." -ac_help="$ac_help - --with-htmldir Install html in this directory." +ac_clean_files= +ac_config_libobj_dir=. +LIBOBJS= +cross_compiling=no +subdirs= +MFLAGS= +MAKEFLAGS= +SHELL=${CONFIG_SHELL-/bin/sh} + +# Identity of this package. +PACKAGE_NAME= +PACKAGE_TARNAME= +PACKAGE_VERSION= +PACKAGE_STRING= +PACKAGE_BUGREPORT= + +ac_unique_file="move-if-change" +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 +datarootdir +datadir +sysconfdir +sharedstatedir +localstatedir +includedir +oldincludedir +docdir +infodir +htmldir +dvidir +pdfdir +psdir +libdir +localedir +mandir +DEFS +ECHO_C +ECHO_N +ECHO_T +LIBS +build_alias +host_alias +target_alias +build +build_cpu +build_vendor +build_os +host +host_cpu +host_vendor +host_os +target +target_cpu +target_vendor +target_os +INSTALL_PROGRAM +INSTALL_SCRIPT +INSTALL_DATA +LN +LN_S +TOPLEVEL_CONFIGURE_ARGUMENTS +build_libsubdir +build_subdir +host_subdir +target_subdir +CC +CFLAGS +LDFLAGS +CPPFLAGS +ac_ct_CC +EXEEXT +OBJEXT +GNATBIND +do_compare +gmplibs +gmpinc +stage1_languages +SYSROOT_CFLAGS_FOR_TARGET +RPATH_ENVVAR +tooldir +build_tooldir +CONFIGURE_GDB_TK +GDB_TK +INSTALL_GDB_TK +build_configargs +build_configdirs +host_configargs +configdirs +target_configargs +CC_FOR_BUILD +config_shell +YACC +BISON +M4 +LEX +FLEX +MAKEINFO +EXPECT +RUNTEST +AR +AS +DLLTOOL +LD +LIPO +NM +RANLIB +STRIP +WINDRES +OBJCOPY +OBJDUMP +CXX +CFLAGS_FOR_BUILD +CXXFLAGS +CC_FOR_TARGET +CXX_FOR_TARGET +GCC_FOR_TARGET +GCJ_FOR_TARGET +GFORTRAN_FOR_TARGET +AR_FOR_TARGET +AS_FOR_TARGET +DLLTOOL_FOR_TARGET +LD_FOR_TARGET +LIPO_FOR_TARGET +NM_FOR_TARGET +OBJDUMP_FOR_TARGET +RANLIB_FOR_TARGET +STRIP_FOR_TARGET +WINDRES_FOR_TARGET +FLAGS_FOR_TARGET +RAW_CXX_FOR_TARGET +COMPILER_AS_FOR_TARGET +COMPILER_LD_FOR_TARGET +COMPILER_NM_FOR_TARGET +MAINTAINER_MODE_TRUE +MAINTAINER_MODE_FALSE +MAINT +stage1_cflags +stage1_checking +stage2_werror_flag +LIBOBJS +LTLIBOBJS' +ac_subst_files='serialization_dependencies +host_makefile_frag +target_makefile_frag +alphaieee_frag +ospace_frag' + ac_precious_vars='build_alias +host_alias +target_alias +CC +CFLAGS +LDFLAGS +LIBS +CPPFLAGS' + # Initialize some variables set by options. +ac_init_help= +ac_init_version=false # The variables have the same names as the options, with # dashes changed to underlines. -build=NONE -cache_file=./config.cache +cache_file=/dev/null exec_prefix=NONE -host=NONE no_create= -nonopt=NONE no_recursion= prefix=NONE program_prefix=NONE @@ -86,94 +743,117 @@ silent= site= srcdir= -target=NONE verbose= x_includes=NONE x_libraries=NONE + +# Installation directory options. +# These are left unexpanded so users can "make install exec_prefix=/foo" +# and all the variables that are supposed to be based on exec_prefix +# by default will actually change. +# Use braces instead of parens because sh, perl, etc. also accept them. +# (The list follows the same order as the GNU Coding Standards.) bindir='${exec_prefix}/bin' sbindir='${exec_prefix}/sbin' libexecdir='${exec_prefix}/libexec' -datadir='${prefix}/share' +datarootdir='${prefix}/share' +datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' -libdir='${exec_prefix}/lib' includedir='${prefix}/include' oldincludedir='/usr/include' -infodir='${prefix}/info' -mandir='${prefix}/man' - -# Initialize some other variables. -subdirs= -MFLAGS= MAKEFLAGS= -SHELL=${CONFIG_SHELL-/bin/sh} -# Maximum number of lines to put in a shell here document. -ac_max_here_lines=12 +docdir='${datarootdir}/doc/${PACKAGE}' +infodir='${datarootdir}/info' +htmldir='${docdir}' +dvidir='${docdir}' +pdfdir='${docdir}' +psdir='${docdir}' +libdir='${exec_prefix}/lib' +localedir='${datarootdir}/locale' +mandir='${datarootdir}/man' ac_prev= +ac_dashdash= for ac_option do - # If the previous option needs an argument, assign it. if test -n "$ac_prev"; then - eval "$ac_prev=\$ac_option" + eval $ac_prev=\$ac_option ac_prev= continue fi - case "$ac_option" in - -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;; - *) ac_optarg= ;; + case $ac_option in + *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; + *) ac_optarg=yes ;; esac # Accept the important Cygnus configure options, so we can diagnose typos. - case "$ac_option" in + case $ac_dashdash$ac_option in + --) + ac_dashdash=yes ;; -bindir | --bindir | --bindi | --bind | --bin | --bi) ac_prev=bindir ;; -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) - bindir="$ac_optarg" ;; + bindir=$ac_optarg ;; -build | --build | --buil | --bui | --bu) - ac_prev=build ;; + ac_prev=build_alias ;; -build=* | --build=* | --buil=* | --bui=* | --bu=*) - build="$ac_optarg" ;; + build_alias=$ac_optarg ;; -cache-file | --cache-file | --cache-fil | --cache-fi \ | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) ac_prev=cache_file ;; -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) - cache_file="$ac_optarg" ;; + cache_file=$ac_optarg ;; + + --config-cache | -C) + cache_file=config.cache ;; - -datadir | --datadir | --datadi | --datad | --data | --dat | --da) + -datadir | --datadir | --datadi | --datad) ac_prev=datadir ;; - -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ - | --da=*) - datadir="$ac_optarg" ;; + -datadir=* | --datadir=* | --datadi=* | --datad=*) + datadir=$ac_optarg ;; + + -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ + | --dataroo | --dataro | --datar) + ac_prev=datarootdir ;; + -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ + | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) + datarootdir=$ac_optarg ;; -disable-* | --disable-*) - ac_feature=`echo $ac_option|sed -e 's/-*disable-//'` + ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. - if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then - { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } - fi - ac_feature=`echo $ac_feature| sed 's/-/_/g'` - eval "enable_${ac_feature}=no" ;; + expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid feature name: $ac_feature" >&2 + { (exit 1); exit 1; }; } + ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` + eval enable_$ac_feature=no ;; + + -docdir | --docdir | --docdi | --doc | --do) + ac_prev=docdir ;; + -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) + docdir=$ac_optarg ;; + + -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) + ac_prev=dvidir ;; + -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) + dvidir=$ac_optarg ;; -enable-* | --enable-*) - ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'` + ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. - if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then - { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } - fi - ac_feature=`echo $ac_feature| sed 's/-/_/g'` - case "$ac_option" in - *=*) ;; - *) ac_optarg=yes ;; - esac - eval "enable_${ac_feature}='$ac_optarg'" ;; + expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid feature name: $ac_feature" >&2 + { (exit 1); exit 1; }; } + ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` + eval enable_$ac_feature=\$ac_optarg ;; -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ @@ -182,116 +862,77 @@ -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ | --exec=* | --exe=* | --ex=*) - exec_prefix="$ac_optarg" ;; + exec_prefix=$ac_optarg ;; -gas | --gas | --ga | --g) # Obsolete; use --with-gas. with_gas=yes ;; - -help | --help | --hel | --he) - # Omit some internal or obsolete options to make the list less imposing. - # This message is too long to be a string in the A/UX 3.1 sh. - cat << EOF -Usage: configure [options] [host] -Options: [defaults in brackets after descriptions] -Configuration: - --cache-file=FILE cache test results in FILE - --help print this message - --no-create do not create output files - --quiet, --silent do not print \`checking...' messages - --version print the version of autoconf that created configure -Directory and file names: - --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] - --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [same as prefix] - --bindir=DIR user executables in DIR [EPREFIX/bin] - --sbindir=DIR system admin executables in DIR [EPREFIX/sbin] - --libexecdir=DIR program executables in DIR [EPREFIX/libexec] - --datadir=DIR read-only architecture-independent data in DIR - [PREFIX/share] - --sysconfdir=DIR read-only single-machine data in DIR [PREFIX/etc] - --sharedstatedir=DIR modifiable architecture-independent data in DIR - [PREFIX/com] - --localstatedir=DIR modifiable single-machine data in DIR [PREFIX/var] - --libdir=DIR object code libraries in DIR [EPREFIX/lib] - --includedir=DIR C header files in DIR [PREFIX/include] - --oldincludedir=DIR C header files for non-gcc in DIR [/usr/include] - --infodir=DIR info documentation in DIR [PREFIX/info] - --mandir=DIR man documentation in DIR [PREFIX/man] - --srcdir=DIR find the sources in DIR [configure dir or ..] - --program-prefix=PREFIX prepend PREFIX to installed program names - --program-suffix=SUFFIX append SUFFIX to installed program names - --program-transform-name=PROGRAM - run sed PROGRAM on installed program names -EOF - cat << EOF -Host type: - --build=BUILD configure for building on BUILD [BUILD=HOST] - --host=HOST configure for HOST [guessed] - --target=TARGET configure for TARGET [TARGET=HOST] -Features and packages: - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) - --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] - --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --x-includes=DIR X include files are in DIR - --x-libraries=DIR X library files are in DIR -EOF - if test -n "$ac_help"; then - echo "--enable and --with options recognized:$ac_help" - fi - exit 0 ;; + -help | --help | --hel | --he | -h) + ac_init_help=long ;; + -help=r* | --help=r* | --hel=r* | --he=r* | -hr*) + ac_init_help=recursive ;; + -help=s* | --help=s* | --hel=s* | --he=s* | -hs*) + ac_init_help=short ;; -host | --host | --hos | --ho) - ac_prev=host ;; + ac_prev=host_alias ;; -host=* | --host=* | --hos=* | --ho=*) - host="$ac_optarg" ;; + host_alias=$ac_optarg ;; + + -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) + ac_prev=htmldir ;; + -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ + | --ht=*) + htmldir=$ac_optarg ;; -includedir | --includedir | --includedi | --included | --include \ | --includ | --inclu | --incl | --inc) ac_prev=includedir ;; -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ | --includ=* | --inclu=* | --incl=* | --inc=*) - includedir="$ac_optarg" ;; + includedir=$ac_optarg ;; -infodir | --infodir | --infodi | --infod | --info | --inf) ac_prev=infodir ;; -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) - infodir="$ac_optarg" ;; + infodir=$ac_optarg ;; -libdir | --libdir | --libdi | --libd) ac_prev=libdir ;; -libdir=* | --libdir=* | --libdi=* | --libd=*) - libdir="$ac_optarg" ;; + libdir=$ac_optarg ;; -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ | --libexe | --libex | --libe) ac_prev=libexecdir ;; -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ | --libexe=* | --libex=* | --libe=*) - libexecdir="$ac_optarg" ;; + libexecdir=$ac_optarg ;; + + -localedir | --localedir | --localedi | --localed | --locale) + ac_prev=localedir ;; + -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) + localedir=$ac_optarg ;; -localstatedir | --localstatedir | --localstatedi | --localstated \ - | --localstate | --localstat | --localsta | --localst \ - | --locals | --local | --loca | --loc | --lo) + | --localstate | --localstat | --localsta | --localst | --locals) ac_prev=localstatedir ;; -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ - | --localstate=* | --localstat=* | --localsta=* | --localst=* \ - | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) - localstatedir="$ac_optarg" ;; + | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) + localstatedir=$ac_optarg ;; -mandir | --mandir | --mandi | --mand | --man | --ma | --m) ac_prev=mandir ;; -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) - mandir="$ac_optarg" ;; + mandir=$ac_optarg ;; -nfp | --nfp | --nf) # Obsolete; use --without-fp. with_fp=no ;; -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c) + | --no-cr | --no-c | -n) no_create=yes ;; -no-recursion | --no-recursion | --no-recursio | --no-recursi \ @@ -305,26 +946,26 @@ -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) - oldincludedir="$ac_optarg" ;; + oldincludedir=$ac_optarg ;; -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) ac_prev=prefix ;; -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) - prefix="$ac_optarg" ;; + prefix=$ac_optarg ;; -program-prefix | --program-prefix | --program-prefi | --program-pref \ | --program-pre | --program-pr | --program-p) ac_prev=program_prefix ;; -program-prefix=* | --program-prefix=* | --program-prefi=* \ | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) - program_prefix="$ac_optarg" ;; + program_prefix=$ac_optarg ;; -program-suffix | --program-suffix | --program-suffi | --program-suff \ | --program-suf | --program-su | --program-s) ac_prev=program_suffix ;; -program-suffix=* | --program-suffix=* | --program-suffi=* \ | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) - program_suffix="$ac_optarg" ;; + program_suffix=$ac_optarg ;; -program-transform-name | --program-transform-name \ | --program-transform-nam | --program-transform-na \ @@ -341,7 +982,17 @@ | --program-transfo=* | --program-transf=* \ | --program-trans=* | --program-tran=* \ | --progr-tra=* | --program-tr=* | --program-t=*) - program_transform_name="$ac_optarg" ;; + program_transform_name=$ac_optarg ;; + + -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) + ac_prev=pdfdir ;; + -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) + pdfdir=$ac_optarg ;; + + -psdir | --psdir | --psdi | --psd | --ps) + ac_prev=psdir ;; + -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) + psdir=$ac_optarg ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil) @@ -351,7 +1002,7 @@ ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ | --sbi=* | --sb=*) - sbindir="$ac_optarg" ;; + sbindir=$ac_optarg ;; -sharedstatedir | --sharedstatedir | --sharedstatedi \ | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ @@ -362,58 +1013,53 @@ | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ | --sha=* | --sh=*) - sharedstatedir="$ac_optarg" ;; + sharedstatedir=$ac_optarg ;; -site | --site | --sit) ac_prev=site ;; -site=* | --site=* | --sit=*) - site="$ac_optarg" ;; + site=$ac_optarg ;; -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) ac_prev=srcdir ;; -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) - srcdir="$ac_optarg" ;; + srcdir=$ac_optarg ;; -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ | --syscon | --sysco | --sysc | --sys | --sy) ac_prev=sysconfdir ;; -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) - sysconfdir="$ac_optarg" ;; + sysconfdir=$ac_optarg ;; -target | --target | --targe | --targ | --tar | --ta | --t) - ac_prev=target ;; + ac_prev=target_alias ;; -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) - target="$ac_optarg" ;; + target_alias=$ac_optarg ;; -v | -verbose | --verbose | --verbos | --verbo | --verb) verbose=yes ;; - -version | --version | --versio | --versi | --vers) - echo "configure generated by autoconf version 2.13" - exit 0 ;; + -version | --version | --versio | --versi | --vers | -V) + ac_init_version=: ;; -with-* | --with-*) - ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'` + ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. - if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then - { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } - fi - ac_package=`echo $ac_package| sed 's/-/_/g'` - case "$ac_option" in - *=*) ;; - *) ac_optarg=yes ;; - esac - eval "with_${ac_package}='$ac_optarg'" ;; + expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid package name: $ac_package" >&2 + { (exit 1); exit 1; }; } + ac_package=`echo $ac_package | sed 's/[-.]/_/g'` + eval with_$ac_package=\$ac_optarg ;; -without-* | --without-*) - ac_package=`echo $ac_option|sed -e 's/-*without-//'` + ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. - if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then - { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } - fi - ac_package=`echo $ac_package| sed 's/-/_/g'` - eval "with_${ac_package}=no" ;; + expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid package name: $ac_package" >&2 + { (exit 1); exit 1; }; } + ac_package=`echo $ac_package | sed 's/[-.]/_/g'` + eval with_$ac_package=no ;; --x) # Obsolete; use --with-x. @@ -424,287 +1070,880 @@ ac_prev=x_includes ;; -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) - x_includes="$ac_optarg" ;; + x_includes=$ac_optarg ;; -x-libraries | --x-libraries | --x-librarie | --x-librari \ | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) ac_prev=x_libraries ;; -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) - x_libraries="$ac_optarg" ;; + x_libraries=$ac_optarg ;; - -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; } + -*) { echo "$as_me: error: unrecognized option: $ac_option +Try \`$0 --help' for more information." >&2 + { (exit 1); exit 1; }; } ;; + *=*) + ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` + # Reject names that are not valid shell variable names. + expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 + { (exit 1); exit 1; }; } + eval $ac_envvar=\$ac_optarg + export $ac_envvar ;; + *) - if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then - echo "configure: warning: $ac_option: invalid host type" 1>&2 - fi - if test "x$nonopt" != xNONE; then - { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } - fi - nonopt="$ac_option" + # FIXME: should be removed in autoconf 3.0. + echo "$as_me: WARNING: you should use --build, --host, --target" >&2 + expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && + echo "$as_me: WARNING: invalid host type: $ac_option" >&2 + : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} ;; esac done if test -n "$ac_prev"; then - { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; } + ac_option=--`echo $ac_prev | sed 's/_/-/g'` + { echo "$as_me: error: missing argument to $ac_option" >&2 + { (exit 1); exit 1; }; } fi -trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 - -# File descriptor usage: -# 0 standard input -# 1 file creation -# 2 errors and warnings -# 3 some systems may open it to /dev/tty -# 4 used on the Kubota Titan -# 6 checking for... messages and results -# 5 compiler messages saved in config.log -if test "$silent" = yes; then - exec 6>/dev/null -else - exec 6>&1 -fi -exec 5>./config.log - -echo "\ -This file contains any messages produced by compilers while -running configure, to aid debugging if configure makes a mistake. -" 1>&5 - -# Strip out --no-create and --no-recursion so they do not pile up. -# Also quote any args containing shell metacharacters. -ac_configure_args= -for ac_arg +# Be sure to have absolute directory names. +for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ + datadir sysconfdir sharedstatedir localstatedir includedir \ + oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ + libdir localedir mandir do - case "$ac_arg" in - -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c) ;; - -no-recursion | --no-recursion | --no-recursio | --no-recursi \ - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;; - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*) - ac_configure_args="$ac_configure_args '$ac_arg'" ;; - *) ac_configure_args="$ac_configure_args $ac_arg" ;; + eval ac_val=\$$ac_var + case $ac_val in + [\\/$]* | ?:[\\/]* ) continue;; + NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac + { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 + { (exit 1); exit 1; }; } done -# NLS nuisances. -# Only set these to C if already set. These must not be set unconditionally -# because not all systems understand e.g. LANG=C (notably SCO). -# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! -# Non-C LC_CTYPE values break the ctype check. -if test "${LANG+set}" = set; then LANG=C; export LANG; fi -if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi -if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi -if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi +# There might be people who depend on the old broken behavior: `$host' +# used to hold the argument of --host etc. +# FIXME: To remove some day. +build=$build_alias +host=$host_alias +target=$target_alias + +# FIXME: To remove some day. +if test "x$host_alias" != x; then + if test "x$build_alias" = x; then + cross_compiling=maybe + echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. + If a cross compiler is detected then cross compile mode will be used." >&2 + elif test "x$build_alias" != "x$host_alias"; then + cross_compiling=yes + fi +fi + +ac_tool_prefix= +test -n "$host_alias" && ac_tool_prefix=$host_alias- + +test "$silent" = yes && exec 6>/dev/null + + +ac_pwd=`pwd` && test -n "$ac_pwd" && +ac_ls_di=`ls -di .` && +ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || + { echo "$as_me: error: Working directory cannot be determined" >&2 + { (exit 1); exit 1; }; } +test "X$ac_ls_di" = "X$ac_pwd_ls_di" || + { echo "$as_me: error: pwd does not report name of working directory" >&2 + { (exit 1); exit 1; }; } -# confdefs.h avoids OS command line length limits that DEFS can exceed. -rm -rf conftest* confdefs.h -# AIX cpp loses on an empty file, so make sure it contains at least a newline. -echo > confdefs.h - -# A filename unique to this package, relative to the directory that -# configure is in, which we can look for to find out if srcdir is correct. -ac_unique_file=move-if-change # Find the source files, if location was not specified. if test -z "$srcdir"; then ac_srcdir_defaulted=yes - # Try the directory containing this script, then its parent. - ac_prog=$0 - ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'` - test "x$ac_confdir" = "x$ac_prog" && ac_confdir=. + # Try the directory containing this script, then the parent directory. + ac_confdir=`$as_dirname -- "$0" || +$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$0" : 'X\(//\)[^/]' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +echo X"$0" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` srcdir=$ac_confdir - if test ! -r $srcdir/$ac_unique_file; then + if test ! -r "$srcdir/$ac_unique_file"; then srcdir=.. fi else ac_srcdir_defaulted=no fi -if test ! -r $srcdir/$ac_unique_file; then - if test "$ac_srcdir_defaulted" = yes; then - { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; } - else - { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; } - fi +if test ! -r "$srcdir/$ac_unique_file"; then + test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." + { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 + { (exit 1); exit 1; }; } +fi +ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" +ac_abs_confdir=`( + cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2 + { (exit 1); exit 1; }; } + pwd)` +# When building in place, set srcdir=. +if test "$ac_abs_confdir" = "$ac_pwd"; then + srcdir=. +fi +# Remove unnecessary trailing slashes from srcdir. +# Double slashes in file names in object file debugging info +# mess up M-x gdb in Emacs. +case $srcdir in +*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; +esac +for ac_var in $ac_precious_vars; do + eval ac_env_${ac_var}_set=\${${ac_var}+set} + eval ac_env_${ac_var}_value=\$${ac_var} + eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} + eval ac_cv_env_${ac_var}_value=\$${ac_var} +done + +# +# Report the --help message. +# +if test "$ac_init_help" = "long"; then + # Omit some internal or obsolete options to make the list less imposing. + # This message is too long to be a string in the A/UX 3.1 sh. + cat <<_ACEOF +\`configure' configures this package to adapt to many kinds of systems. + +Usage: $0 [OPTION]... [VAR=VALUE]... + +To assign environment variables (e.g., CC, CFLAGS...), specify them as +VAR=VALUE. See below for descriptions of some of the useful variables. + +Defaults for the options are specified in brackets. + +Configuration: + -h, --help display this help and exit + --help=short display options specific to this package + --help=recursive display the short help of all the included packages + -V, --version display version information and exit + -q, --quiet, --silent do not print \`checking...' messages + --cache-file=FILE cache test results in FILE [disabled] + -C, --config-cache alias for \`--cache-file=config.cache' + -n, --no-create do not create output files + --srcdir=DIR find the sources in DIR [configure dir or \`..'] + +Installation directories: + --prefix=PREFIX install architecture-independent files in PREFIX + [$ac_default_prefix] + --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX + [PREFIX] + +By default, \`make install' will install all the files in +\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify +an installation prefix other than \`$ac_default_prefix' using \`--prefix', +for instance \`--prefix=\$HOME'. + +For better control, use the options below. + +Fine tuning of the installation directories: + --bindir=DIR user executables [EPREFIX/bin] + --sbindir=DIR system admin executables [EPREFIX/sbin] + --libexecdir=DIR program executables [EPREFIX/libexec] + --sysconfdir=DIR read-only single-machine data [PREFIX/etc] + --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] + --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --libdir=DIR object code libraries [EPREFIX/lib] + --includedir=DIR C header files [PREFIX/include] + --oldincludedir=DIR C header files for non-gcc [/usr/include] + --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] + --datadir=DIR read-only architecture-independent data [DATAROOTDIR] + --infodir=DIR info documentation [DATAROOTDIR/info] + --localedir=DIR locale-dependent data [DATAROOTDIR/locale] + --mandir=DIR man documentation [DATAROOTDIR/man] + --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE] + --htmldir=DIR html documentation [DOCDIR] + --dvidir=DIR dvi documentation [DOCDIR] + --pdfdir=DIR pdf documentation [DOCDIR] + --psdir=DIR ps documentation [DOCDIR] +_ACEOF + + cat <<\_ACEOF + +Program names: + --program-prefix=PREFIX prepend PREFIX to installed program names + --program-suffix=SUFFIX append SUFFIX to installed program names + --program-transform-name=PROGRAM run sed PROGRAM on installed program names + +System types: + --build=BUILD configure for building on BUILD [guessed] + --host=HOST cross-compile to build programs to run on HOST [BUILD] + --target=TARGET configure for building compilers for TARGET [HOST] +_ACEOF +fi + +if test -n "$ac_init_help"; then + + cat <<\_ACEOF + +Optional Features: + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --enable-libada Builds libada directory + --enable-libssp Builds libssp directory + --enable-objc-gc enable the use of Boehm's garbage collector with + the GNU Objective-C runtime. + --enable-bootstrap Enable bootstrapping yes if native build + --enable-serial-{host,target,build}-configure + Force sequential configuration of + sub-packages for the host, target or build + machine, or all sub-packages + --enable-maintainer-mode enable make rules and dependencies not useful + (and sometimes confusing) to the casual installer + --enable-stage1-checking=all choose additional checking for stage1 + of the compiler. + --enable-werror enable -Werror in bootstrap stage2 and later + +Optional Packages: + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] + --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --with-build-libsubdir=DIR Directory where to find libraries for build system + --with-mpfr-dir=PATH This option has been REMOVED + --with-mpfr=PATH Specify prefix directory for installed MPFR package + Equivalent to --with-mpfr-include=PATH/include + plus --with-mpfr-lib=PATH/lib + --with-mpfr-include=PATH + Specify directory for installed MPFR include files + --with-mpfr-lib=PATH Specify the directory for the installed MPFR library + --with-gmp-dir=PATH This option has been REMOVED + --with-gmp=PATH Specify prefix directory for the installed GMP package + Equivalent to --with-gmp-include=PATH/include + plus --with-gmp-lib=PATH/lib + --with-gmp-include=PATH Specify directory for installed GMP include files + --with-gmp-lib=PATH Specify the directory for the installed GMP library + --with-build-sysroot=sysroot + use sysroot as the system root during the build + --with-build-time-tools=path + use given path to find target tools during the build + --with-datarootdir Use datarootdir as the data root directory. + --with-docdir Install documentation in this directory. + --with-htmldir Install html in this directory. + +Some influential environment variables: + CC C compiler command + CFLAGS C compiler flags + LDFLAGS linker flags, e.g. -L if you have libraries in a + nonstandard directory + LIBS libraries to pass to the linker, e.g. -l + CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if + you have headers in a nonstandard directory + +Use these variables to override the choices made by `configure' or to help +it to find libraries and programs with nonstandard names/locations. + +_ACEOF +ac_status=$? +fi + +if test "$ac_init_help" = "recursive"; then + # If there are subdirs, report their specific --help. + for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue + test -d "$ac_dir" || continue + ac_builddir=. + +case "$ac_dir" in +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +*) + ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` + # A ".." for each directory in $ac_dir_suffix. + ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; + esac ;; +esac +ac_abs_top_builddir=$ac_pwd +ac_abs_builddir=$ac_pwd$ac_dir_suffix +# for backward compatibility: +ac_top_builddir=$ac_top_build_prefix + +case $srcdir in + .) # We are building in place. + ac_srcdir=. + ac_top_srcdir=$ac_top_builddir_sub + ac_abs_top_srcdir=$ac_pwd ;; + [\\/]* | ?:[\\/]* ) # Absolute name. + ac_srcdir=$srcdir$ac_dir_suffix; + ac_top_srcdir=$srcdir + ac_abs_top_srcdir=$srcdir ;; + *) # Relative name. + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_build_prefix$srcdir + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; +esac +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix + + cd "$ac_dir" || { ac_status=$?; continue; } + # Check for guested configure. + if test -f "$ac_srcdir/configure.gnu"; then + echo && + $SHELL "$ac_srcdir/configure.gnu" --help=recursive + elif test -f "$ac_srcdir/configure"; then + echo && + $SHELL "$ac_srcdir/configure" --help=recursive + else + echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + fi || ac_status=$? + cd "$ac_pwd" || { ac_status=$?; break; } + done fi -srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` +test -n "$ac_init_help" && exit $ac_status +if $ac_init_version; then + cat <<\_ACEOF +configure +generated by GNU Autoconf 2.61 + +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +This configure script is free software; the Free Software Foundation +gives unlimited permission to copy, distribute and modify it. +_ACEOF + exit +fi +cat >config.log <<_ACEOF +This file contains any messages produced by compilers while +running configure, to aid debugging if configure makes a mistake. + +It was created by $as_me, which was +generated by GNU Autoconf 2.61. Invocation command line was + + $ $0 $@ + +_ACEOF +exec 5>>config.log +{ +cat <<_ASUNAME +## --------- ## +## Platform. ## +## --------- ## + +hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` +uname -m = `(uname -m) 2>/dev/null || echo unknown` +uname -r = `(uname -r) 2>/dev/null || echo unknown` +uname -s = `(uname -s) 2>/dev/null || echo unknown` +uname -v = `(uname -v) 2>/dev/null || echo unknown` + +/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` +/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` + +/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` +/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` +/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` +/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` +/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` +/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` +/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` + +_ASUNAME + +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + echo "PATH: $as_dir" +done +IFS=$as_save_IFS + +} >&5 + +cat >&5 <<_ACEOF + + +## ----------- ## +## Core tests. ## +## ----------- ## + +_ACEOF + + +# 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_must_keep_next=false +for ac_pass in 1 2 +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_arg'" + ;; + 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 +# would cause problems or look ugly. +# WARNING: Use '\'' to represent an apostrophe within the trap. +# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. +trap 'exit_status=$? + # Save into config.log some information that might help in debugging. + { + echo + + cat <<\_ASBOX +## ---------------- ## +## Cache variables. ## +## ---------------- ## +_ASBOX + echo + # The following way of writing the cache mishandles newlines in values, +( + for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do + eval ac_val=\$$ac_var + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( + *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 +echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + *) $as_unset $ac_var ;; + esac ;; + esac + done + (set) 2>&1 | + case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( + *${as_nl}ac_space=\ *) + sed -n \ + "s/'\''/'\''\\\\'\'''\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" + ;; #( + *) + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" + ;; + esac | + sort +) + echo + + cat <<\_ASBOX +## ----------------- ## +## Output variables. ## +## ----------------- ## +_ASBOX + echo + for ac_var in $ac_subst_vars + do + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + echo "$ac_var='\''$ac_val'\''" + done | sort + echo + + if test -n "$ac_subst_files"; then + cat <<\_ASBOX +## ------------------- ## +## File substitutions. ## +## ------------------- ## +_ASBOX + echo + for ac_var in $ac_subst_files + do + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + echo "$ac_var='\''$ac_val'\''" + done | sort + echo + fi + + if test -s confdefs.h; then + cat <<\_ASBOX +## ----------- ## +## confdefs.h. ## +## ----------- ## +_ASBOX + echo + cat confdefs.h + echo + fi + test "$ac_signal" != 0 && + echo "$as_me: caught signal $ac_signal" + echo "$as_me: exit $exit_status" + } >&5 + rm -f core *.core core.conftest.* && + rm -f -r conftest* confdefs* conf$$* $ac_clean_files && + exit $exit_status +' 0 +for ac_signal in 1 2 13 15; do + trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal +done +ac_signal=0 + +# confdefs.h avoids OS command line length limits that DEFS can exceed. +rm -f -r conftest* confdefs.h + +# Predefined preprocessor variables. + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_NAME "$PACKAGE_NAME" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_TARNAME "$PACKAGE_TARNAME" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION "$PACKAGE_VERSION" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_STRING "$PACKAGE_STRING" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" +_ACEOF + + +# Let the site file select an alternate cache file if it wants to. # Prefer explicitly selected file to automatically selected ones. -if test -z "$CONFIG_SITE"; then - if test "x$prefix" != xNONE; then - CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" - else - CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" - fi +if test -n "$CONFIG_SITE"; then + set x "$CONFIG_SITE" +elif test "x$prefix" != xNONE; then + set x "$prefix/share/config.site" "$prefix/etc/config.site" +else + set x "$ac_default_prefix/share/config.site" \ + "$ac_default_prefix/etc/config.site" fi -for ac_site_file in $CONFIG_SITE; do +shift +for ac_site_file +do if test -r "$ac_site_file"; then - echo "loading site script $ac_site_file" + { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 +echo "$as_me: loading site script $ac_site_file" >&6;} + sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" fi done if test -r "$cache_file"; then - echo "loading cache $cache_file" - . $cache_file + # Some versions of bash will fail to source /dev/null (special + # files actually), so we avoid doing that. + if test -f "$cache_file"; then + { echo "$as_me:$LINENO: loading cache $cache_file" >&5 +echo "$as_me: loading cache $cache_file" >&6;} + case $cache_file in + [\\/]* | ?:[\\/]* ) . "$cache_file";; + *) . "./$cache_file";; + esac + fi else - echo "creating cache $cache_file" - > $cache_file + { echo "$as_me:$LINENO: creating cache $cache_file" >&5 +echo "$as_me: creating cache $cache_file" >&6;} + >$cache_file +fi + +# Check that the precious variables saved in the cache have kept the same +# value. +ac_cache_corrupted=false +for ac_var in $ac_precious_vars; do + eval ac_old_set=\$ac_cv_env_${ac_var}_set + eval ac_new_set=\$ac_env_${ac_var}_set + eval ac_old_val=\$ac_cv_env_${ac_var}_value + eval ac_new_val=\$ac_env_${ac_var}_value + case $ac_old_set,$ac_new_set in + set,) + { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,set) + { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 +echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,);; + *) + if test "x$ac_old_val" != "x$ac_new_val"; then + { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 +echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 +echo "$as_me: former value: $ac_old_val" >&2;} + { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 +echo "$as_me: current value: $ac_new_val" >&2;} + ac_cache_corrupted=: + fi;; + esac + # Pass precious variables to config.status. + if test "$ac_new_set" = set; then + case $ac_new_val in + *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *) ac_arg=$ac_var=$ac_new_val ;; + esac + case " $ac_configure_args " in + *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. + *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; + esac + fi +done +if $ac_cache_corrupted; then + { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 +echo "$as_me: error: changes in the environment can compromise the build" >&2;} + { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 +echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} + { (exit 1); exit 1; }; } fi + + + + + + + + + + + + + + + + ac_ext=c -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cc_cross - -ac_exeext= -ac_objext=o -if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then - # Stardent Vistra SVR4 grep lacks -e, says ghazi at caip.rutgers.edu. - if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then - ac_n= ac_c=' -' ac_t=' ' - else - ac_n=-n ac_c= ac_t= - fi -else - ac_n= ac_c='\c' ac_t= -fi +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_aux_dir= -for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do - if test -f $ac_dir/install-sh; then +for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do + if test -f "$ac_dir/install-sh"; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/install-sh -c" break - elif test -f $ac_dir/install.sh; then + elif test -f "$ac_dir/install.sh"; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/install.sh -c" break + elif test -f "$ac_dir/shtool"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/shtool install -c" + break fi done if test -z "$ac_aux_dir"; then - { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; } + { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 +echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} + { (exit 1); exit 1; }; } fi -ac_config_guess=$ac_aux_dir/config.guess -ac_config_sub=$ac_aux_dir/config.sub -ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. - -# Do some error checking and defaulting for the host and target type. -# The inputs are: -# configure --host=HOST --target=TARGET --build=BUILD NONOPT -# -# The rules are: -# 1. You are not allowed to specify --host, --target, and nonopt at the -# same time. -# 2. Host defaults to nonopt. -# 3. If nonopt is not specified, then host defaults to the current host, -# as determined by config.guess. -# 4. Target and build default to nonopt. -# 5. If nonopt is not specified, then target and build default to host. - -# The aliases save the names the user supplied, while $host etc. -# will get canonicalized. -case $host---$target---$nonopt in -NONE---*---* | *---NONE---* | *---*---NONE) ;; -*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;; -esac +# These three variables are undocumented and unsupported, +# and are intended to be withdrawn in a future Autoconf release. +# They can cause serious problems if a builder's source tree is in a directory +# whose full name contains unusual characters. +ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. +ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. +ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. # Make sure we can run config.sub. -if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then : -else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } +$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || + { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 +echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} + { (exit 1); exit 1; }; } + +{ echo "$as_me:$LINENO: checking build system type" >&5 +echo $ECHO_N "checking build system type... $ECHO_C" >&6; } +if test "${ac_cv_build+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_build_alias=$build_alias +test "x$ac_build_alias" = x && + ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` +test "x$ac_build_alias" = x && + { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 +echo "$as_me: error: cannot guess build type; you must specify one" >&2;} + { (exit 1); exit 1; }; } +ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || + { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 +echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} + { (exit 1); exit 1; }; } + +fi +{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5 +echo "${ECHO_T}$ac_cv_build" >&6; } +case $ac_cv_build in +*-*-*) ;; +*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 +echo "$as_me: error: invalid value of canonical build" >&2;} + { (exit 1); exit 1; }; };; +esac +build=$ac_cv_build +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_build +shift +build_cpu=$1 +build_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +build_os=$* +IFS=$ac_save_IFS +case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac + + +{ echo "$as_me:$LINENO: checking host system type" >&5 +echo $ECHO_N "checking host system type... $ECHO_C" >&6; } +if test "${ac_cv_host+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "x$host_alias" = x; then + ac_cv_host=$ac_cv_build +else + ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || + { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 +echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} + { (exit 1); exit 1; }; } fi -echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:630: checking host system type" >&5 - -host_alias=$host -case "$host_alias" in -NONE) - case $nonopt in - NONE) - if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then : - else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; } - fi ;; - *) host_alias=$nonopt ;; - esac ;; -esac - -host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias` -host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -echo "$ac_t""$host" 1>&6 - -echo $ac_n "checking target system type""... $ac_c" 1>&6 -echo "configure:651: checking target system type" >&5 - -target_alias=$target -case "$target_alias" in -NONE) - case $nonopt in - NONE) target_alias=$host_alias ;; - *) target_alias=$nonopt ;; - esac ;; -esac +fi +{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5 +echo "${ECHO_T}$ac_cv_host" >&6; } +case $ac_cv_host in +*-*-*) ;; +*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 +echo "$as_me: error: invalid value of canonical host" >&2;} + { (exit 1); exit 1; }; };; +esac +host=$ac_cv_host +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_host +shift +host_cpu=$1 +host_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +host_os=$* +IFS=$ac_save_IFS +case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac + + +{ echo "$as_me:$LINENO: checking target system type" >&5 +echo $ECHO_N "checking target system type... $ECHO_C" >&6; } +if test "${ac_cv_target+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "x$target_alias" = x; then + ac_cv_target=$ac_cv_host +else + ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` || + { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5 +echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;} + { (exit 1); exit 1; }; } +fi -target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias` -target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -echo "$ac_t""$target" 1>&6 - -echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:669: checking build system type" >&5 - -build_alias=$build -case "$build_alias" in -NONE) - case $nonopt in - NONE) build_alias=$host_alias ;; - *) build_alias=$nonopt ;; - esac ;; -esac +fi +{ echo "$as_me:$LINENO: result: $ac_cv_target" >&5 +echo "${ECHO_T}$ac_cv_target" >&6; } +case $ac_cv_target in +*-*-*) ;; +*) { { echo "$as_me:$LINENO: error: invalid value of canonical target" >&5 +echo "$as_me: error: invalid value of canonical target" >&2;} + { (exit 1); exit 1; }; };; +esac +target=$ac_cv_target +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_target +shift +target_cpu=$1 +target_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +target_os=$* +IFS=$ac_save_IFS +case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac -build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias` -build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -echo "$ac_t""$build" 1>&6 -test "$host_alias" != "$target_alias" && +# The aliases save the names the user supplied, while $host etc. +# will get canonicalized. +test -n "$target_alias" && test "$program_prefix$program_suffix$program_transform_name" = \ NONENONEs,x,x, && program_prefix=${target_alias}- - -if test "$program_transform_name" = s,x,x,; then - program_transform_name= -else - # Double any \ or $. echo might interpret backslashes. - cat <<\EOF_SED > conftestsed -s,\\,\\\\,g; s,\$,$$,g -EOF_SED - program_transform_name="`echo $program_transform_name|sed -f conftestsed`" - rm -f conftestsed -fi test "$program_prefix" != NONE && - program_transform_name="s,^,${program_prefix},; $program_transform_name" + program_transform_name="s&^&$program_prefix&;$program_transform_name" # Use a double $ so make ignores it. test "$program_suffix" != NONE && - program_transform_name="s,\$\$,${program_suffix},; $program_transform_name" - -# sed with no file args requires a program. -test "$program_transform_name" = "" && program_transform_name="s,x,x," + program_transform_name="s&\$&$program_suffix&;$program_transform_name" +# Double any \ or $. echo might interpret backslashes. +# By default was `s,x,x', remove it if useless. +cat <<\_ACEOF >conftest.sed +s/[\\$]/&&/g;s/;s,x,x,$// +_ACEOF +program_transform_name=`echo $program_transform_name | sed -f conftest.sed` +rm -f conftest.sed # Get 'install' or 'install-sh' and its variants. @@ -715,67 +1954,83 @@ # SunOS /usr/etc/install # IRIX /sbin/install # AIX /bin/install +# AmigaOS /C/install, which installs bootblocks on floppy discs # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag # AFS /usr/afsws/bin/install, which mishandles nonexistent args # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" +# OS/2's system install, which has a completely different semantic # ./install, which can be erroneously created by make from ./install.sh. -echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:724: checking for a BSD compatible install" >&5 +{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 +echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } if test -z "$INSTALL"; then -if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +if test "${ac_cv_path_install+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" - for ac_dir in $PATH; do - # Account for people who put trailing slashes in PATH elements. - case "$ac_dir/" in - /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - if test -f $ac_dir/$ac_prog; then + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + # Account for people who put trailing slashes in PATH elements. +case $as_dir/ in + ./ | .// | /cC/* | \ + /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ + ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ + /usr/ucb/* ) ;; + *) + # OSF1 and SCO ODT 3.0 have their own names for install. + # Don't use installbsd from OSF since it installs stuff as root + # by default. + for ac_prog in ginstall scoinst install; do + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then if test $ac_prog = install && - grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then + grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. : + elif test $ac_prog = install && + grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # program-specific install script used by HP pwplus--don't use. + : else - ac_cv_path_install="$ac_dir/$ac_prog -c" - break 2 + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" + break 3 fi fi done - ;; - esac - done - IFS="$ac_save_IFS" + done + ;; +esac +done +IFS=$as_save_IFS + fi if test "${ac_cv_path_install+set}" = set; then - INSTALL="$ac_cv_path_install" + INSTALL=$ac_cv_path_install else - # As a last resort, use the slow shell script. We don't cache a - # path for INSTALL within a source directory, because that will + # As a last resort, use the slow shell script. Don't cache a + # value for INSTALL within a source directory, because that will # break other packages using the cache if that directory is - # removed, or if the path is relative. - INSTALL="$ac_install_sh" + # removed, or if the value is a relative name. + INSTALL=$ac_install_sh fi fi -echo "$ac_t""$INSTALL" 1>&6 +{ echo "$as_me:$LINENO: result: $INSTALL" >&5 +echo "${ECHO_T}$INSTALL" >&6; } # Use test -z because SunOS4 sh mishandles braces in ${var-val}. # It thinks the first close brace ends the variable substitution. test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -echo $ac_n "checking whether ln works""... $ac_c" 1>&6 -echo "configure:777: checking whether ln works" >&5 -if eval "test \"`echo '$''{'acx_cv_prog_LN'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking whether ln works" >&5 +echo $ECHO_N "checking whether ln works... $ECHO_C" >&6; } +if test "${acx_cv_prog_LN+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else rm -f conftestdata_t echo >conftestdata_f @@ -790,31 +2045,23 @@ fi if test $acx_cv_prog_LN = no; then LN="cp" - echo "$ac_t""no, using $LN" 1>&6 + { echo "$as_me:$LINENO: result: no, using $LN" >&5 +echo "${ECHO_T}no, using $LN" >&6; } else LN="$acx_cv_prog_LN" - echo "$ac_t""yes" 1>&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } fi -echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:801: checking whether ln -s works" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking whether ln -s works" >&5 +echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; } +LN_S=$as_ln_s +if test "$LN_S" = "ln -s"; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else - rm -f conftestdata -if ln -s X conftestdata 2>/dev/null -then - rm -f conftestdata - ac_cv_prog_LN_S="ln -s" -else - ac_cv_prog_LN_S=ln -fi -fi -LN_S="$ac_cv_prog_LN_S" -if test "$ac_cv_prog_LN_S" = "ln -s"; then - echo "$ac_t""yes" 1>&6 -else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no, using $LN_S" >&5 +echo "${ECHO_T}no, using $LN_S" >&6; } fi @@ -891,11 +2138,11 @@ ### or a host dependent tool. Then put it into the appropriate list ### (library or tools, host or target), doing a dependency sort. -# Subdirs will be configured in the order listed in build_configdirs, +# Subdirs will be configured in the order listed in build_configdirs, # configdirs, or target_configdirs; see the serialization section below. -# Dependency sorting is only needed when *configuration* must be done in -# a particular order. In all cases a dependency should be specified in +# Dependency sorting is only needed when *configuration* must be done in +# a particular order. In all cases a dependency should be specified in # the Makefile, whether or not it's implicitly specified here. # Double entries in build_configdirs, configdirs, or target_configdirs may @@ -975,7 +2222,7 @@ is_cross_compiler=no else is_cross_compiler=yes -fi +fi # Find the build and target subdir names. case ${build_alias} in @@ -993,7 +2240,7 @@ *) target_noncanonical=${target_alias} ;; esac - + # post-stage1 host modules use a different CC_FOR_BUILD so, in order to # have matching libraries, they should use host libraries: Makefile.tpl # arranges to pass --with-build-libsubdir=$(HOST_SUBDIR). @@ -1005,10 +2252,10 @@ # Prefix 'build-' so this never conflicts with target_subdir. build_subdir="build-${build_noncanonical}" -# Check whether --with-build-libsubdir or --without-build-libsubdir was given. + +# Check whether --with-build-libsubdir was given. if test "${with_build_libsubdir+set}" = set; then - withval="$with_build_libsubdir" - build_libsubdir="$withval" + withval=$with_build_libsubdir; build_libsubdir="$withval" else build_libsubdir="$build_subdir" fi @@ -1022,7 +2269,7 @@ fi # No prefix. target_subdir=${target_noncanonical} - + # Skipdirs are removed silently. skipdirs= @@ -1043,7 +2290,7 @@ noconfigdirs="$noconfigdirs gas" fi -# some tools are so dependent upon X11 that if we're not building with X, +# some tools are so dependent upon X11 that if we're not building with X, # it's not even worth trying to configure, much less build, that tool. case ${with_x} in @@ -1051,13 +2298,13 @@ no) skipdirs="${skipdirs} tk itcl libgui" # We won't be able to build gdbtk without X. - enable_gdbtk=no + enable_gdbtk=no ;; *) echo "*** bad value \"${with_x}\" for -with-x flag; ignored" 1>&2 ;; esac # Some tools are only suitable for building in a "native" situation. -# Remove these if host!=target. +# Remove these if host!=target. native_only="autoconf automake libtool fileutils find gawk gettext gzip hello indent m4 rcs recode sed shellutils tar textutils uudecode wdiff target-groff guile perl time ash bash bzip2 prms gnuserv target-gperf" # Similarly, some are only suitable for cross toolchains. @@ -1095,7 +2342,7 @@ # Only spaces may be used in this macro; not newlines or tabs. unsupported_languages= -# Remove more programs from consideration, based on the host or +# Remove more programs from consideration, based on the host or # target this usually means that a port of the program doesn't # exist yet. @@ -1131,10 +2378,9 @@ esac -# Check whether --enable-libada or --disable-libada was given. +# Check whether --enable-libada was given. if test "${enable_libada+set}" = set; then - enableval="$enable_libada" - ENABLE_LIBADA=$enableval + enableval=$enable_libada; ENABLE_LIBADA=$enableval else ENABLE_LIBADA=yes fi @@ -1143,10 +2389,9 @@ noconfigdirs="$noconfigdirs gnattools" fi -# Check whether --enable-libssp or --disable-libssp was given. +# Check whether --enable-libssp was given. if test "${enable_libssp+set}" = set; then - enableval="$enable_libssp" - ENABLE_LIBSSP=$enableval + enableval=$enable_libssp; ENABLE_LIBSSP=$enableval else ENABLE_LIBSSP=yes fi @@ -1317,7 +2562,7 @@ ;; sh-*-linux*) noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss" - ;; + ;; sh*-*-pe|mips*-*-pe|*arm-wince-pe) noconfigdirs="$noconfigdirs ${libgcj}" noconfigdirs="$noconfigdirs target-examples" @@ -1480,7 +2725,7 @@ i[3456789]86-*-mingw32*) target_configdirs="$target_configdirs target-winsup" noconfigdirs="$noconfigdirs expect target-libgloss target-newlib ${libgcj}" - ;; + ;; *-*-cygwin*) target_configdirs="$target_configdirs target-libtermcap target-winsup" noconfigdirs="$noconfigdirs target-gperf target-libgloss ${libgcj}" @@ -1490,7 +2735,7 @@ elif test -d "$srcdir/newlib"; then echo "Warning: winsup/cygwin is missing so newlib can't be built." fi - ;; + ;; i[3456789]86-moss-msdos | i[3456789]86-*-moss* | \ i[3456789]86-*-uwin* | i[3456789]86-*-interix* ) ;; @@ -1669,7 +2914,7 @@ ;; *-*-lynxos*) noconfigdirs="$noconfigdirs target-newlib target-libgloss ${libgcj}" - ;; + ;; *-*-*) noconfigdirs="$noconfigdirs ${libgcj}" ;; @@ -1828,6 +3073,9 @@ # APPLE LOCAL begin dynamic-no-pic i[3456789]86-*-darwin*) host_makefile_frag="config/mh-x86-darwin" + # gcc and c++ can default to x86_64 code generation, avoid that. + CC="${CC-gcc} -m32" + CXX="${CXX-c++} -m32" ;; # APPLE LOCAL end dynamic-no-pic powerpc-*-aix*) @@ -1890,214 +3138,791 @@ # This is all going to change when we autoconfiscate... CC_FOR_BUILD="\$(CC)" + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. +set dummy ${ac_tool_prefix}gcc; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="${ac_tool_prefix}gcc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1897: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CC="gcc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +echo "${ECHO_T}$ac_ct_CC" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf at gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf at gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi +else + CC="$ac_cv_prog_CC" +fi + +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. +set dummy ${ac_tool_prefix}cc; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_CC="gcc" - break - fi - done - IFS="$ac_save_ifs" +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="${ac_tool_prefix}cc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + fi fi -CC="$ac_cv_prog_CC" +CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$ac_t""$CC" 1>&6 + { echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + + fi +fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1927: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ac_prog_rejected=no - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue - fi - ac_cv_prog_CC="cc" - break - fi - done - IFS="$ac_save_ifs" +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + if test $ac_prog_rejected = yes; then # We found a bogon in the path, so make sure we never use it. set dummy $ac_cv_prog_CC shift - if test $# -gt 0; then + if test $# != 0; then # We chose a different compiler from the bogus one. # However, it has the same basename, so the bogon will be chosen # first if we set CC to just the basename; use the full file name. shift - set dummy "$ac_dir/$ac_word" "$@" - shift - ac_cv_prog_CC="$@" + ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" fi fi fi fi -CC="$ac_cv_prog_CC" +CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$ac_t""$CC" 1>&6 + { echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - if test -z "$CC"; then - case "`uname -s`" in - *win32* | *WIN32*) - # Extract the first word of "cl", so it can be a program name with args. -set dummy cl; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1978: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + +fi +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + for ac_prog in cl.exe + 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 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_CC="cl" - break - fi - done - IFS="$ac_save_ifs" +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + fi fi -CC="$ac_cv_prog_CC" +CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$ac_t""$CC" 1>&6 + { echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - ;; - esac + + + test -n "$CC" && break + done +fi +if test -z "$CC"; then + ac_ct_CC=$CC + for ac_prog in cl.exe +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CC="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 fi - test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } +done +done +IFS=$as_save_IFS + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +echo "${ECHO_T}$ac_ct_CC" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi -echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:2010: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 -ac_ext=c -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cc_cross + test -n "$ac_ct_CC" && break +done + + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf at gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf at gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi +fi -cat > conftest.$ac_ext << EOF +fi -#line 2021 "configure" -#include "confdefs.h" -main(){return(0);} -EOF -if { (eval echo configure:2026: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - ac_cv_prog_cc_works=yes - # If we can't run a trivial program, we are probably using a cross compiler. - if (./conftest; exit) 2>/dev/null; then - ac_cv_prog_cc_cross=no +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. +echo "$as_me:$LINENO: checking for C compiler version" >&5 +ac_compiler=`set X $ac_compile; echo $2` +{ (ac_try="$ac_compiler --version >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler --version >&5") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (ac_try="$ac_compiler -v >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -v >&5") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (ac_try="$ac_compiler -V >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -V >&5") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +ac_clean_files_save=$ac_clean_files +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. +{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 +echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; } +ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` +# +# List of possible output files, starting from the most likely. +# The algorithm is not robust to junk in `.', hence go to wildcards (a.*) +# only as a last resort. b.out is created by i960 compilers. +ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out' +# +# The IRIX 6 linker writes into existing files which may not be +# executable, retaining their permissions. Remove them first so a +# subsequent execution test works. +ac_rmfiles= +for ac_file in $ac_files +do + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; + * ) ac_rmfiles="$ac_rmfiles $ac_file";; + esac +done +rm -f $ac_rmfiles + +if { (ac_try="$ac_link_default" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link_default") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. +# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' +# in a Makefile. We should not override ac_cv_exeext if it was cached, +# so that the user can short-circuit this test for compilers unknown to +# Autoconf. +for ac_file in $ac_files '' +do + test -f "$ac_file" || continue + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) + ;; + [ab].out ) + # We found the default executable, but exeext='' is most + # certainly right. + break;; + *.* ) + if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + then :; else + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + fi + # We set ac_cv_exeext here because the later test for it is not + # safe: cross compilers may not add the suffix if given an `-o' + # argument, so we may need to know it at that point already. + # Even if this section looks crufty: it has the advantage of + # actually working. + break;; + * ) + break;; + esac +done +test "$ac_cv_exeext" = no && ac_cv_exeext= + +else + ac_file='' +fi + +{ echo "$as_me:$LINENO: result: $ac_file" >&5 +echo "${ECHO_T}$ac_file" >&6; } +if test -z "$ac_file"; then + 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;} + { (exit 77); exit 77; }; } +fi + +ac_exeext=$ac_cv_exeext + +# Check that the compiler produces executables we can run. If not, either +# the compiler is broken, or we cross compile. +{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5 +echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; } +# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 +# If not cross compiling, check that we can run a simple program. +if test "$cross_compiling" != yes; then + if { ac_try='./$ac_file' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cross_compiling=no else - ac_cv_prog_cc_cross=yes + if test "$cross_compiling" = maybe; then + 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 +echo "$as_me: error: cannot run C compiled programs. +If you meant to cross compile, use \`--host'. +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } + fi fi -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - ac_cv_prog_cc_works=no fi -rm -fr conftest* -ac_ext=c -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cc_cross - -echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 -if test $ac_cv_prog_cc_works = no; then - { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } -fi -echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:2052: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 -echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 -cross_compiling=$ac_cv_prog_cc_cross - -echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:2057: checking whether we are using GNU C" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + +rm -f a.out a.exe conftest$ac_cv_exeext b.out +ac_clean_files=$ac_clean_files_save +# Check that the compiler produces executables we can run. If not, either +# the compiler is broken, or we cross compile. +{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 +echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: result: $cross_compiling" >&5 +echo "${ECHO_T}$cross_compiling" >&6; } + +{ echo "$as_me:$LINENO: checking for suffix of executables" >&5 +echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; } +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + # If both `conftest.exe' and `conftest' are `present' (well, observable) +# 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 + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; + *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + break;; + * ) break;; + esac +done else - cat > conftest.c <&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then - ac_cv_prog_gcc=yes + { { 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 + +rm -f conftest$ac_cv_exeext +{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 +echo "${ECHO_T}$ac_cv_exeext" >&6; } + +rm -f conftest.$ac_ext +EXEEXT=$ac_cv_exeext +ac_exeext=$EXEEXT +{ echo "$as_me:$LINENO: checking for suffix of object files" >&5 +echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; } +if test "${ac_cv_objext+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.o conftest.obj +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + for ac_file in conftest.o conftest.obj conftest.*; do + test -f "$ac_file" || continue; + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;; + *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` + break;; + esac +done else - ac_cv_prog_gcc=no -fi -fi + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -echo "$ac_t""$ac_cv_prog_gcc" 1>&6 +{ { 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 + +rm -f conftest.$ac_cv_objext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 +echo "${ECHO_T}$ac_cv_objext" >&6; } +OBJEXT=$ac_cv_objext +ac_objext=$OBJEXT +{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 +echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } +if test "${ac_cv_c_compiler_gnu+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ +#ifndef __GNUC__ + choke me +#endif -if test $ac_cv_prog_gcc = yes; then - GCC=yes + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_compiler_gnu=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_compiler_gnu=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +ac_cv_c_compiler_gnu=$ac_compiler_gnu + +fi +{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 +echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } +GCC=`test $ac_compiler_gnu = yes && echo yes` +ac_test_CFLAGS=${CFLAGS+set} +ac_save_CFLAGS=$CFLAGS +{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 +echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } +if test "${ac_cv_prog_cc_g+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_save_c_werror_flag=$ac_c_werror_flag + ac_c_werror_flag=yes + ac_cv_prog_cc_g=no + CFLAGS="-g" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_prog_cc_g=yes else - GCC= -fi + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -ac_test_CFLAGS="${CFLAGS+set}" -ac_save_CFLAGS="$CFLAGS" -CFLAGS= -echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:2085: checking whether ${CC-cc} accepts -g" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + CFLAGS="" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + : else - echo 'void f(){}' > conftest.c -if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_c_werror_flag=$ac_save_c_werror_flag + CFLAGS="-g" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_prog_cc_g=yes else - ac_cv_prog_cc_g=no + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + fi -rm -f conftest* +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_c_werror_flag=$ac_save_c_werror_flag +fi +{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 +echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } if test "$ac_test_CFLAGS" = set; then - CFLAGS="$ac_save_CFLAGS" + CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then if test "$GCC" = yes; then CFLAGS="-g -O2" @@ -2111,6 +3936,126 @@ CFLAGS= fi fi +{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 +echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } +if test "${ac_cv_prog_cc_c89+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_prog_cc_c89=no +ac_save_CC=$CC +cat >conftest.$ac_ext <<_ACEOF +/* 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; +} + +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has + function prototypes and stuff, but not '\xHH' hex character constants. + These don't provoke an error unfortunately, instead are silently treated + as 'x'. The following induces an error, until -std is added to get + proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an + array size at least. It's necessary to write '\x00'==0 to get something + that's true only with -std. */ +int osf4_cc_array ['\x00' == 0 ? 1 : -1]; + +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters + inside strings and character constants. */ +#define FOO(x) 'x' +int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; + +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 +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +do + CC="$ac_save_CC $ac_arg" + rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_prog_cc_c89=$ac_arg +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c89" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC + +fi +# AC_CACHE_VAL +case "x$ac_cv_prog_cc_c89" in + x) + { echo "$as_me:$LINENO: result: none needed" >&5 +echo "${ECHO_T}none needed" >&6; } ;; + xno) + { echo "$as_me:$LINENO: result: unsupported" >&5 +echo "${ECHO_T}unsupported" >&6; } ;; + *) + CC="$CC $ac_cv_prog_cc_c89" + { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 +echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; +esac + + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu # We must set the default linker to the linker used by gcc for the correct @@ -2137,85 +4082,109 @@ CXXFLAGS=${CXXFLAGS-"-g -O2"} fi -if test $host != $build; then - ac_tool_prefix=${host_alias}- -else - ac_tool_prefix= -fi -# Extract the first word of "${ac_tool_prefix}gnatbind", so it can be a program name with args. +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}gnatbind", so it can be a program name with args. set dummy ${ac_tool_prefix}gnatbind; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2152: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_GNATBIND'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_GNATBIND+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$GNATBIND"; then ac_cv_prog_GNATBIND="$GNATBIND" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_GNATBIND="${ac_tool_prefix}gnatbind" - break - fi - done - IFS="$ac_save_ifs" +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_GNATBIND="${ac_tool_prefix}gnatbind" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + fi fi -GNATBIND="$ac_cv_prog_GNATBIND" +GNATBIND=$ac_cv_prog_GNATBIND if test -n "$GNATBIND"; then - echo "$ac_t""$GNATBIND" 1>&6 + { echo "$as_me:$LINENO: result: $GNATBIND" >&5 +echo "${ECHO_T}$GNATBIND" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi +fi if test -z "$ac_cv_prog_GNATBIND"; then -if test -n "$ac_tool_prefix"; then + ac_ct_GNATBIND=$GNATBIND # Extract the first word of "gnatbind", so it can be a program name with args. set dummy gnatbind; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2184: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_GNATBIND'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_ac_ct_GNATBIND+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test -n "$GNATBIND"; then - ac_cv_prog_GNATBIND="$GNATBIND" # Let the user override the test. + if test -n "$ac_ct_GNATBIND"; then + ac_cv_prog_ac_ct_GNATBIND="$ac_ct_GNATBIND" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_GNATBIND="gnatbind" - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_prog_GNATBIND" && ac_cv_prog_GNATBIND="no" +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_GNATBIND="gnatbind" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + fi fi -GNATBIND="$ac_cv_prog_GNATBIND" -if test -n "$GNATBIND"; then - echo "$ac_t""$GNATBIND" 1>&6 +ac_ct_GNATBIND=$ac_cv_prog_ac_ct_GNATBIND +if test -n "$ac_ct_GNATBIND"; then + { echo "$as_me:$LINENO: result: $ac_ct_GNATBIND" >&5 +echo "${ECHO_T}$ac_ct_GNATBIND" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + if test "x$ac_ct_GNATBIND" = x; then + GNATBIND="no" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf at gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf at gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + GNATBIND=$ac_ct_GNATBIND + fi else - GNATBIND="no" -fi + GNATBIND="$ac_cv_prog_GNATBIND" fi -echo $ac_n "checking whether compiler driver understands Ada""... $ac_c" 1>&6 -echo "configure:2217: checking whether compiler driver understands Ada" >&5 -if eval "test \"`echo '$''{'acx_cv_cc_gcc_supports_ada'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking whether compiler driver understands Ada" >&5 +echo $ECHO_N "checking whether compiler driver understands Ada... $ECHO_C" >&6; } +if test "${acx_cv_cc_gcc_supports_ada+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.adb <&6 +{ echo "$as_me:$LINENO: result: $acx_cv_cc_gcc_supports_ada" >&5 +echo "${ECHO_T}$acx_cv_cc_gcc_supports_ada" >&6; } if test x$GNATBIND != xno && test x$acx_cv_cc_gcc_supports_ada != xno; then have_gnat=yes @@ -2244,10 +4213,10 @@ have_gnat=no fi -echo $ac_n "checking how to compare bootstrapped objects""... $ac_c" 1>&6 -echo "configure:2249: checking how to compare bootstrapped objects" >&5 -if eval "test \"`echo '$''{'gcc_cv_prog_cmp_skip'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking how to compare bootstrapped objects" >&5 +echo $ECHO_N "checking how to compare bootstrapped objects... $ECHO_C" >&6; } +if test "${gcc_cv_prog_cmp_skip+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else echo abfoo >t1 echo cdfoo >t2 @@ -2269,8 +4238,8 @@ rm t1 t2 fi - -echo "$ac_t""$gcc_cv_prog_cmp_skip" 1>&6 +{ echo "$as_me:$LINENO: result: $gcc_cv_prog_cmp_skip" >&5 +echo "${ECHO_T}$gcc_cv_prog_cmp_skip" >&6; } do_compare="$gcc_cv_prog_cmp_skip" @@ -2281,30 +4250,33 @@ have_gmp=yes # Specify a location for mpfr # check for this first so it ends up on the link line before gmp. -# Check whether --with-mpfr-dir or --without-mpfr-dir was given. + +# Check whether --with-mpfr-dir was given. if test "${with_mpfr_dir+set}" = set; then - withval="$with_mpfr_dir" - { echo "configure: error: The --with-mpfr-dir=PATH option has been removed. -Use --with-mpfr=PATH or --with-mpfr-include=PATH plus --with-mpfr-lib=PATH" 1>&2; exit 1; } + withval=$with_mpfr_dir; { { echo "$as_me:$LINENO: error: The --with-mpfr-dir=PATH option has been removed. +Use --with-mpfr=PATH or --with-mpfr-include=PATH plus --with-mpfr-lib=PATH" >&5 +echo "$as_me: error: The --with-mpfr-dir=PATH option has been removed. +Use --with-mpfr=PATH or --with-mpfr-include=PATH plus --with-mpfr-lib=PATH" >&2;} + { (exit 1); exit 1; }; } fi -# Check whether --with-mpfr or --without-mpfr was given. + +# Check whether --with-mpfr was given. if test "${with_mpfr+set}" = set; then - withval="$with_mpfr" - : + withval=$with_mpfr; fi -# Check whether --with-mpfr_include or --without-mpfr_include was given. + +# Check whether --with-mpfr_include was given. if test "${with_mpfr_include+set}" = set; then - withval="$with_mpfr_include" - : + withval=$with_mpfr_include; fi -# Check whether --with-mpfr_lib or --without-mpfr_lib was given. + +# Check whether --with-mpfr_lib was given. if test "${with_mpfr_lib+set}" = set; then - withval="$with_mpfr_lib" - : + withval=$with_mpfr_lib; fi @@ -2320,32 +4292,35 @@ fi # Specify a location for gmp -# Check whether --with-gmp-dir or --without-gmp-dir was given. + +# Check whether --with-gmp-dir was given. if test "${with_gmp_dir+set}" = set; then - withval="$with_gmp_dir" - { echo "configure: error: The --with-gmp-dir=PATH option has been removed. -Use --with-gmp=PATH or --with-gmp-include=PATH plus --with-gmp-lib=PATH" 1>&2; exit 1; } + withval=$with_gmp_dir; { { echo "$as_me:$LINENO: error: The --with-gmp-dir=PATH option has been removed. +Use --with-gmp=PATH or --with-gmp-include=PATH plus --with-gmp-lib=PATH" >&5 +echo "$as_me: error: The --with-gmp-dir=PATH option has been removed. +Use --with-gmp=PATH or --with-gmp-include=PATH plus --with-gmp-lib=PATH" >&2;} + { (exit 1); exit 1; }; } fi gmplibs="$gmplibs -lgmp" -# Check whether --with-gmp or --without-gmp was given. + +# Check whether --with-gmp was given. if test "${with_gmp+set}" = set; then - withval="$with_gmp" - : + withval=$with_gmp; fi -# Check whether --with-gmp_include or --without-gmp_include was given. + +# Check whether --with-gmp_include was given. if test "${with_gmp_include+set}" = set; then - withval="$with_gmp_include" - : + withval=$with_gmp_include; fi -# Check whether --with-gmp_lib or --without-gmp_lib was given. + +# Check whether --with-gmp_lib was given. if test "${with_gmp_lib+set}" = set; then - withval="$with_gmp_lib" - : + withval=$with_gmp_lib; fi @@ -2364,81 +4339,159 @@ saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $gmpinc" # Check GMP actually works -echo $ac_n "checking for correct version of gmp.h""... $ac_c" 1>&6 -echo "configure:2369: checking for correct version of gmp.h" >&5 -cat > conftest.$ac_ext <&5 +echo $ECHO_N "checking for correct version of gmp.h... $ECHO_C" >&6; } + +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include "gmp.h" -int main() { +int +main () +{ #if __GNU_MP_VERSION < 4 || (__GNU_MP_VERSION == 4 && __GNU_MP_VERSION_MINOR < 1) choke me #endif -; return 0; } -EOF -if { (eval echo configure:2382: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - echo "$ac_t""yes" 1>&6 -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - echo "$ac_t""no" 1>&6; have_gmp=no + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; }; have_gmp=no fi -rm -f conftest* + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test x"$have_gmp" = xyes; then - echo $ac_n "checking for correct version of mpfr.h""... $ac_c" 1>&6 -echo "configure:2395: checking for correct version of mpfr.h" >&5 - cat > conftest.$ac_ext <&5 +echo $ECHO_N "checking for correct version of mpfr.h... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include "gmp.h" #include -int main() { +int +main () +{ #if MPFR_VERSION < MPFR_VERSION_NUM(2,2,1) choke me #endif -; return 0; } -EOF -if { (eval echo configure:2409: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - echo "$ac_t""yes" 1>&6 -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - echo "$ac_t""buggy version of MPFR detected" 1>&6 + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + { echo "$as_me:$LINENO: result: buggy version of MPFR detected" >&5 +echo "${ECHO_T}buggy version of MPFR detected" >&6; } fi -rm -f conftest* + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext saved_LIBS="$LIBS" LIBS="$LIBS $gmplibs" - echo $ac_n "checking for any version of mpfr.h""... $ac_c" 1>&6 -echo "configure:2423: checking for any version of mpfr.h" >&5 - cat > conftest.$ac_ext <&5 +echo $ECHO_N "checking for any version of mpfr.h... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include #include -int main() { +int +main () +{ mpfr_t n; mpfr_init(n); -; return 0; } -EOF -if { (eval echo configure:2433: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - echo "$ac_t""yes" 1>&6 -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - echo "$ac_t""no" 1>&6; have_gmp=no + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; }; have_gmp=no fi -rm -f conftest* + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext LIBS="$saved_LIBS" fi CFLAGS="$saved_CFLAGS" @@ -2522,7 +4575,7 @@ # an apparent bug in bash 1.12 on linux. ${srcdir}/gcc/[*]/config-lang.in) ;; *) - # From the config-lang.in, get $language, $target_libs, + # From the config-lang.in, get $language, $target_libs, # $lang_dirs, $boot_language, and $build_by_default language= target_libs= @@ -2567,7 +4620,9 @@ case ,${enable_languages}, in *,${language},*) # Specifically requested language; tell them. - { echo "configure: error: The gcc/$i directory contains parts of $language but is missing" 1>&2; exit 1; } + { { echo "$as_me:$LINENO: error: The gcc/$i directory contains parts of $language but is missing" >&5 +echo "$as_me: error: The gcc/$i directory contains parts of $language but is missing" >&2;} + { (exit 1); exit 1; }; } ;; *) # Silently disable. @@ -2580,7 +4635,9 @@ case ,${enable_languages},:${have_gmp}:${need_gmp} in *,${language},*:no:yes) # Specifically requested language; tell them. - { echo "configure: error: GMP 4.1 and MPFR 2.2.1 or newer versions required by $language" 1>&2; exit 1; } + { { echo "$as_me:$LINENO: error: GMP 4.1 and MPFR 2.2.1 or newer versions required by $language" >&5 +echo "$as_me: error: GMP 4.1 and MPFR 2.2.1 or newer versions required by $language" >&2;} + { (exit 1); exit 1; }; } ;; *:no:yes) # Silently disable. @@ -2617,9 +4674,13 @@ missing_languages=`echo "$missing_languages" | sed -e "s/^,//" -e "s/,$//"` if test "x$missing_languages" != x; then - { echo "configure: error: + { { echo "$as_me:$LINENO: error: +The following requested languages could not be built: ${missing_languages} +Recognised languages are: ${potential_languages}" >&5 +echo "$as_me: error: The following requested languages could not be built: ${missing_languages} -Recognised languages are: ${potential_languages}" 1>&2; exit 1; } +Recognised languages are: ${potential_languages}" >&2;} + { (exit 1); exit 1; }; } fi if test "x$new_enable_languages" != "x$enable_languages"; then @@ -2638,12 +4699,13 @@ done # Check for Boehm's garbage collector -# Check whether --enable-objc-gc or --disable-objc-gc was given. +# Check whether --enable-objc-gc was given. if test "${enable_objc_gc+set}" = set; then - enableval="$enable_objc_gc" - case ,${enable_languages},:${enable_objc_gc}:${noconfigdirs} in + enableval=$enable_objc_gc; case ,${enable_languages},:${enable_objc_gc}:${noconfigdirs} in *,objc,*:*:yes:*target-boehm-gc*) - { echo "configure: error: Boehm's garbage collector was requested yet not supported in this configuration" 1>&2; exit 1; } + { { echo "$as_me:$LINENO: error: Boehm's garbage collector was requested yet not supported in this configuration" >&5 +echo "$as_me: error: Boehm's garbage collector was requested yet not supported in this configuration" >&2;} + { (exit 1); exit 1; }; } ;; esac fi @@ -2724,7 +4786,7 @@ build_configdirs_all="$build_configdirs" build_configdirs= for i in ${build_configdirs_all} ; do - j=`echo $i | sed -e s/build-//g` + j=`echo $i | sed -e s/build-//g` if test -f ${srcdir}/$j/configure ; then build_configdirs="${build_configdirs} $i" fi @@ -2741,7 +4803,7 @@ target_configdirs_all="$target_configdirs" target_configdirs= for i in ${target_configdirs_all} ; do - j=`echo $i | sed -e s/target-//g` + j=`echo $i | sed -e s/target-//g` if test -f ${srcdir}/$j/configure ; then target_configdirs="${target_configdirs} $i" fi @@ -2789,10 +4851,10 @@ copy_dirs= -# Check whether --with-build-sysroot or --without-build-sysroot was given. + +# Check whether --with-build-sysroot was given. if test "${with_build_sysroot+set}" = set; then - withval="$with_build_sysroot" - if test x"$withval" != x ; then + withval=$with_build_sysroot; if test x"$withval" != x ; then SYSROOT_CFLAGS_FOR_TARGET="--sysroot=$withval" fi else @@ -2843,11 +4905,11 @@ # This is done by determining whether or not the appropriate directory # is available, and by checking whether or not specific configurations # have requested that this magic not happen. -# -# The command line options always override the explicit settings in +# +# The command line options always override the explicit settings in # configure.in, and the settings in configure.in override this magic. # -# If the default for a toolchain is to use GNU as and ld, and you don't +# If the default for a toolchain is to use GNU as and ld, and you don't # want to do that, then you should use the --without-gnu-as and # --without-gnu-ld options for the configure script. @@ -2963,7 +5025,7 @@ target_makefile_frag="config/mt-gnu" ;; *-*-aix4.[3456789]* | *-*-aix[56789].*) - # nm and ar from AIX 4.3 and above require -X32_64 flag to all ar and nm + # nm and ar from AIX 4.3 and above require -X32_64 flag to all ar and nm # commands to handle both 32-bit and 64-bit objects. These flags are # harmless if we're using GNU nm or ar. extra_arflags_for_target=" -X32_64" @@ -3023,7 +5085,7 @@ # hpux11 in 64bit mode has libraries in a weird place. Arrange to find # them automatically. case "${host}" in - hppa*64*-*-hpux11*) + hppa*64*-*-hpux11*) extra_host_args="$extra_host_args -x-libraries=/usr/lib/pa20_64 -x-includes=/usr/X11R6/include" ;; esac @@ -3060,7 +5122,7 @@ if test -s conftest || test -s conftest.exe ; then we_are_ok=yes fi -fi +fi case $we_are_ok in no) echo 1>&2 "*** The command '${CC} -o conftest ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} conftest.c' failed." @@ -3151,10 +5213,9 @@ # to maintain later. In this particular case, you just have to be careful # not to nest @if/@endif pairs, because configure will not warn you at all. -# Check whether --enable-bootstrap or --disable-bootstrap was given. +# Check whether --enable-bootstrap was given. if test "${enable_bootstrap+set}" = set; then - enableval="$enable_bootstrap" - : + enableval=$enable_bootstrap; else enable_bootstrap=default fi @@ -3184,16 +5245,21 @@ # Other configurations, but we have a compiler. Assume the user knows # what he's doing. yes:*:*:yes) - echo "configure: warning: trying to bootstrap a cross compiler" 1>&2 + { echo "$as_me:$LINENO: WARNING: trying to bootstrap a cross compiler" >&5 +echo "$as_me: WARNING: trying to bootstrap a cross compiler" >&2;} ;; # No compiler: if they passed --enable-bootstrap explicitly, fail no:*:*:yes) - { echo "configure: error: cannot bootstrap without a compiler" 1>&2; exit 1; } ;; + { { echo "$as_me:$LINENO: error: cannot bootstrap without a compiler" >&5 +echo "$as_me: error: cannot bootstrap without a compiler" >&2;} + { (exit 1); exit 1; }; } ;; # Fail if wrong command line *) - { echo "configure: error: invalid option for --enable-bootstrap" 1>&2; exit 1; } + { { echo "$as_me:$LINENO: error: invalid option for --enable-bootstrap" >&5 +echo "$as_me: error: invalid option for --enable-bootstrap" >&2;} + { (exit 1); exit 1; }; } ;; esac @@ -3250,10 +5316,9 @@ # Create the serialization dependencies. This uses a temporary file. -# Check whether --enable-serial-configure or --disable-serial-configure was given. +# Check whether --enable-serial-configure was given. if test "${enable_serial_configure+set}" = set; then - enableval="$enable_serial_configure" - : + enableval=$enable_serial_configure; fi @@ -3330,7 +5395,7 @@ s,\$,$$,g EOF_SED sed -f conftestsed < conftestsed.out - ${ac_configure_args} + ${ac_configure_args} EOF_SED baseargs=`cat conftestsed.out` rm -f conftestsed conftestsed.out @@ -3339,7 +5404,7 @@ # --program-suffix have been applied to it. Autoconf has already # doubled dollar signs and backslashes in program_transform_name; we want # the backslashes un-doubled, and then the entire thing wrapped in single -# quotes, because this will be expanded first by make and then by the shell. +# quotes, because this will be expanded first by make and then by the shell. # Also, because we want to override the logic in subdir configure scripts to # choose program_transform_name, replace any s,x,x, with s,y,y,. sed -e "s,\\\\\\\\,\\\\,g; s,','\\\\'',g; s/s,x,x,/s,y,y,/" < conftestsed.out @@ -3537,36 +5602,44 @@ for ac_prog in 'bison -y' byacc yacc do -# Extract the first word of "$ac_prog", so it can be a program name with args. + # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3544: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_YACC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$YACC"; then ac_cv_prog_YACC="$YACC" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_YACC="$ac_prog" - break - fi - done - IFS="$ac_save_ifs" +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_YACC="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + fi fi -YACC="$ac_cv_prog_YACC" +YACC=$ac_cv_prog_YACC if test -n "$YACC"; then - echo "$ac_t""$YACC" 1>&6 + { echo "$as_me:$LINENO: result: $YACC" >&5 +echo "${ECHO_T}$YACC" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi -test -n "$YACC" && break + + test -n "$YACC" && break done test -n "$YACC" || YACC="$MISSING bison -y" @@ -3577,36 +5650,44 @@ for ac_prog in bison do -# Extract the first word of "$ac_prog", so it can be a program name with args. + # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3584: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_BISON'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_BISON+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$BISON"; then ac_cv_prog_BISON="$BISON" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_BISON="$ac_prog" - break - fi - done - IFS="$ac_save_ifs" +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_BISON="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + fi fi -BISON="$ac_cv_prog_BISON" +BISON=$ac_cv_prog_BISON if test -n "$BISON"; then - echo "$ac_t""$BISON" 1>&6 + { echo "$as_me:$LINENO: result: $BISON" >&5 +echo "${ECHO_T}$BISON" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi -test -n "$BISON" && break + + test -n "$BISON" && break done test -n "$BISON" || BISON="$MISSING bison" @@ -3616,36 +5697,44 @@ for ac_prog in gm4 gnum4 m4 do -# Extract the first word of "$ac_prog", so it can be a program name with args. + # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3623: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_M4'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_M4+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$M4"; then ac_cv_prog_M4="$M4" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_M4="$ac_prog" - break - fi - done - IFS="$ac_save_ifs" +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_M4="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + fi fi -M4="$ac_cv_prog_M4" +M4=$ac_cv_prog_M4 if test -n "$M4"; then - echo "$ac_t""$M4" 1>&6 + { echo "$as_me:$LINENO: result: $M4" >&5 +echo "${ECHO_T}$M4" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi -test -n "$M4" && break + + test -n "$M4" && break done test -n "$M4" || M4="$MISSING m4" @@ -3655,36 +5744,44 @@ for ac_prog in flex lex do -# Extract the first word of "$ac_prog", so it can be a program name with args. + # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3662: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_LEX+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$LEX"; then ac_cv_prog_LEX="$LEX" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_LEX="$ac_prog" - break - fi - done - IFS="$ac_save_ifs" +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_LEX="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + fi fi -LEX="$ac_cv_prog_LEX" +LEX=$ac_cv_prog_LEX if test -n "$LEX"; then - echo "$ac_t""$LEX" 1>&6 + { echo "$as_me:$LINENO: result: $LEX" >&5 +echo "${ECHO_T}$LEX" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi -test -n "$LEX" && break + + test -n "$LEX" && break done test -n "$LEX" || LEX="$MISSING flex" @@ -3695,36 +5792,44 @@ for ac_prog in flex do -# Extract the first word of "$ac_prog", so it can be a program name with args. + # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3702: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_FLEX'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_FLEX+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$FLEX"; then ac_cv_prog_FLEX="$FLEX" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_FLEX="$ac_prog" - break - fi - done - IFS="$ac_save_ifs" +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_FLEX="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + fi fi -FLEX="$ac_cv_prog_FLEX" +FLEX=$ac_cv_prog_FLEX if test -n "$FLEX"; then - echo "$ac_t""$FLEX" 1>&6 + { echo "$as_me:$LINENO: result: $FLEX" >&5 +echo "${ECHO_T}$FLEX" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi -test -n "$FLEX" && break + + test -n "$FLEX" && break done test -n "$FLEX" || FLEX="$MISSING flex" @@ -3734,36 +5839,44 @@ for ac_prog in makeinfo do -# Extract the first word of "$ac_prog", so it can be a program name with args. + # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3741: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_MAKEINFO'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_MAKEINFO+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$MAKEINFO"; then ac_cv_prog_MAKEINFO="$MAKEINFO" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_MAKEINFO="$ac_prog" - break - fi - done - IFS="$ac_save_ifs" +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_MAKEINFO="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + fi fi -MAKEINFO="$ac_cv_prog_MAKEINFO" +MAKEINFO=$ac_cv_prog_MAKEINFO if test -n "$MAKEINFO"; then - echo "$ac_t""$MAKEINFO" 1>&6 + { echo "$as_me:$LINENO: result: $MAKEINFO" >&5 +echo "${ECHO_T}$MAKEINFO" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi -test -n "$MAKEINFO" && break + + test -n "$MAKEINFO" && break done test -n "$MAKEINFO" || MAKEINFO="$MISSING makeinfo" @@ -3787,36 +5900,44 @@ for ac_prog in expect do -# Extract the first word of "$ac_prog", so it can be a program name with args. + # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3794: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_EXPECT'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_EXPECT+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$EXPECT"; then ac_cv_prog_EXPECT="$EXPECT" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_EXPECT="$ac_prog" - break - fi - done - IFS="$ac_save_ifs" +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_EXPECT="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + fi fi -EXPECT="$ac_cv_prog_EXPECT" +EXPECT=$ac_cv_prog_EXPECT if test -n "$EXPECT"; then - echo "$ac_t""$EXPECT" 1>&6 + { echo "$as_me:$LINENO: result: $EXPECT" >&5 +echo "${ECHO_T}$EXPECT" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi -test -n "$EXPECT" && break + + test -n "$EXPECT" && break done test -n "$EXPECT" || EXPECT="expect" @@ -3828,36 +5949,44 @@ for ac_prog in runtest do -# Extract the first word of "$ac_prog", so it can be a program name with args. + # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3835: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_RUNTEST'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_RUNTEST+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$RUNTEST"; then ac_cv_prog_RUNTEST="$RUNTEST" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_RUNTEST="$ac_prog" - break - fi - done - IFS="$ac_save_ifs" +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_RUNTEST="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + fi fi -RUNTEST="$ac_cv_prog_RUNTEST" +RUNTEST=$ac_cv_prog_RUNTEST if test -n "$RUNTEST"; then - echo "$ac_t""$RUNTEST" 1>&6 + { echo "$as_me:$LINENO: result: $RUNTEST" >&5 +echo "${ECHO_T}$RUNTEST" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi -test -n "$RUNTEST" && break + + test -n "$RUNTEST" && break done test -n "$RUNTEST" || RUNTEST="runtest" @@ -3878,64 +6007,80 @@ if test -n "$ncn_tool_prefix"; then # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3883: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_AR+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$AR"; then ac_cv_prog_AR="$AR" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_AR="${ncn_tool_prefix}${ncn_progname}" - break - fi - done - IFS="$ac_save_ifs" +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_AR="${ncn_tool_prefix}${ncn_progname}" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + fi fi -AR="$ac_cv_prog_AR" +AR=$ac_cv_prog_AR if test -n "$AR"; then - echo "$ac_t""$AR" 1>&6 + { echo "$as_me:$LINENO: result: $AR" >&5 +echo "${ECHO_T}$AR" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_AR" && test $build = $host ; then # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3914: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_AR+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$AR"; then ac_cv_prog_AR="$AR" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_AR="${ncn_progname}" - break - fi - done - IFS="$ac_save_ifs" +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_AR="${ncn_progname}" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + fi fi -AR="$ac_cv_prog_AR" +AR=$ac_cv_prog_AR if test -n "$AR"; then - echo "$ac_t""$AR" 1>&6 + { echo "$as_me:$LINENO: result: $AR" >&5 +echo "${ECHO_T}$AR" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - + + fi test -n "$ac_cv_prog_AR" && break done @@ -3953,64 +6098,80 @@ if test -n "$ncn_tool_prefix"; then # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3958: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_AS+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$AS"; then ac_cv_prog_AS="$AS" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_AS="${ncn_tool_prefix}${ncn_progname}" - break - fi - done - IFS="$ac_save_ifs" +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_AS="${ncn_tool_prefix}${ncn_progname}" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + fi fi -AS="$ac_cv_prog_AS" +AS=$ac_cv_prog_AS if test -n "$AS"; then - echo "$ac_t""$AS" 1>&6 + { echo "$as_me:$LINENO: result: $AS" >&5 +echo "${ECHO_T}$AS" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_AS" && test $build = $host ; then # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3989: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_AS+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$AS"; then ac_cv_prog_AS="$AS" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_AS="${ncn_progname}" - break - fi - done - IFS="$ac_save_ifs" +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_AS="${ncn_progname}" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + fi fi -AS="$ac_cv_prog_AS" +AS=$ac_cv_prog_AS if test -n "$AS"; then - echo "$ac_t""$AS" 1>&6 + { echo "$as_me:$LINENO: result: $AS" >&5 +echo "${ECHO_T}$AS" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - + + fi test -n "$ac_cv_prog_AS" && break done @@ -4028,64 +6189,80 @@ if test -n "$ncn_tool_prefix"; then # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4033: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_DLLTOOL+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$DLLTOOL"; then ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_DLLTOOL="${ncn_tool_prefix}${ncn_progname}" - break - fi - done - IFS="$ac_save_ifs" +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_DLLTOOL="${ncn_tool_prefix}${ncn_progname}" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + fi fi -DLLTOOL="$ac_cv_prog_DLLTOOL" +DLLTOOL=$ac_cv_prog_DLLTOOL if test -n "$DLLTOOL"; then - echo "$ac_t""$DLLTOOL" 1>&6 + { echo "$as_me:$LINENO: result: $DLLTOOL" >&5 +echo "${ECHO_T}$DLLTOOL" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_DLLTOOL" && test $build = $host ; then # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4064: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_DLLTOOL+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$DLLTOOL"; then ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_DLLTOOL="${ncn_progname}" - break - fi - done - IFS="$ac_save_ifs" +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_DLLTOOL="${ncn_progname}" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + fi fi -DLLTOOL="$ac_cv_prog_DLLTOOL" +DLLTOOL=$ac_cv_prog_DLLTOOL if test -n "$DLLTOOL"; then - echo "$ac_t""$DLLTOOL" 1>&6 + { echo "$as_me:$LINENO: result: $DLLTOOL" >&5 +echo "${ECHO_T}$DLLTOOL" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - + + fi test -n "$ac_cv_prog_DLLTOOL" && break done @@ -4103,64 +6280,80 @@ if test -n "$ncn_tool_prefix"; then # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4108: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_LD+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$LD"; then ac_cv_prog_LD="$LD" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_LD="${ncn_tool_prefix}${ncn_progname}" - break - fi - done - IFS="$ac_save_ifs" +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_LD="${ncn_tool_prefix}${ncn_progname}" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + fi fi -LD="$ac_cv_prog_LD" +LD=$ac_cv_prog_LD if test -n "$LD"; then - echo "$ac_t""$LD" 1>&6 + { echo "$as_me:$LINENO: result: $LD" >&5 +echo "${ECHO_T}$LD" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_LD" && test $build = $host ; then # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4139: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_LD+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$LD"; then ac_cv_prog_LD="$LD" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_LD="${ncn_progname}" - break - fi - done - IFS="$ac_save_ifs" +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_LD="${ncn_progname}" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + fi fi -LD="$ac_cv_prog_LD" +LD=$ac_cv_prog_LD if test -n "$LD"; then - echo "$ac_t""$LD" 1>&6 + { echo "$as_me:$LINENO: result: $LD" >&5 +echo "${ECHO_T}$LD" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - + + fi test -n "$ac_cv_prog_LD" && break done @@ -4178,64 +6371,80 @@ if test -n "$ncn_tool_prefix"; then # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4183: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_LIPO'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_LIPO+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$LIPO"; then ac_cv_prog_LIPO="$LIPO" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_LIPO="${ncn_tool_prefix}${ncn_progname}" - break - fi - done - IFS="$ac_save_ifs" +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_LIPO="${ncn_tool_prefix}${ncn_progname}" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + fi fi -LIPO="$ac_cv_prog_LIPO" +LIPO=$ac_cv_prog_LIPO if test -n "$LIPO"; then - echo "$ac_t""$LIPO" 1>&6 + { echo "$as_me:$LINENO: result: $LIPO" >&5 +echo "${ECHO_T}$LIPO" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_LIPO" && test $build = $host ; then # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4214: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_LIPO'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_LIPO+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$LIPO"; then ac_cv_prog_LIPO="$LIPO" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_LIPO="${ncn_progname}" - break - fi - done - IFS="$ac_save_ifs" +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_LIPO="${ncn_progname}" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + fi fi -LIPO="$ac_cv_prog_LIPO" +LIPO=$ac_cv_prog_LIPO if test -n "$LIPO"; then - echo "$ac_t""$LIPO" 1>&6 + { echo "$as_me:$LINENO: result: $LIPO" >&5 +echo "${ECHO_T}$LIPO" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - + + fi test -n "$ac_cv_prog_LIPO" && break done @@ -4253,64 +6462,80 @@ if test -n "$ncn_tool_prefix"; then # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4258: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_NM'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_NM+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$NM"; then ac_cv_prog_NM="$NM" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_NM="${ncn_tool_prefix}${ncn_progname}" - break - fi - done - IFS="$ac_save_ifs" +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_NM="${ncn_tool_prefix}${ncn_progname}" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + fi fi -NM="$ac_cv_prog_NM" +NM=$ac_cv_prog_NM if test -n "$NM"; then - echo "$ac_t""$NM" 1>&6 + { echo "$as_me:$LINENO: result: $NM" >&5 +echo "${ECHO_T}$NM" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_NM" && test $build = $host ; then # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4289: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_NM'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_NM+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$NM"; then ac_cv_prog_NM="$NM" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_NM="${ncn_progname}" - break - fi - done - IFS="$ac_save_ifs" +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_NM="${ncn_progname}" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + fi fi -NM="$ac_cv_prog_NM" +NM=$ac_cv_prog_NM if test -n "$NM"; then - echo "$ac_t""$NM" 1>&6 + { echo "$as_me:$LINENO: result: $NM" >&5 +echo "${ECHO_T}$NM" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - + + fi test -n "$ac_cv_prog_NM" && break done @@ -4328,64 +6553,80 @@ if test -n "$ncn_tool_prefix"; then # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4333: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_RANLIB+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_RANLIB="${ncn_tool_prefix}${ncn_progname}" - break - fi - done - IFS="$ac_save_ifs" +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_RANLIB="${ncn_tool_prefix}${ncn_progname}" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + fi fi -RANLIB="$ac_cv_prog_RANLIB" +RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - echo "$ac_t""$RANLIB" 1>&6 + { echo "$as_me:$LINENO: result: $RANLIB" >&5 +echo "${ECHO_T}$RANLIB" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_RANLIB" && test $build = $host ; then # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4364: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_RANLIB+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_RANLIB="${ncn_progname}" - break - fi - done - IFS="$ac_save_ifs" +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_RANLIB="${ncn_progname}" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + fi fi -RANLIB="$ac_cv_prog_RANLIB" +RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - echo "$ac_t""$RANLIB" 1>&6 + { echo "$as_me:$LINENO: result: $RANLIB" >&5 +echo "${ECHO_T}$RANLIB" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - + + fi test -n "$ac_cv_prog_RANLIB" && break done @@ -4398,64 +6639,80 @@ if test -n "$ncn_tool_prefix"; then # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4403: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_STRIP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$STRIP"; then ac_cv_prog_STRIP="$STRIP" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_STRIP="${ncn_tool_prefix}${ncn_progname}" - break - fi - done - IFS="$ac_save_ifs" +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_STRIP="${ncn_tool_prefix}${ncn_progname}" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + fi fi -STRIP="$ac_cv_prog_STRIP" +STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then - echo "$ac_t""$STRIP" 1>&6 + { echo "$as_me:$LINENO: result: $STRIP" >&5 +echo "${ECHO_T}$STRIP" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_STRIP" && test $build = $host ; then # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4434: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_STRIP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$STRIP"; then ac_cv_prog_STRIP="$STRIP" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_STRIP="${ncn_progname}" - break - fi - done - IFS="$ac_save_ifs" +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_STRIP="${ncn_progname}" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + fi fi -STRIP="$ac_cv_prog_STRIP" +STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then - echo "$ac_t""$STRIP" 1>&6 + { echo "$as_me:$LINENO: result: $STRIP" >&5 +echo "${ECHO_T}$STRIP" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - + + fi test -n "$ac_cv_prog_STRIP" && break done @@ -4468,64 +6725,80 @@ if test -n "$ncn_tool_prefix"; then # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4473: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_WINDRES+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$WINDRES"; then ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_WINDRES="${ncn_tool_prefix}${ncn_progname}" - break - fi - done - IFS="$ac_save_ifs" +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_WINDRES="${ncn_tool_prefix}${ncn_progname}" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + fi fi -WINDRES="$ac_cv_prog_WINDRES" +WINDRES=$ac_cv_prog_WINDRES if test -n "$WINDRES"; then - echo "$ac_t""$WINDRES" 1>&6 + { echo "$as_me:$LINENO: result: $WINDRES" >&5 +echo "${ECHO_T}$WINDRES" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_WINDRES" && test $build = $host ; then # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4504: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_WINDRES+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$WINDRES"; then ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_WINDRES="${ncn_progname}" - break - fi - done - IFS="$ac_save_ifs" +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_WINDRES="${ncn_progname}" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + fi fi -WINDRES="$ac_cv_prog_WINDRES" +WINDRES=$ac_cv_prog_WINDRES if test -n "$WINDRES"; then - echo "$ac_t""$WINDRES" 1>&6 + { echo "$as_me:$LINENO: result: $WINDRES" >&5 +echo "${ECHO_T}$WINDRES" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - + + fi test -n "$ac_cv_prog_WINDRES" && break done @@ -4543,64 +6816,80 @@ if test -n "$ncn_tool_prefix"; then # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4548: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_OBJCOPY'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_OBJCOPY+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$OBJCOPY"; then ac_cv_prog_OBJCOPY="$OBJCOPY" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_OBJCOPY="${ncn_tool_prefix}${ncn_progname}" - break - fi - done - IFS="$ac_save_ifs" +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_OBJCOPY="${ncn_tool_prefix}${ncn_progname}" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + fi fi -OBJCOPY="$ac_cv_prog_OBJCOPY" +OBJCOPY=$ac_cv_prog_OBJCOPY if test -n "$OBJCOPY"; then - echo "$ac_t""$OBJCOPY" 1>&6 + { echo "$as_me:$LINENO: result: $OBJCOPY" >&5 +echo "${ECHO_T}$OBJCOPY" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_OBJCOPY" && test $build = $host ; then # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4579: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_OBJCOPY'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_OBJCOPY+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$OBJCOPY"; then ac_cv_prog_OBJCOPY="$OBJCOPY" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_OBJCOPY="${ncn_progname}" - break - fi - done - IFS="$ac_save_ifs" +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_OBJCOPY="${ncn_progname}" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + fi fi -OBJCOPY="$ac_cv_prog_OBJCOPY" +OBJCOPY=$ac_cv_prog_OBJCOPY if test -n "$OBJCOPY"; then - echo "$ac_t""$OBJCOPY" 1>&6 + { echo "$as_me:$LINENO: result: $OBJCOPY" >&5 +echo "${ECHO_T}$OBJCOPY" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - + + fi test -n "$ac_cv_prog_OBJCOPY" && break done @@ -4618,64 +6907,80 @@ if test -n "$ncn_tool_prefix"; then # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4623: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_OBJDUMP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$OBJDUMP"; then ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_OBJDUMP="${ncn_tool_prefix}${ncn_progname}" - break - fi - done - IFS="$ac_save_ifs" +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_OBJDUMP="${ncn_tool_prefix}${ncn_progname}" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + fi fi -OBJDUMP="$ac_cv_prog_OBJDUMP" +OBJDUMP=$ac_cv_prog_OBJDUMP if test -n "$OBJDUMP"; then - echo "$ac_t""$OBJDUMP" 1>&6 + { echo "$as_me:$LINENO: result: $OBJDUMP" >&5 +echo "${ECHO_T}$OBJDUMP" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_OBJDUMP" && test $build = $host ; then # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4654: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_OBJDUMP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$OBJDUMP"; then ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_OBJDUMP="${ncn_progname}" - break - fi - done - IFS="$ac_save_ifs" +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_OBJDUMP="${ncn_progname}" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + fi fi -OBJDUMP="$ac_cv_prog_OBJDUMP" +OBJDUMP=$ac_cv_prog_OBJDUMP if test -n "$OBJDUMP"; then - echo "$ac_t""$OBJDUMP" 1>&6 + { echo "$as_me:$LINENO: result: $OBJDUMP" >&5 +echo "${ECHO_T}$OBJDUMP" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - + + fi test -n "$ac_cv_prog_OBJDUMP" && break done @@ -4696,14 +7001,15 @@ # Target tools. -# Check whether --with-build-time-tools or --without-build-time-tools was given. + +# Check whether --with-build-time-tools was given. if test "${with_build_time_tools+set}" = set; then - withval="$with_build_time_tools" - case x"$withval" in + withval=$with_build_time_tools; case x"$withval" in x/*) ;; *) with_build_time_tools= - echo "configure: warning: argument to --with-build-time-tools must be an absolute path" 1>&2 + { echo "$as_me:$LINENO: WARNING: argument to --with-build-time-tools must be an absolute path" >&5 +echo "$as_me: WARNING: argument to --with-build-time-tools must be an absolute path" >&2;} ;; esac else @@ -4713,14 +7019,16 @@ if test -n "$with_build_time_tools"; then for ncn_progname in cc gcc; do - echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6 -echo "configure:4718: checking for ${ncn_progname} in $with_build_time_tools" >&5 + { echo "$as_me:$LINENO: checking for ${ncn_progname} in $with_build_time_tools" >&5 +echo $ECHO_N "checking for ${ncn_progname} in $with_build_time_tools... $ECHO_C" >&6; } if test -x $with_build_time_tools/${ncn_progname}; then ac_cv_prog_CC_FOR_TARGET=$with_build_time_tools/${ncn_progname} - echo "$ac_t""yes" 1>&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } break else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi done fi @@ -4730,69 +7038,85 @@ if test -n "$ncn_target_tool_prefix"; then # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4735: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_CC_FOR_TARGET'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_CC_FOR_TARGET+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$CC_FOR_TARGET"; then ac_cv_prog_CC_FOR_TARGET="$CC_FOR_TARGET" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_CC_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" - break - fi - done - IFS="$ac_save_ifs" +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + fi fi -CC_FOR_TARGET="$ac_cv_prog_CC_FOR_TARGET" +CC_FOR_TARGET=$ac_cv_prog_CC_FOR_TARGET if test -n "$CC_FOR_TARGET"; then - echo "$ac_t""$CC_FOR_TARGET" 1>&6 + { echo "$as_me:$LINENO: result: $CC_FOR_TARGET" >&5 +echo "${ECHO_T}$CC_FOR_TARGET" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_CC_FOR_TARGET" && test $build = $target ; then # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4766: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_CC_FOR_TARGET'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_CC_FOR_TARGET+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$CC_FOR_TARGET"; then ac_cv_prog_CC_FOR_TARGET="$CC_FOR_TARGET" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_CC_FOR_TARGET="${ncn_progname}" - break - fi - done - IFS="$ac_save_ifs" +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC_FOR_TARGET="${ncn_progname}" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + fi fi -CC_FOR_TARGET="$ac_cv_prog_CC_FOR_TARGET" +CC_FOR_TARGET=$ac_cv_prog_CC_FOR_TARGET if test -n "$CC_FOR_TARGET"; then - echo "$ac_t""$CC_FOR_TARGET" 1>&6 + { echo "$as_me:$LINENO: result: $CC_FOR_TARGET" >&5 +echo "${ECHO_T}$CC_FOR_TARGET" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - + + fi test -n "$ac_cv_prog_CC_FOR_TARGET" && break done fi - + if test -z "$ac_cv_prog_CC_FOR_TARGET" ; then set dummy cc gcc if test $build = $target ; then @@ -4806,14 +7130,16 @@ if test -n "$with_build_time_tools"; then for ncn_progname in c++ g++ cxx gxx; do - echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6 -echo "configure:4811: checking for ${ncn_progname} in $with_build_time_tools" >&5 + { echo "$as_me:$LINENO: checking for ${ncn_progname} in $with_build_time_tools" >&5 +echo $ECHO_N "checking for ${ncn_progname} in $with_build_time_tools... $ECHO_C" >&6; } if test -x $with_build_time_tools/${ncn_progname}; then ac_cv_prog_CXX_FOR_TARGET=$with_build_time_tools/${ncn_progname} - echo "$ac_t""yes" 1>&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } break else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi done fi @@ -4823,69 +7149,85 @@ if test -n "$ncn_target_tool_prefix"; then # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4828: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_CXX_FOR_TARGET'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_CXX_FOR_TARGET+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$CXX_FOR_TARGET"; then ac_cv_prog_CXX_FOR_TARGET="$CXX_FOR_TARGET" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_CXX_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" - break - fi - done - IFS="$ac_save_ifs" +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CXX_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + fi fi -CXX_FOR_TARGET="$ac_cv_prog_CXX_FOR_TARGET" +CXX_FOR_TARGET=$ac_cv_prog_CXX_FOR_TARGET if test -n "$CXX_FOR_TARGET"; then - echo "$ac_t""$CXX_FOR_TARGET" 1>&6 + { echo "$as_me:$LINENO: result: $CXX_FOR_TARGET" >&5 +echo "${ECHO_T}$CXX_FOR_TARGET" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_CXX_FOR_TARGET" && test $build = $target ; then # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4859: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_CXX_FOR_TARGET'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_CXX_FOR_TARGET+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$CXX_FOR_TARGET"; then ac_cv_prog_CXX_FOR_TARGET="$CXX_FOR_TARGET" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_CXX_FOR_TARGET="${ncn_progname}" - break - fi - done - IFS="$ac_save_ifs" +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CXX_FOR_TARGET="${ncn_progname}" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + fi fi -CXX_FOR_TARGET="$ac_cv_prog_CXX_FOR_TARGET" +CXX_FOR_TARGET=$ac_cv_prog_CXX_FOR_TARGET if test -n "$CXX_FOR_TARGET"; then - echo "$ac_t""$CXX_FOR_TARGET" 1>&6 + { echo "$as_me:$LINENO: result: $CXX_FOR_TARGET" >&5 +echo "${ECHO_T}$CXX_FOR_TARGET" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - + + fi test -n "$ac_cv_prog_CXX_FOR_TARGET" && break done fi - + if test -z "$ac_cv_prog_CXX_FOR_TARGET" ; then set dummy c++ g++ cxx gxx if test $build = $target ; then @@ -4899,14 +7241,16 @@ if test -n "$with_build_time_tools"; then for ncn_progname in gcc; do - echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6 -echo "configure:4904: checking for ${ncn_progname} in $with_build_time_tools" >&5 + { echo "$as_me:$LINENO: checking for ${ncn_progname} in $with_build_time_tools" >&5 +echo $ECHO_N "checking for ${ncn_progname} in $with_build_time_tools... $ECHO_C" >&6; } if test -x $with_build_time_tools/${ncn_progname}; then ac_cv_prog_GCC_FOR_TARGET=$with_build_time_tools/${ncn_progname} - echo "$ac_t""yes" 1>&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } break else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi done fi @@ -4916,69 +7260,85 @@ if test -n "$ncn_target_tool_prefix"; then # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4921: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_GCC_FOR_TARGET'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_GCC_FOR_TARGET+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$GCC_FOR_TARGET"; then ac_cv_prog_GCC_FOR_TARGET="$GCC_FOR_TARGET" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_GCC_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" - break - fi - done - IFS="$ac_save_ifs" +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_GCC_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + fi fi -GCC_FOR_TARGET="$ac_cv_prog_GCC_FOR_TARGET" +GCC_FOR_TARGET=$ac_cv_prog_GCC_FOR_TARGET if test -n "$GCC_FOR_TARGET"; then - echo "$ac_t""$GCC_FOR_TARGET" 1>&6 + { echo "$as_me:$LINENO: result: $GCC_FOR_TARGET" >&5 +echo "${ECHO_T}$GCC_FOR_TARGET" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_GCC_FOR_TARGET" && test $build = $target ; then # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4952: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_GCC_FOR_TARGET'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_GCC_FOR_TARGET+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$GCC_FOR_TARGET"; then ac_cv_prog_GCC_FOR_TARGET="$GCC_FOR_TARGET" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_GCC_FOR_TARGET="${ncn_progname}" - break - fi - done - IFS="$ac_save_ifs" +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_GCC_FOR_TARGET="${ncn_progname}" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + fi fi -GCC_FOR_TARGET="$ac_cv_prog_GCC_FOR_TARGET" +GCC_FOR_TARGET=$ac_cv_prog_GCC_FOR_TARGET if test -n "$GCC_FOR_TARGET"; then - echo "$ac_t""$GCC_FOR_TARGET" 1>&6 + { echo "$as_me:$LINENO: result: $GCC_FOR_TARGET" >&5 +echo "${ECHO_T}$GCC_FOR_TARGET" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - + + fi test -n "$ac_cv_prog_GCC_FOR_TARGET" && break done fi - + if test -z "$ac_cv_prog_GCC_FOR_TARGET" ; then GCC_FOR_TARGET="${CC_FOR_TARGET}" else @@ -4987,14 +7347,16 @@ if test -n "$with_build_time_tools"; then for ncn_progname in gcj; do - echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6 -echo "configure:4992: checking for ${ncn_progname} in $with_build_time_tools" >&5 + { echo "$as_me:$LINENO: checking for ${ncn_progname} in $with_build_time_tools" >&5 +echo $ECHO_N "checking for ${ncn_progname} in $with_build_time_tools... $ECHO_C" >&6; } if test -x $with_build_time_tools/${ncn_progname}; then ac_cv_prog_GCJ_FOR_TARGET=$with_build_time_tools/${ncn_progname} - echo "$ac_t""yes" 1>&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } break else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi done fi @@ -5004,69 +7366,85 @@ if test -n "$ncn_target_tool_prefix"; then # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5009: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_GCJ_FOR_TARGET'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_GCJ_FOR_TARGET+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$GCJ_FOR_TARGET"; then ac_cv_prog_GCJ_FOR_TARGET="$GCJ_FOR_TARGET" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_GCJ_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" - break - fi - done - IFS="$ac_save_ifs" +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_GCJ_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + fi fi -GCJ_FOR_TARGET="$ac_cv_prog_GCJ_FOR_TARGET" +GCJ_FOR_TARGET=$ac_cv_prog_GCJ_FOR_TARGET if test -n "$GCJ_FOR_TARGET"; then - echo "$ac_t""$GCJ_FOR_TARGET" 1>&6 + { echo "$as_me:$LINENO: result: $GCJ_FOR_TARGET" >&5 +echo "${ECHO_T}$GCJ_FOR_TARGET" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_GCJ_FOR_TARGET" && test $build = $target ; then # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5040: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_GCJ_FOR_TARGET'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_GCJ_FOR_TARGET+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$GCJ_FOR_TARGET"; then ac_cv_prog_GCJ_FOR_TARGET="$GCJ_FOR_TARGET" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_GCJ_FOR_TARGET="${ncn_progname}" - break - fi - done - IFS="$ac_save_ifs" +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_GCJ_FOR_TARGET="${ncn_progname}" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + fi fi -GCJ_FOR_TARGET="$ac_cv_prog_GCJ_FOR_TARGET" +GCJ_FOR_TARGET=$ac_cv_prog_GCJ_FOR_TARGET if test -n "$GCJ_FOR_TARGET"; then - echo "$ac_t""$GCJ_FOR_TARGET" 1>&6 + { echo "$as_me:$LINENO: result: $GCJ_FOR_TARGET" >&5 +echo "${ECHO_T}$GCJ_FOR_TARGET" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - + + fi test -n "$ac_cv_prog_GCJ_FOR_TARGET" && break done fi - + if test -z "$ac_cv_prog_GCJ_FOR_TARGET" ; then set dummy gcj if test $build = $target ; then @@ -5080,14 +7458,16 @@ if test -n "$with_build_time_tools"; then for ncn_progname in gfortran; do - echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6 -echo "configure:5085: checking for ${ncn_progname} in $with_build_time_tools" >&5 + { echo "$as_me:$LINENO: checking for ${ncn_progname} in $with_build_time_tools" >&5 +echo $ECHO_N "checking for ${ncn_progname} in $with_build_time_tools... $ECHO_C" >&6; } if test -x $with_build_time_tools/${ncn_progname}; then ac_cv_prog_GFORTRAN_FOR_TARGET=$with_build_time_tools/${ncn_progname} - echo "$ac_t""yes" 1>&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } break else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi done fi @@ -5097,69 +7477,85 @@ if test -n "$ncn_target_tool_prefix"; then # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5102: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_GFORTRAN_FOR_TARGET'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_GFORTRAN_FOR_TARGET+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$GFORTRAN_FOR_TARGET"; then ac_cv_prog_GFORTRAN_FOR_TARGET="$GFORTRAN_FOR_TARGET" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_GFORTRAN_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" - break - fi - done - IFS="$ac_save_ifs" +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_GFORTRAN_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + fi fi -GFORTRAN_FOR_TARGET="$ac_cv_prog_GFORTRAN_FOR_TARGET" +GFORTRAN_FOR_TARGET=$ac_cv_prog_GFORTRAN_FOR_TARGET if test -n "$GFORTRAN_FOR_TARGET"; then - echo "$ac_t""$GFORTRAN_FOR_TARGET" 1>&6 + { echo "$as_me:$LINENO: result: $GFORTRAN_FOR_TARGET" >&5 +echo "${ECHO_T}$GFORTRAN_FOR_TARGET" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_GFORTRAN_FOR_TARGET" && test $build = $target ; then # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5133: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_GFORTRAN_FOR_TARGET'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_GFORTRAN_FOR_TARGET+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$GFORTRAN_FOR_TARGET"; then ac_cv_prog_GFORTRAN_FOR_TARGET="$GFORTRAN_FOR_TARGET" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_GFORTRAN_FOR_TARGET="${ncn_progname}" - break - fi - done - IFS="$ac_save_ifs" +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_GFORTRAN_FOR_TARGET="${ncn_progname}" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + fi fi -GFORTRAN_FOR_TARGET="$ac_cv_prog_GFORTRAN_FOR_TARGET" +GFORTRAN_FOR_TARGET=$ac_cv_prog_GFORTRAN_FOR_TARGET if test -n "$GFORTRAN_FOR_TARGET"; then - echo "$ac_t""$GFORTRAN_FOR_TARGET" 1>&6 + { echo "$as_me:$LINENO: result: $GFORTRAN_FOR_TARGET" >&5 +echo "${ECHO_T}$GFORTRAN_FOR_TARGET" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - + + fi test -n "$ac_cv_prog_GFORTRAN_FOR_TARGET" && break done fi - + if test -z "$ac_cv_prog_GFORTRAN_FOR_TARGET" ; then set dummy gfortran if test $build = $target ; then @@ -5181,7 +7577,7 @@ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then PATH_SEPARATOR=';' else - PATH_SEPARATOR=: + PATH_SEPARATOR=: fi rm -f conf$$.sh fi @@ -5237,14 +7633,16 @@ if test -z "$ac_cv_path_AR_FOR_TARGET" ; then if test -n "$with_build_time_tools"; then - echo $ac_n "checking for ar in $with_build_time_tools""... $ac_c" 1>&6 -echo "configure:5242: checking for ar in $with_build_time_tools" >&5 + { echo "$as_me:$LINENO: checking for ar in $with_build_time_tools" >&5 +echo $ECHO_N "checking for ar in $with_build_time_tools... $ECHO_C" >&6; } if test -x $with_build_time_tools/ar; then AR_FOR_TARGET=`cd $with_build_time_tools && pwd`/ar ac_cv_path_AR_FOR_TARGET=$AR_FOR_TARGET - echo "$ac_t""$ac_cv_path_AR_FOR_TARGET" 1>&6 + { echo "$as_me:$LINENO: result: $ac_cv_path_AR_FOR_TARGET" >&5 +echo "${ECHO_T}$ac_cv_path_AR_FOR_TARGET" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi elif test $build != $host && test $have_gcc_for_target = yes; then AR_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=ar` @@ -5255,51 +7653,58 @@ if test -z "$ac_cv_path_AR_FOR_TARGET" ; then # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5260: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_AR_FOR_TARGET'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_AR_FOR_TARGET+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - case "$AR_FOR_TARGET" in - /*) + case $AR_FOR_TARGET in + [\\/]* | ?:[\\/]*) ac_cv_path_AR_FOR_TARGET="$AR_FOR_TARGET" # Let the user override the test with a path. ;; - ?:/*) - ac_cv_path_AR_FOR_TARGET="$AR_FOR_TARGET" # Let the user override the test with a dos path. - ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$gcc_cv_tool_dirs" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_AR_FOR_TARGET="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $gcc_cv_tool_dirs +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_AR_FOR_TARGET="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + ;; esac fi -AR_FOR_TARGET="$ac_cv_path_AR_FOR_TARGET" +AR_FOR_TARGET=$ac_cv_path_AR_FOR_TARGET if test -n "$AR_FOR_TARGET"; then - echo "$ac_t""$AR_FOR_TARGET" 1>&6 + { echo "$as_me:$LINENO: result: $AR_FOR_TARGET" >&5 +echo "${ECHO_T}$AR_FOR_TARGET" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_path_AR_FOR_TARGET" ; then if test -n "$with_build_time_tools"; then for ncn_progname in ar; do - echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6 -echo "configure:5297: checking for ${ncn_progname} in $with_build_time_tools" >&5 + { echo "$as_me:$LINENO: checking for ${ncn_progname} in $with_build_time_tools" >&5 +echo $ECHO_N "checking for ${ncn_progname} in $with_build_time_tools... $ECHO_C" >&6; } if test -x $with_build_time_tools/${ncn_progname}; then ac_cv_prog_AR_FOR_TARGET=$with_build_time_tools/${ncn_progname} - echo "$ac_t""yes" 1>&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } break else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi done fi @@ -5309,69 +7714,85 @@ if test -n "$ncn_target_tool_prefix"; then # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5314: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_AR_FOR_TARGET'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_AR_FOR_TARGET+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$AR_FOR_TARGET"; then ac_cv_prog_AR_FOR_TARGET="$AR_FOR_TARGET" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_AR_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" - break - fi - done - IFS="$ac_save_ifs" +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_AR_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + fi fi -AR_FOR_TARGET="$ac_cv_prog_AR_FOR_TARGET" +AR_FOR_TARGET=$ac_cv_prog_AR_FOR_TARGET if test -n "$AR_FOR_TARGET"; then - echo "$ac_t""$AR_FOR_TARGET" 1>&6 + { echo "$as_me:$LINENO: result: $AR_FOR_TARGET" >&5 +echo "${ECHO_T}$AR_FOR_TARGET" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_AR_FOR_TARGET" && test $build = $target ; then # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5345: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_AR_FOR_TARGET'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_AR_FOR_TARGET+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$AR_FOR_TARGET"; then ac_cv_prog_AR_FOR_TARGET="$AR_FOR_TARGET" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_AR_FOR_TARGET="${ncn_progname}" - break - fi - done - IFS="$ac_save_ifs" +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_AR_FOR_TARGET="${ncn_progname}" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + fi fi -AR_FOR_TARGET="$ac_cv_prog_AR_FOR_TARGET" +AR_FOR_TARGET=$ac_cv_prog_AR_FOR_TARGET if test -n "$AR_FOR_TARGET"; then - echo "$ac_t""$AR_FOR_TARGET" 1>&6 + { echo "$as_me:$LINENO: result: $AR_FOR_TARGET" >&5 +echo "${ECHO_T}$AR_FOR_TARGET" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - + + fi test -n "$ac_cv_prog_AR_FOR_TARGET" && break done fi - + if test -z "$ac_cv_prog_AR_FOR_TARGET" ; then set dummy ar if test $build = $target ; then @@ -5392,14 +7813,16 @@ if test -z "$ac_cv_path_AS_FOR_TARGET" ; then if test -n "$with_build_time_tools"; then - echo $ac_n "checking for as in $with_build_time_tools""... $ac_c" 1>&6 -echo "configure:5397: checking for as in $with_build_time_tools" >&5 + { echo "$as_me:$LINENO: checking for as in $with_build_time_tools" >&5 +echo $ECHO_N "checking for as in $with_build_time_tools... $ECHO_C" >&6; } if test -x $with_build_time_tools/as; then AS_FOR_TARGET=`cd $with_build_time_tools && pwd`/as ac_cv_path_AS_FOR_TARGET=$AS_FOR_TARGET - echo "$ac_t""$ac_cv_path_AS_FOR_TARGET" 1>&6 + { echo "$as_me:$LINENO: result: $ac_cv_path_AS_FOR_TARGET" >&5 +echo "${ECHO_T}$ac_cv_path_AS_FOR_TARGET" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi elif test $build != $host && test $have_gcc_for_target = yes; then AS_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=as` @@ -5410,51 +7833,58 @@ if test -z "$ac_cv_path_AS_FOR_TARGET" ; then # Extract the first word of "as", so it can be a program name with args. set dummy as; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5415: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_AS_FOR_TARGET'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_AS_FOR_TARGET+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - case "$AS_FOR_TARGET" in - /*) + case $AS_FOR_TARGET in + [\\/]* | ?:[\\/]*) ac_cv_path_AS_FOR_TARGET="$AS_FOR_TARGET" # Let the user override the test with a path. ;; - ?:/*) - ac_cv_path_AS_FOR_TARGET="$AS_FOR_TARGET" # Let the user override the test with a dos path. - ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$gcc_cv_tool_dirs" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_AS_FOR_TARGET="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $gcc_cv_tool_dirs +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_AS_FOR_TARGET="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + ;; esac fi -AS_FOR_TARGET="$ac_cv_path_AS_FOR_TARGET" +AS_FOR_TARGET=$ac_cv_path_AS_FOR_TARGET if test -n "$AS_FOR_TARGET"; then - echo "$ac_t""$AS_FOR_TARGET" 1>&6 + { echo "$as_me:$LINENO: result: $AS_FOR_TARGET" >&5 +echo "${ECHO_T}$AS_FOR_TARGET" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_path_AS_FOR_TARGET" ; then if test -n "$with_build_time_tools"; then for ncn_progname in as; do - echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6 -echo "configure:5452: checking for ${ncn_progname} in $with_build_time_tools" >&5 + { echo "$as_me:$LINENO: checking for ${ncn_progname} in $with_build_time_tools" >&5 +echo $ECHO_N "checking for ${ncn_progname} in $with_build_time_tools... $ECHO_C" >&6; } if test -x $with_build_time_tools/${ncn_progname}; then ac_cv_prog_AS_FOR_TARGET=$with_build_time_tools/${ncn_progname} - echo "$ac_t""yes" 1>&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } break else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi done fi @@ -5464,69 +7894,85 @@ if test -n "$ncn_target_tool_prefix"; then # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5469: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_AS_FOR_TARGET'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_AS_FOR_TARGET+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$AS_FOR_TARGET"; then ac_cv_prog_AS_FOR_TARGET="$AS_FOR_TARGET" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_AS_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" - break - fi - done - IFS="$ac_save_ifs" +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_AS_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + fi fi -AS_FOR_TARGET="$ac_cv_prog_AS_FOR_TARGET" +AS_FOR_TARGET=$ac_cv_prog_AS_FOR_TARGET if test -n "$AS_FOR_TARGET"; then - echo "$ac_t""$AS_FOR_TARGET" 1>&6 + { echo "$as_me:$LINENO: result: $AS_FOR_TARGET" >&5 +echo "${ECHO_T}$AS_FOR_TARGET" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_AS_FOR_TARGET" && test $build = $target ; then # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5500: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_AS_FOR_TARGET'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_AS_FOR_TARGET+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$AS_FOR_TARGET"; then ac_cv_prog_AS_FOR_TARGET="$AS_FOR_TARGET" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_AS_FOR_TARGET="${ncn_progname}" - break - fi - done - IFS="$ac_save_ifs" +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_AS_FOR_TARGET="${ncn_progname}" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + fi fi -AS_FOR_TARGET="$ac_cv_prog_AS_FOR_TARGET" +AS_FOR_TARGET=$ac_cv_prog_AS_FOR_TARGET if test -n "$AS_FOR_TARGET"; then - echo "$ac_t""$AS_FOR_TARGET" 1>&6 + { echo "$as_me:$LINENO: result: $AS_FOR_TARGET" >&5 +echo "${ECHO_T}$AS_FOR_TARGET" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - + + fi test -n "$ac_cv_prog_AS_FOR_TARGET" && break done fi - + if test -z "$ac_cv_prog_AS_FOR_TARGET" ; then set dummy as if test $build = $target ; then @@ -5547,14 +7993,16 @@ if test -z "$ac_cv_path_DLLTOOL_FOR_TARGET" ; then if test -n "$with_build_time_tools"; then - echo $ac_n "checking for dlltool in $with_build_time_tools""... $ac_c" 1>&6 -echo "configure:5552: checking for dlltool in $with_build_time_tools" >&5 + { echo "$as_me:$LINENO: checking for dlltool in $with_build_time_tools" >&5 +echo $ECHO_N "checking for dlltool in $with_build_time_tools... $ECHO_C" >&6; } if test -x $with_build_time_tools/dlltool; then DLLTOOL_FOR_TARGET=`cd $with_build_time_tools && pwd`/dlltool ac_cv_path_DLLTOOL_FOR_TARGET=$DLLTOOL_FOR_TARGET - echo "$ac_t""$ac_cv_path_DLLTOOL_FOR_TARGET" 1>&6 + { echo "$as_me:$LINENO: result: $ac_cv_path_DLLTOOL_FOR_TARGET" >&5 +echo "${ECHO_T}$ac_cv_path_DLLTOOL_FOR_TARGET" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi elif test $build != $host && test $have_gcc_for_target = yes; then DLLTOOL_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=dlltool` @@ -5565,51 +8013,58 @@ if test -z "$ac_cv_path_DLLTOOL_FOR_TARGET" ; then # Extract the first word of "dlltool", so it can be a program name with args. set dummy dlltool; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5570: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_DLLTOOL_FOR_TARGET'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_DLLTOOL_FOR_TARGET+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - case "$DLLTOOL_FOR_TARGET" in - /*) + case $DLLTOOL_FOR_TARGET in + [\\/]* | ?:[\\/]*) ac_cv_path_DLLTOOL_FOR_TARGET="$DLLTOOL_FOR_TARGET" # Let the user override the test with a path. ;; - ?:/*) - ac_cv_path_DLLTOOL_FOR_TARGET="$DLLTOOL_FOR_TARGET" # Let the user override the test with a dos path. - ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$gcc_cv_tool_dirs" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_DLLTOOL_FOR_TARGET="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $gcc_cv_tool_dirs +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_DLLTOOL_FOR_TARGET="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + ;; esac fi -DLLTOOL_FOR_TARGET="$ac_cv_path_DLLTOOL_FOR_TARGET" +DLLTOOL_FOR_TARGET=$ac_cv_path_DLLTOOL_FOR_TARGET if test -n "$DLLTOOL_FOR_TARGET"; then - echo "$ac_t""$DLLTOOL_FOR_TARGET" 1>&6 + { echo "$as_me:$LINENO: result: $DLLTOOL_FOR_TARGET" >&5 +echo "${ECHO_T}$DLLTOOL_FOR_TARGET" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_path_DLLTOOL_FOR_TARGET" ; then if test -n "$with_build_time_tools"; then for ncn_progname in dlltool; do - echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6 -echo "configure:5607: checking for ${ncn_progname} in $with_build_time_tools" >&5 + { echo "$as_me:$LINENO: checking for ${ncn_progname} in $with_build_time_tools" >&5 +echo $ECHO_N "checking for ${ncn_progname} in $with_build_time_tools... $ECHO_C" >&6; } if test -x $with_build_time_tools/${ncn_progname}; then ac_cv_prog_DLLTOOL_FOR_TARGET=$with_build_time_tools/${ncn_progname} - echo "$ac_t""yes" 1>&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } break else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi done fi @@ -5619,69 +8074,85 @@ if test -n "$ncn_target_tool_prefix"; then # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5624: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL_FOR_TARGET'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_DLLTOOL_FOR_TARGET+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$DLLTOOL_FOR_TARGET"; then ac_cv_prog_DLLTOOL_FOR_TARGET="$DLLTOOL_FOR_TARGET" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_DLLTOOL_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" - break - fi - done - IFS="$ac_save_ifs" +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_DLLTOOL_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + fi fi -DLLTOOL_FOR_TARGET="$ac_cv_prog_DLLTOOL_FOR_TARGET" +DLLTOOL_FOR_TARGET=$ac_cv_prog_DLLTOOL_FOR_TARGET if test -n "$DLLTOOL_FOR_TARGET"; then - echo "$ac_t""$DLLTOOL_FOR_TARGET" 1>&6 + { echo "$as_me:$LINENO: result: $DLLTOOL_FOR_TARGET" >&5 +echo "${ECHO_T}$DLLTOOL_FOR_TARGET" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_DLLTOOL_FOR_TARGET" && test $build = $target ; then # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5655: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL_FOR_TARGET'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_DLLTOOL_FOR_TARGET+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$DLLTOOL_FOR_TARGET"; then ac_cv_prog_DLLTOOL_FOR_TARGET="$DLLTOOL_FOR_TARGET" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_DLLTOOL_FOR_TARGET="${ncn_progname}" - break - fi - done - IFS="$ac_save_ifs" +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_DLLTOOL_FOR_TARGET="${ncn_progname}" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + fi fi -DLLTOOL_FOR_TARGET="$ac_cv_prog_DLLTOOL_FOR_TARGET" +DLLTOOL_FOR_TARGET=$ac_cv_prog_DLLTOOL_FOR_TARGET if test -n "$DLLTOOL_FOR_TARGET"; then - echo "$ac_t""$DLLTOOL_FOR_TARGET" 1>&6 + { echo "$as_me:$LINENO: result: $DLLTOOL_FOR_TARGET" >&5 +echo "${ECHO_T}$DLLTOOL_FOR_TARGET" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - + + fi test -n "$ac_cv_prog_DLLTOOL_FOR_TARGET" && break done fi - + if test -z "$ac_cv_prog_DLLTOOL_FOR_TARGET" ; then set dummy dlltool if test $build = $target ; then @@ -5702,14 +8173,16 @@ if test -z "$ac_cv_path_LD_FOR_TARGET" ; then if test -n "$with_build_time_tools"; then - echo $ac_n "checking for ld in $with_build_time_tools""... $ac_c" 1>&6 -echo "configure:5707: checking for ld in $with_build_time_tools" >&5 + { echo "$as_me:$LINENO: checking for ld in $with_build_time_tools" >&5 +echo $ECHO_N "checking for ld in $with_build_time_tools... $ECHO_C" >&6; } if test -x $with_build_time_tools/ld; then LD_FOR_TARGET=`cd $with_build_time_tools && pwd`/ld ac_cv_path_LD_FOR_TARGET=$LD_FOR_TARGET - echo "$ac_t""$ac_cv_path_LD_FOR_TARGET" 1>&6 + { echo "$as_me:$LINENO: result: $ac_cv_path_LD_FOR_TARGET" >&5 +echo "${ECHO_T}$ac_cv_path_LD_FOR_TARGET" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi elif test $build != $host && test $have_gcc_for_target = yes; then LD_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=ld` @@ -5720,51 +8193,58 @@ if test -z "$ac_cv_path_LD_FOR_TARGET" ; then # Extract the first word of "ld", so it can be a program name with args. set dummy ld; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5725: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_LD_FOR_TARGET'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_LD_FOR_TARGET+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - case "$LD_FOR_TARGET" in - /*) + case $LD_FOR_TARGET in + [\\/]* | ?:[\\/]*) ac_cv_path_LD_FOR_TARGET="$LD_FOR_TARGET" # Let the user override the test with a path. ;; - ?:/*) - ac_cv_path_LD_FOR_TARGET="$LD_FOR_TARGET" # Let the user override the test with a dos path. - ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$gcc_cv_tool_dirs" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_LD_FOR_TARGET="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $gcc_cv_tool_dirs +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_LD_FOR_TARGET="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + ;; esac fi -LD_FOR_TARGET="$ac_cv_path_LD_FOR_TARGET" +LD_FOR_TARGET=$ac_cv_path_LD_FOR_TARGET if test -n "$LD_FOR_TARGET"; then - echo "$ac_t""$LD_FOR_TARGET" 1>&6 + { echo "$as_me:$LINENO: result: $LD_FOR_TARGET" >&5 +echo "${ECHO_T}$LD_FOR_TARGET" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_path_LD_FOR_TARGET" ; then if test -n "$with_build_time_tools"; then for ncn_progname in ld; do - echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6 -echo "configure:5762: checking for ${ncn_progname} in $with_build_time_tools" >&5 + { echo "$as_me:$LINENO: checking for ${ncn_progname} in $with_build_time_tools" >&5 +echo $ECHO_N "checking for ${ncn_progname} in $with_build_time_tools... $ECHO_C" >&6; } if test -x $with_build_time_tools/${ncn_progname}; then ac_cv_prog_LD_FOR_TARGET=$with_build_time_tools/${ncn_progname} - echo "$ac_t""yes" 1>&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } break else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi done fi @@ -5774,69 +8254,85 @@ if test -n "$ncn_target_tool_prefix"; then # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5779: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_LD_FOR_TARGET'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_LD_FOR_TARGET+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$LD_FOR_TARGET"; then ac_cv_prog_LD_FOR_TARGET="$LD_FOR_TARGET" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_LD_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" - break - fi - done - IFS="$ac_save_ifs" +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_LD_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + fi fi -LD_FOR_TARGET="$ac_cv_prog_LD_FOR_TARGET" +LD_FOR_TARGET=$ac_cv_prog_LD_FOR_TARGET if test -n "$LD_FOR_TARGET"; then - echo "$ac_t""$LD_FOR_TARGET" 1>&6 + { echo "$as_me:$LINENO: result: $LD_FOR_TARGET" >&5 +echo "${ECHO_T}$LD_FOR_TARGET" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_LD_FOR_TARGET" && test $build = $target ; then # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5810: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_LD_FOR_TARGET'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_LD_FOR_TARGET+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$LD_FOR_TARGET"; then ac_cv_prog_LD_FOR_TARGET="$LD_FOR_TARGET" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_LD_FOR_TARGET="${ncn_progname}" - break - fi - done - IFS="$ac_save_ifs" +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_LD_FOR_TARGET="${ncn_progname}" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + fi fi -LD_FOR_TARGET="$ac_cv_prog_LD_FOR_TARGET" +LD_FOR_TARGET=$ac_cv_prog_LD_FOR_TARGET if test -n "$LD_FOR_TARGET"; then - echo "$ac_t""$LD_FOR_TARGET" 1>&6 + { echo "$as_me:$LINENO: result: $LD_FOR_TARGET" >&5 +echo "${ECHO_T}$LD_FOR_TARGET" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - + + fi test -n "$ac_cv_prog_LD_FOR_TARGET" && break done fi - + if test -z "$ac_cv_prog_LD_FOR_TARGET" ; then set dummy ld if test $build = $target ; then @@ -5857,14 +8353,16 @@ if test -z "$ac_cv_path_LIPO_FOR_TARGET" ; then if test -n "$with_build_time_tools"; then - echo $ac_n "checking for lipo in $with_build_time_tools""... $ac_c" 1>&6 -echo "configure:5862: checking for lipo in $with_build_time_tools" >&5 + { echo "$as_me:$LINENO: checking for lipo in $with_build_time_tools" >&5 +echo $ECHO_N "checking for lipo in $with_build_time_tools... $ECHO_C" >&6; } if test -x $with_build_time_tools/lipo; then LIPO_FOR_TARGET=`cd $with_build_time_tools && pwd`/lipo ac_cv_path_LIPO_FOR_TARGET=$LIPO_FOR_TARGET - echo "$ac_t""$ac_cv_path_LIPO_FOR_TARGET" 1>&6 + { echo "$as_me:$LINENO: result: $ac_cv_path_LIPO_FOR_TARGET" >&5 +echo "${ECHO_T}$ac_cv_path_LIPO_FOR_TARGET" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi elif test $build != $host && test $have_gcc_for_target = yes; then LIPO_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=lipo` @@ -5875,51 +8373,58 @@ if test -z "$ac_cv_path_LIPO_FOR_TARGET" ; then # Extract the first word of "lipo", so it can be a program name with args. set dummy lipo; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5880: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_LIPO_FOR_TARGET'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_LIPO_FOR_TARGET+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - case "$LIPO_FOR_TARGET" in - /*) + case $LIPO_FOR_TARGET in + [\\/]* | ?:[\\/]*) ac_cv_path_LIPO_FOR_TARGET="$LIPO_FOR_TARGET" # Let the user override the test with a path. ;; - ?:/*) - ac_cv_path_LIPO_FOR_TARGET="$LIPO_FOR_TARGET" # Let the user override the test with a dos path. - ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$gcc_cv_tool_dirs" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_LIPO_FOR_TARGET="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $gcc_cv_tool_dirs +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_LIPO_FOR_TARGET="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + ;; esac fi -LIPO_FOR_TARGET="$ac_cv_path_LIPO_FOR_TARGET" +LIPO_FOR_TARGET=$ac_cv_path_LIPO_FOR_TARGET if test -n "$LIPO_FOR_TARGET"; then - echo "$ac_t""$LIPO_FOR_TARGET" 1>&6 + { echo "$as_me:$LINENO: result: $LIPO_FOR_TARGET" >&5 +echo "${ECHO_T}$LIPO_FOR_TARGET" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_path_LIPO_FOR_TARGET" ; then if test -n "$with_build_time_tools"; then for ncn_progname in lipo; do - echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6 -echo "configure:5917: checking for ${ncn_progname} in $with_build_time_tools" >&5 + { echo "$as_me:$LINENO: checking for ${ncn_progname} in $with_build_time_tools" >&5 +echo $ECHO_N "checking for ${ncn_progname} in $with_build_time_tools... $ECHO_C" >&6; } if test -x $with_build_time_tools/${ncn_progname}; then ac_cv_prog_LIPO_FOR_TARGET=$with_build_time_tools/${ncn_progname} - echo "$ac_t""yes" 1>&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } break else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi done fi @@ -5929,69 +8434,85 @@ if test -n "$ncn_target_tool_prefix"; then # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5934: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_LIPO_FOR_TARGET'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_LIPO_FOR_TARGET+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$LIPO_FOR_TARGET"; then ac_cv_prog_LIPO_FOR_TARGET="$LIPO_FOR_TARGET" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_LIPO_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" - break - fi - done - IFS="$ac_save_ifs" +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_LIPO_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + fi fi -LIPO_FOR_TARGET="$ac_cv_prog_LIPO_FOR_TARGET" +LIPO_FOR_TARGET=$ac_cv_prog_LIPO_FOR_TARGET if test -n "$LIPO_FOR_TARGET"; then - echo "$ac_t""$LIPO_FOR_TARGET" 1>&6 + { echo "$as_me:$LINENO: result: $LIPO_FOR_TARGET" >&5 +echo "${ECHO_T}$LIPO_FOR_TARGET" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_LIPO_FOR_TARGET" && test $build = $target ; then # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5965: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_LIPO_FOR_TARGET'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_LIPO_FOR_TARGET+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$LIPO_FOR_TARGET"; then ac_cv_prog_LIPO_FOR_TARGET="$LIPO_FOR_TARGET" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_LIPO_FOR_TARGET="${ncn_progname}" - break - fi - done - IFS="$ac_save_ifs" +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_LIPO_FOR_TARGET="${ncn_progname}" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + fi fi -LIPO_FOR_TARGET="$ac_cv_prog_LIPO_FOR_TARGET" +LIPO_FOR_TARGET=$ac_cv_prog_LIPO_FOR_TARGET if test -n "$LIPO_FOR_TARGET"; then - echo "$ac_t""$LIPO_FOR_TARGET" 1>&6 + { echo "$as_me:$LINENO: result: $LIPO_FOR_TARGET" >&5 +echo "${ECHO_T}$LIPO_FOR_TARGET" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - + + fi test -n "$ac_cv_prog_LIPO_FOR_TARGET" && break done fi - + if test -z "$ac_cv_prog_LIPO_FOR_TARGET" ; then set dummy lipo if test $build = $target ; then @@ -6012,14 +8533,16 @@ if test -z "$ac_cv_path_NM_FOR_TARGET" ; then if test -n "$with_build_time_tools"; then - echo $ac_n "checking for nm in $with_build_time_tools""... $ac_c" 1>&6 -echo "configure:6017: checking for nm in $with_build_time_tools" >&5 + { echo "$as_me:$LINENO: checking for nm in $with_build_time_tools" >&5 +echo $ECHO_N "checking for nm in $with_build_time_tools... $ECHO_C" >&6; } if test -x $with_build_time_tools/nm; then NM_FOR_TARGET=`cd $with_build_time_tools && pwd`/nm ac_cv_path_NM_FOR_TARGET=$NM_FOR_TARGET - echo "$ac_t""$ac_cv_path_NM_FOR_TARGET" 1>&6 + { echo "$as_me:$LINENO: result: $ac_cv_path_NM_FOR_TARGET" >&5 +echo "${ECHO_T}$ac_cv_path_NM_FOR_TARGET" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi elif test $build != $host && test $have_gcc_for_target = yes; then NM_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=nm` @@ -6030,51 +8553,58 @@ if test -z "$ac_cv_path_NM_FOR_TARGET" ; then # Extract the first word of "nm", so it can be a program name with args. set dummy nm; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6035: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_NM_FOR_TARGET'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_NM_FOR_TARGET+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - case "$NM_FOR_TARGET" in - /*) + case $NM_FOR_TARGET in + [\\/]* | ?:[\\/]*) ac_cv_path_NM_FOR_TARGET="$NM_FOR_TARGET" # Let the user override the test with a path. ;; - ?:/*) - ac_cv_path_NM_FOR_TARGET="$NM_FOR_TARGET" # Let the user override the test with a dos path. - ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$gcc_cv_tool_dirs" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_NM_FOR_TARGET="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $gcc_cv_tool_dirs +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_NM_FOR_TARGET="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + ;; esac fi -NM_FOR_TARGET="$ac_cv_path_NM_FOR_TARGET" +NM_FOR_TARGET=$ac_cv_path_NM_FOR_TARGET if test -n "$NM_FOR_TARGET"; then - echo "$ac_t""$NM_FOR_TARGET" 1>&6 + { echo "$as_me:$LINENO: result: $NM_FOR_TARGET" >&5 +echo "${ECHO_T}$NM_FOR_TARGET" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_path_NM_FOR_TARGET" ; then if test -n "$with_build_time_tools"; then for ncn_progname in nm; do - echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6 -echo "configure:6072: checking for ${ncn_progname} in $with_build_time_tools" >&5 + { echo "$as_me:$LINENO: checking for ${ncn_progname} in $with_build_time_tools" >&5 +echo $ECHO_N "checking for ${ncn_progname} in $with_build_time_tools... $ECHO_C" >&6; } if test -x $with_build_time_tools/${ncn_progname}; then ac_cv_prog_NM_FOR_TARGET=$with_build_time_tools/${ncn_progname} - echo "$ac_t""yes" 1>&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } break else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi done fi @@ -6084,69 +8614,85 @@ if test -n "$ncn_target_tool_prefix"; then # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6089: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_NM_FOR_TARGET'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_NM_FOR_TARGET+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$NM_FOR_TARGET"; then ac_cv_prog_NM_FOR_TARGET="$NM_FOR_TARGET" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_NM_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" - break - fi - done - IFS="$ac_save_ifs" +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_NM_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + fi fi -NM_FOR_TARGET="$ac_cv_prog_NM_FOR_TARGET" +NM_FOR_TARGET=$ac_cv_prog_NM_FOR_TARGET if test -n "$NM_FOR_TARGET"; then - echo "$ac_t""$NM_FOR_TARGET" 1>&6 + { echo "$as_me:$LINENO: result: $NM_FOR_TARGET" >&5 +echo "${ECHO_T}$NM_FOR_TARGET" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_NM_FOR_TARGET" && test $build = $target ; then # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6120: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_NM_FOR_TARGET'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_NM_FOR_TARGET+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$NM_FOR_TARGET"; then ac_cv_prog_NM_FOR_TARGET="$NM_FOR_TARGET" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_NM_FOR_TARGET="${ncn_progname}" - break - fi - done - IFS="$ac_save_ifs" +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_NM_FOR_TARGET="${ncn_progname}" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + fi fi -NM_FOR_TARGET="$ac_cv_prog_NM_FOR_TARGET" +NM_FOR_TARGET=$ac_cv_prog_NM_FOR_TARGET if test -n "$NM_FOR_TARGET"; then - echo "$ac_t""$NM_FOR_TARGET" 1>&6 + { echo "$as_me:$LINENO: result: $NM_FOR_TARGET" >&5 +echo "${ECHO_T}$NM_FOR_TARGET" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - + + fi test -n "$ac_cv_prog_NM_FOR_TARGET" && break done fi - + if test -z "$ac_cv_prog_NM_FOR_TARGET" ; then set dummy nm if test $build = $target ; then @@ -6167,14 +8713,16 @@ if test -z "$ac_cv_path_OBJDUMP_FOR_TARGET" ; then if test -n "$with_build_time_tools"; then - echo $ac_n "checking for objdump in $with_build_time_tools""... $ac_c" 1>&6 -echo "configure:6172: checking for objdump in $with_build_time_tools" >&5 + { echo "$as_me:$LINENO: checking for objdump in $with_build_time_tools" >&5 +echo $ECHO_N "checking for objdump in $with_build_time_tools... $ECHO_C" >&6; } if test -x $with_build_time_tools/objdump; then OBJDUMP_FOR_TARGET=`cd $with_build_time_tools && pwd`/objdump ac_cv_path_OBJDUMP_FOR_TARGET=$OBJDUMP_FOR_TARGET - echo "$ac_t""$ac_cv_path_OBJDUMP_FOR_TARGET" 1>&6 + { echo "$as_me:$LINENO: result: $ac_cv_path_OBJDUMP_FOR_TARGET" >&5 +echo "${ECHO_T}$ac_cv_path_OBJDUMP_FOR_TARGET" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi elif test $build != $host && test $have_gcc_for_target = yes; then OBJDUMP_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=objdump` @@ -6185,51 +8733,58 @@ if test -z "$ac_cv_path_OBJDUMP_FOR_TARGET" ; then # Extract the first word of "objdump", so it can be a program name with args. set dummy objdump; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6190: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_OBJDUMP_FOR_TARGET'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_OBJDUMP_FOR_TARGET+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - case "$OBJDUMP_FOR_TARGET" in - /*) + case $OBJDUMP_FOR_TARGET in + [\\/]* | ?:[\\/]*) ac_cv_path_OBJDUMP_FOR_TARGET="$OBJDUMP_FOR_TARGET" # Let the user override the test with a path. ;; - ?:/*) - ac_cv_path_OBJDUMP_FOR_TARGET="$OBJDUMP_FOR_TARGET" # Let the user override the test with a dos path. - ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$gcc_cv_tool_dirs" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_OBJDUMP_FOR_TARGET="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $gcc_cv_tool_dirs +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_OBJDUMP_FOR_TARGET="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + ;; esac fi -OBJDUMP_FOR_TARGET="$ac_cv_path_OBJDUMP_FOR_TARGET" +OBJDUMP_FOR_TARGET=$ac_cv_path_OBJDUMP_FOR_TARGET if test -n "$OBJDUMP_FOR_TARGET"; then - echo "$ac_t""$OBJDUMP_FOR_TARGET" 1>&6 + { echo "$as_me:$LINENO: result: $OBJDUMP_FOR_TARGET" >&5 +echo "${ECHO_T}$OBJDUMP_FOR_TARGET" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_path_OBJDUMP_FOR_TARGET" ; then if test -n "$with_build_time_tools"; then for ncn_progname in objdump; do - echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6 -echo "configure:6227: checking for ${ncn_progname} in $with_build_time_tools" >&5 + { echo "$as_me:$LINENO: checking for ${ncn_progname} in $with_build_time_tools" >&5 +echo $ECHO_N "checking for ${ncn_progname} in $with_build_time_tools... $ECHO_C" >&6; } if test -x $with_build_time_tools/${ncn_progname}; then ac_cv_prog_OBJDUMP_FOR_TARGET=$with_build_time_tools/${ncn_progname} - echo "$ac_t""yes" 1>&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } break else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi done fi @@ -6239,69 +8794,85 @@ if test -n "$ncn_target_tool_prefix"; then # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6244: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP_FOR_TARGET'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_OBJDUMP_FOR_TARGET+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$OBJDUMP_FOR_TARGET"; then ac_cv_prog_OBJDUMP_FOR_TARGET="$OBJDUMP_FOR_TARGET" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_OBJDUMP_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" - break - fi - done - IFS="$ac_save_ifs" +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_OBJDUMP_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + fi fi -OBJDUMP_FOR_TARGET="$ac_cv_prog_OBJDUMP_FOR_TARGET" +OBJDUMP_FOR_TARGET=$ac_cv_prog_OBJDUMP_FOR_TARGET if test -n "$OBJDUMP_FOR_TARGET"; then - echo "$ac_t""$OBJDUMP_FOR_TARGET" 1>&6 + { echo "$as_me:$LINENO: result: $OBJDUMP_FOR_TARGET" >&5 +echo "${ECHO_T}$OBJDUMP_FOR_TARGET" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_OBJDUMP_FOR_TARGET" && test $build = $target ; then # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6275: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP_FOR_TARGET'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_OBJDUMP_FOR_TARGET+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$OBJDUMP_FOR_TARGET"; then ac_cv_prog_OBJDUMP_FOR_TARGET="$OBJDUMP_FOR_TARGET" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_OBJDUMP_FOR_TARGET="${ncn_progname}" - break - fi - done - IFS="$ac_save_ifs" +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_OBJDUMP_FOR_TARGET="${ncn_progname}" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + fi fi -OBJDUMP_FOR_TARGET="$ac_cv_prog_OBJDUMP_FOR_TARGET" +OBJDUMP_FOR_TARGET=$ac_cv_prog_OBJDUMP_FOR_TARGET if test -n "$OBJDUMP_FOR_TARGET"; then - echo "$ac_t""$OBJDUMP_FOR_TARGET" 1>&6 + { echo "$as_me:$LINENO: result: $OBJDUMP_FOR_TARGET" >&5 +echo "${ECHO_T}$OBJDUMP_FOR_TARGET" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - + + fi test -n "$ac_cv_prog_OBJDUMP_FOR_TARGET" && break done fi - + if test -z "$ac_cv_prog_OBJDUMP_FOR_TARGET" ; then set dummy objdump if test $build = $target ; then @@ -6322,14 +8893,16 @@ if test -z "$ac_cv_path_RANLIB_FOR_TARGET" ; then if test -n "$with_build_time_tools"; then - echo $ac_n "checking for ranlib in $with_build_time_tools""... $ac_c" 1>&6 -echo "configure:6327: checking for ranlib in $with_build_time_tools" >&5 + { echo "$as_me:$LINENO: checking for ranlib in $with_build_time_tools" >&5 +echo $ECHO_N "checking for ranlib in $with_build_time_tools... $ECHO_C" >&6; } if test -x $with_build_time_tools/ranlib; then RANLIB_FOR_TARGET=`cd $with_build_time_tools && pwd`/ranlib ac_cv_path_RANLIB_FOR_TARGET=$RANLIB_FOR_TARGET - echo "$ac_t""$ac_cv_path_RANLIB_FOR_TARGET" 1>&6 + { echo "$as_me:$LINENO: result: $ac_cv_path_RANLIB_FOR_TARGET" >&5 +echo "${ECHO_T}$ac_cv_path_RANLIB_FOR_TARGET" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi elif test $build != $host && test $have_gcc_for_target = yes; then RANLIB_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=ranlib` @@ -6340,51 +8913,58 @@ if test -z "$ac_cv_path_RANLIB_FOR_TARGET" ; then # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6345: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_RANLIB_FOR_TARGET'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_RANLIB_FOR_TARGET+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - case "$RANLIB_FOR_TARGET" in - /*) + case $RANLIB_FOR_TARGET in + [\\/]* | ?:[\\/]*) ac_cv_path_RANLIB_FOR_TARGET="$RANLIB_FOR_TARGET" # Let the user override the test with a path. ;; - ?:/*) - ac_cv_path_RANLIB_FOR_TARGET="$RANLIB_FOR_TARGET" # Let the user override the test with a dos path. - ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$gcc_cv_tool_dirs" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_RANLIB_FOR_TARGET="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $gcc_cv_tool_dirs +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_RANLIB_FOR_TARGET="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + ;; esac fi -RANLIB_FOR_TARGET="$ac_cv_path_RANLIB_FOR_TARGET" +RANLIB_FOR_TARGET=$ac_cv_path_RANLIB_FOR_TARGET if test -n "$RANLIB_FOR_TARGET"; then - echo "$ac_t""$RANLIB_FOR_TARGET" 1>&6 + { echo "$as_me:$LINENO: result: $RANLIB_FOR_TARGET" >&5 +echo "${ECHO_T}$RANLIB_FOR_TARGET" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_path_RANLIB_FOR_TARGET" ; then if test -n "$with_build_time_tools"; then for ncn_progname in ranlib; do - echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6 -echo "configure:6382: checking for ${ncn_progname} in $with_build_time_tools" >&5 + { echo "$as_me:$LINENO: checking for ${ncn_progname} in $with_build_time_tools" >&5 +echo $ECHO_N "checking for ${ncn_progname} in $with_build_time_tools... $ECHO_C" >&6; } if test -x $with_build_time_tools/${ncn_progname}; then ac_cv_prog_RANLIB_FOR_TARGET=$with_build_time_tools/${ncn_progname} - echo "$ac_t""yes" 1>&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } break else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi done fi @@ -6394,69 +8974,85 @@ if test -n "$ncn_target_tool_prefix"; then # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6399: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_RANLIB_FOR_TARGET'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_RANLIB_FOR_TARGET+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$RANLIB_FOR_TARGET"; then ac_cv_prog_RANLIB_FOR_TARGET="$RANLIB_FOR_TARGET" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_RANLIB_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" - break - fi - done - IFS="$ac_save_ifs" +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_RANLIB_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + fi fi -RANLIB_FOR_TARGET="$ac_cv_prog_RANLIB_FOR_TARGET" +RANLIB_FOR_TARGET=$ac_cv_prog_RANLIB_FOR_TARGET if test -n "$RANLIB_FOR_TARGET"; then - echo "$ac_t""$RANLIB_FOR_TARGET" 1>&6 + { echo "$as_me:$LINENO: result: $RANLIB_FOR_TARGET" >&5 +echo "${ECHO_T}$RANLIB_FOR_TARGET" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_RANLIB_FOR_TARGET" && test $build = $target ; then # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6430: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_RANLIB_FOR_TARGET'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_RANLIB_FOR_TARGET+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$RANLIB_FOR_TARGET"; then ac_cv_prog_RANLIB_FOR_TARGET="$RANLIB_FOR_TARGET" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_RANLIB_FOR_TARGET="${ncn_progname}" - break - fi - done - IFS="$ac_save_ifs" +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_RANLIB_FOR_TARGET="${ncn_progname}" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + fi fi -RANLIB_FOR_TARGET="$ac_cv_prog_RANLIB_FOR_TARGET" +RANLIB_FOR_TARGET=$ac_cv_prog_RANLIB_FOR_TARGET if test -n "$RANLIB_FOR_TARGET"; then - echo "$ac_t""$RANLIB_FOR_TARGET" 1>&6 + { echo "$as_me:$LINENO: result: $RANLIB_FOR_TARGET" >&5 +echo "${ECHO_T}$RANLIB_FOR_TARGET" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - + + fi test -n "$ac_cv_prog_RANLIB_FOR_TARGET" && break done fi - + if test -z "$ac_cv_prog_RANLIB_FOR_TARGET" ; then set dummy ranlib if test $build = $target ; then @@ -6477,14 +9073,16 @@ if test -z "$ac_cv_path_STRIP_FOR_TARGET" ; then if test -n "$with_build_time_tools"; then - echo $ac_n "checking for strip in $with_build_time_tools""... $ac_c" 1>&6 -echo "configure:6482: checking for strip in $with_build_time_tools" >&5 + { echo "$as_me:$LINENO: checking for strip in $with_build_time_tools" >&5 +echo $ECHO_N "checking for strip in $with_build_time_tools... $ECHO_C" >&6; } if test -x $with_build_time_tools/strip; then STRIP_FOR_TARGET=`cd $with_build_time_tools && pwd`/strip ac_cv_path_STRIP_FOR_TARGET=$STRIP_FOR_TARGET - echo "$ac_t""$ac_cv_path_STRIP_FOR_TARGET" 1>&6 + { echo "$as_me:$LINENO: result: $ac_cv_path_STRIP_FOR_TARGET" >&5 +echo "${ECHO_T}$ac_cv_path_STRIP_FOR_TARGET" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi elif test $build != $host && test $have_gcc_for_target = yes; then STRIP_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=strip` @@ -6495,51 +9093,58 @@ if test -z "$ac_cv_path_STRIP_FOR_TARGET" ; then # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6500: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_STRIP_FOR_TARGET'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_STRIP_FOR_TARGET+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - case "$STRIP_FOR_TARGET" in - /*) + case $STRIP_FOR_TARGET in + [\\/]* | ?:[\\/]*) ac_cv_path_STRIP_FOR_TARGET="$STRIP_FOR_TARGET" # Let the user override the test with a path. ;; - ?:/*) - ac_cv_path_STRIP_FOR_TARGET="$STRIP_FOR_TARGET" # Let the user override the test with a dos path. - ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$gcc_cv_tool_dirs" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_STRIP_FOR_TARGET="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $gcc_cv_tool_dirs +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_STRIP_FOR_TARGET="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + ;; esac fi -STRIP_FOR_TARGET="$ac_cv_path_STRIP_FOR_TARGET" +STRIP_FOR_TARGET=$ac_cv_path_STRIP_FOR_TARGET if test -n "$STRIP_FOR_TARGET"; then - echo "$ac_t""$STRIP_FOR_TARGET" 1>&6 + { echo "$as_me:$LINENO: result: $STRIP_FOR_TARGET" >&5 +echo "${ECHO_T}$STRIP_FOR_TARGET" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_path_STRIP_FOR_TARGET" ; then if test -n "$with_build_time_tools"; then for ncn_progname in strip; do - echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6 -echo "configure:6537: checking for ${ncn_progname} in $with_build_time_tools" >&5 + { echo "$as_me:$LINENO: checking for ${ncn_progname} in $with_build_time_tools" >&5 +echo $ECHO_N "checking for ${ncn_progname} in $with_build_time_tools... $ECHO_C" >&6; } if test -x $with_build_time_tools/${ncn_progname}; then ac_cv_prog_STRIP_FOR_TARGET=$with_build_time_tools/${ncn_progname} - echo "$ac_t""yes" 1>&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } break else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi done fi @@ -6549,69 +9154,85 @@ if test -n "$ncn_target_tool_prefix"; then # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6554: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_STRIP_FOR_TARGET'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_STRIP_FOR_TARGET+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$STRIP_FOR_TARGET"; then ac_cv_prog_STRIP_FOR_TARGET="$STRIP_FOR_TARGET" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_STRIP_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" - break - fi - done - IFS="$ac_save_ifs" +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_STRIP_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + fi fi -STRIP_FOR_TARGET="$ac_cv_prog_STRIP_FOR_TARGET" +STRIP_FOR_TARGET=$ac_cv_prog_STRIP_FOR_TARGET if test -n "$STRIP_FOR_TARGET"; then - echo "$ac_t""$STRIP_FOR_TARGET" 1>&6 + { echo "$as_me:$LINENO: result: $STRIP_FOR_TARGET" >&5 +echo "${ECHO_T}$STRIP_FOR_TARGET" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_STRIP_FOR_TARGET" && test $build = $target ; then # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6585: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_STRIP_FOR_TARGET'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_STRIP_FOR_TARGET+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$STRIP_FOR_TARGET"; then ac_cv_prog_STRIP_FOR_TARGET="$STRIP_FOR_TARGET" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_STRIP_FOR_TARGET="${ncn_progname}" - break - fi - done - IFS="$ac_save_ifs" +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_STRIP_FOR_TARGET="${ncn_progname}" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + fi fi -STRIP_FOR_TARGET="$ac_cv_prog_STRIP_FOR_TARGET" +STRIP_FOR_TARGET=$ac_cv_prog_STRIP_FOR_TARGET if test -n "$STRIP_FOR_TARGET"; then - echo "$ac_t""$STRIP_FOR_TARGET" 1>&6 + { echo "$as_me:$LINENO: result: $STRIP_FOR_TARGET" >&5 +echo "${ECHO_T}$STRIP_FOR_TARGET" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - + + fi test -n "$ac_cv_prog_STRIP_FOR_TARGET" && break done fi - + if test -z "$ac_cv_prog_STRIP_FOR_TARGET" ; then set dummy strip if test $build = $target ; then @@ -6632,14 +9253,16 @@ if test -z "$ac_cv_path_WINDRES_FOR_TARGET" ; then if test -n "$with_build_time_tools"; then - echo $ac_n "checking for windres in $with_build_time_tools""... $ac_c" 1>&6 -echo "configure:6637: checking for windres in $with_build_time_tools" >&5 + { echo "$as_me:$LINENO: checking for windres in $with_build_time_tools" >&5 +echo $ECHO_N "checking for windres in $with_build_time_tools... $ECHO_C" >&6; } if test -x $with_build_time_tools/windres; then WINDRES_FOR_TARGET=`cd $with_build_time_tools && pwd`/windres ac_cv_path_WINDRES_FOR_TARGET=$WINDRES_FOR_TARGET - echo "$ac_t""$ac_cv_path_WINDRES_FOR_TARGET" 1>&6 + { echo "$as_me:$LINENO: result: $ac_cv_path_WINDRES_FOR_TARGET" >&5 +echo "${ECHO_T}$ac_cv_path_WINDRES_FOR_TARGET" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi elif test $build != $host && test $have_gcc_for_target = yes; then WINDRES_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=windres` @@ -6650,51 +9273,58 @@ if test -z "$ac_cv_path_WINDRES_FOR_TARGET" ; then # Extract the first word of "windres", so it can be a program name with args. set dummy windres; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6655: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_WINDRES_FOR_TARGET'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_WINDRES_FOR_TARGET+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - case "$WINDRES_FOR_TARGET" in - /*) + case $WINDRES_FOR_TARGET in + [\\/]* | ?:[\\/]*) ac_cv_path_WINDRES_FOR_TARGET="$WINDRES_FOR_TARGET" # Let the user override the test with a path. ;; - ?:/*) - ac_cv_path_WINDRES_FOR_TARGET="$WINDRES_FOR_TARGET" # Let the user override the test with a dos path. - ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$gcc_cv_tool_dirs" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_WINDRES_FOR_TARGET="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $gcc_cv_tool_dirs +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_WINDRES_FOR_TARGET="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + ;; esac fi -WINDRES_FOR_TARGET="$ac_cv_path_WINDRES_FOR_TARGET" +WINDRES_FOR_TARGET=$ac_cv_path_WINDRES_FOR_TARGET if test -n "$WINDRES_FOR_TARGET"; then - echo "$ac_t""$WINDRES_FOR_TARGET" 1>&6 + { echo "$as_me:$LINENO: result: $WINDRES_FOR_TARGET" >&5 +echo "${ECHO_T}$WINDRES_FOR_TARGET" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_path_WINDRES_FOR_TARGET" ; then if test -n "$with_build_time_tools"; then for ncn_progname in windres; do - echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6 -echo "configure:6692: checking for ${ncn_progname} in $with_build_time_tools" >&5 + { echo "$as_me:$LINENO: checking for ${ncn_progname} in $with_build_time_tools" >&5 +echo $ECHO_N "checking for ${ncn_progname} in $with_build_time_tools... $ECHO_C" >&6; } if test -x $with_build_time_tools/${ncn_progname}; then ac_cv_prog_WINDRES_FOR_TARGET=$with_build_time_tools/${ncn_progname} - echo "$ac_t""yes" 1>&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } break else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi done fi @@ -6704,69 +9334,85 @@ if test -n "$ncn_target_tool_prefix"; then # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6709: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_WINDRES_FOR_TARGET'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_WINDRES_FOR_TARGET+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$WINDRES_FOR_TARGET"; then ac_cv_prog_WINDRES_FOR_TARGET="$WINDRES_FOR_TARGET" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_WINDRES_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" - break - fi - done - IFS="$ac_save_ifs" +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_WINDRES_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + fi fi -WINDRES_FOR_TARGET="$ac_cv_prog_WINDRES_FOR_TARGET" +WINDRES_FOR_TARGET=$ac_cv_prog_WINDRES_FOR_TARGET if test -n "$WINDRES_FOR_TARGET"; then - echo "$ac_t""$WINDRES_FOR_TARGET" 1>&6 + { echo "$as_me:$LINENO: result: $WINDRES_FOR_TARGET" >&5 +echo "${ECHO_T}$WINDRES_FOR_TARGET" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_WINDRES_FOR_TARGET" && test $build = $target ; then # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6740: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_WINDRES_FOR_TARGET'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_WINDRES_FOR_TARGET+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$WINDRES_FOR_TARGET"; then ac_cv_prog_WINDRES_FOR_TARGET="$WINDRES_FOR_TARGET" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_WINDRES_FOR_TARGET="${ncn_progname}" - break - fi - done - IFS="$ac_save_ifs" +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_WINDRES_FOR_TARGET="${ncn_progname}" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + fi fi -WINDRES_FOR_TARGET="$ac_cv_prog_WINDRES_FOR_TARGET" +WINDRES_FOR_TARGET=$ac_cv_prog_WINDRES_FOR_TARGET if test -n "$WINDRES_FOR_TARGET"; then - echo "$ac_t""$WINDRES_FOR_TARGET" 1>&6 + { echo "$as_me:$LINENO: result: $WINDRES_FOR_TARGET" >&5 +echo "${ECHO_T}$WINDRES_FOR_TARGET" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - + + fi test -n "$ac_cv_prog_WINDRES_FOR_TARGET" && break done fi - + if test -z "$ac_cv_prog_WINDRES_FOR_TARGET" ; then set dummy windres if test $build = $target ; then @@ -6785,15 +9431,17 @@ RAW_CXX_FOR_TARGET="$CXX_FOR_TARGET" -echo $ac_n "checking where to find the target ar""... $ac_c" 1>&6 -echo "configure:6790: checking where to find the target ar" >&5 +{ echo "$as_me:$LINENO: checking where to find the target ar" >&5 +echo $ECHO_N "checking where to find the target ar... $ECHO_C" >&6; } if test "x${build}" != "x${host}" ; then if expr "x$AR_FOR_TARGET" : "x/" > /dev/null; then # We already found the complete path - echo "$ac_t""pre-installed in `dirname $AR_FOR_TARGET`" 1>&6 + { echo "$as_me:$LINENO: result: pre-installed in \`dirname $AR_FOR_TARGET\`" >&5 +echo "${ECHO_T}pre-installed in \`dirname $AR_FOR_TARGET\`" >&6; } else # Canadian cross, just use what we found - echo "$ac_t""pre-installed" 1>&6 + { echo "$as_me:$LINENO: result: pre-installed" >&5 +echo "${ECHO_T}pre-installed" >&6; } fi else ok=yes @@ -6801,32 +9449,38 @@ *" binutils "*) ;; *) ok=no ;; esac - + if test $ok = yes; then # An in-tree tool is available and we can use it AR_FOR_TARGET='$$r/$(HOST_SUBDIR)/binutils/ar' - echo "$ac_t""just compiled" 1>&6 + { echo "$as_me:$LINENO: result: just compiled" >&5 +echo "${ECHO_T}just compiled" >&6; } elif expr "x$AR_FOR_TARGET" : "x/" > /dev/null; then # We already found the complete path - echo "$ac_t""pre-installed in `dirname $AR_FOR_TARGET`" 1>&6 + { echo "$as_me:$LINENO: result: pre-installed in \`dirname $AR_FOR_TARGET\`" >&5 +echo "${ECHO_T}pre-installed in \`dirname $AR_FOR_TARGET\`" >&6; } elif test "x$target" = "x$host"; then # We can use an host tool AR_FOR_TARGET='$(AR)' - echo "$ac_t""host tool" 1>&6 + { echo "$as_me:$LINENO: result: host tool" >&5 +echo "${ECHO_T}host tool" >&6; } else # We need a cross tool - echo "$ac_t""pre-installed" 1>&6 + { echo "$as_me:$LINENO: result: pre-installed" >&5 +echo "${ECHO_T}pre-installed" >&6; } fi fi -echo $ac_n "checking where to find the target as""... $ac_c" 1>&6 -echo "configure:6823: checking where to find the target as" >&5 +{ echo "$as_me:$LINENO: checking where to find the target as" >&5 +echo $ECHO_N "checking where to find the target as... $ECHO_C" >&6; } if test "x${build}" != "x${host}" ; then if expr "x$AS_FOR_TARGET" : "x/" > /dev/null; then # We already found the complete path - echo "$ac_t""pre-installed in `dirname $AS_FOR_TARGET`" 1>&6 + { echo "$as_me:$LINENO: result: pre-installed in \`dirname $AS_FOR_TARGET\`" >&5 +echo "${ECHO_T}pre-installed in \`dirname $AS_FOR_TARGET\`" >&6; } else # Canadian cross, just use what we found - echo "$ac_t""pre-installed" 1>&6 + { echo "$as_me:$LINENO: result: pre-installed" >&5 +echo "${ECHO_T}pre-installed" >&6; } fi else ok=yes @@ -6834,32 +9488,38 @@ *" gas "*) ;; *) ok=no ;; esac - + if test $ok = yes; then # An in-tree tool is available and we can use it AS_FOR_TARGET='$$r/$(HOST_SUBDIR)/gas/as-new' - echo "$ac_t""just compiled" 1>&6 + { echo "$as_me:$LINENO: result: just compiled" >&5 +echo "${ECHO_T}just compiled" >&6; } elif expr "x$AS_FOR_TARGET" : "x/" > /dev/null; then # We already found the complete path - echo "$ac_t""pre-installed in `dirname $AS_FOR_TARGET`" 1>&6 + { echo "$as_me:$LINENO: result: pre-installed in \`dirname $AS_FOR_TARGET\`" >&5 +echo "${ECHO_T}pre-installed in \`dirname $AS_FOR_TARGET\`" >&6; } elif test "x$target" = "x$host"; then # We can use an host tool AS_FOR_TARGET='$(AS)' - echo "$ac_t""host tool" 1>&6 + { echo "$as_me:$LINENO: result: host tool" >&5 +echo "${ECHO_T}host tool" >&6; } else # We need a cross tool - echo "$ac_t""pre-installed" 1>&6 + { echo "$as_me:$LINENO: result: pre-installed" >&5 +echo "${ECHO_T}pre-installed" >&6; } fi fi -echo $ac_n "checking where to find the target cc""... $ac_c" 1>&6 -echo "configure:6856: checking where to find the target cc" >&5 +{ echo "$as_me:$LINENO: checking where to find the target cc" >&5 +echo $ECHO_N "checking where to find the target cc... $ECHO_C" >&6; } if test "x${build}" != "x${host}" ; then if expr "x$CC_FOR_TARGET" : "x/" > /dev/null; then # We already found the complete path - echo "$ac_t""pre-installed in `dirname $CC_FOR_TARGET`" 1>&6 + { echo "$as_me:$LINENO: result: pre-installed in \`dirname $CC_FOR_TARGET\`" >&5 +echo "${ECHO_T}pre-installed in \`dirname $CC_FOR_TARGET\`" >&6; } else # Canadian cross, just use what we found - echo "$ac_t""pre-installed" 1>&6 + { echo "$as_me:$LINENO: result: pre-installed" >&5 +echo "${ECHO_T}pre-installed" >&6; } fi else ok=yes @@ -6867,32 +9527,38 @@ *" gcc "*) ;; *) ok=no ;; esac - + if test $ok = yes; then # An in-tree tool is available and we can use it CC_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/xgcc -B$$r/$(HOST_SUBDIR)/gcc/' - echo "$ac_t""just compiled" 1>&6 + { echo "$as_me:$LINENO: result: just compiled" >&5 +echo "${ECHO_T}just compiled" >&6; } elif expr "x$CC_FOR_TARGET" : "x/" > /dev/null; then # We already found the complete path - echo "$ac_t""pre-installed in `dirname $CC_FOR_TARGET`" 1>&6 + { echo "$as_me:$LINENO: result: pre-installed in \`dirname $CC_FOR_TARGET\`" >&5 +echo "${ECHO_T}pre-installed in \`dirname $CC_FOR_TARGET\`" >&6; } elif test "x$target" = "x$host"; then # We can use an host tool CC_FOR_TARGET='$(CC)' - echo "$ac_t""host tool" 1>&6 + { echo "$as_me:$LINENO: result: host tool" >&5 +echo "${ECHO_T}host tool" >&6; } else # We need a cross tool - echo "$ac_t""pre-installed" 1>&6 + { echo "$as_me:$LINENO: result: pre-installed" >&5 +echo "${ECHO_T}pre-installed" >&6; } fi fi -echo $ac_n "checking where to find the target c++""... $ac_c" 1>&6 -echo "configure:6889: checking where to find the target c++" >&5 +{ echo "$as_me:$LINENO: checking where to find the target c++" >&5 +echo $ECHO_N "checking where to find the target c++... $ECHO_C" >&6; } if test "x${build}" != "x${host}" ; then if expr "x$CXX_FOR_TARGET" : "x/" > /dev/null; then # We already found the complete path - echo "$ac_t""pre-installed in `dirname $CXX_FOR_TARGET`" 1>&6 + { echo "$as_me:$LINENO: result: pre-installed in \`dirname $CXX_FOR_TARGET\`" >&5 +echo "${ECHO_T}pre-installed in \`dirname $CXX_FOR_TARGET\`" >&6; } else # Canadian cross, just use what we found - echo "$ac_t""pre-installed" 1>&6 + { echo "$as_me:$LINENO: result: pre-installed" >&5 +echo "${ECHO_T}pre-installed" >&6; } fi else ok=yes @@ -6907,28 +9573,34 @@ if test $ok = yes; then # An in-tree tool is available and we can use it CXX_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/g++ -B$$r/$(HOST_SUBDIR)/gcc/ -nostdinc++ `test ! -f $$r/$(TARGET_SUBDIR)/libstdc++-v3/scripts/testsuite_flags || $(SHELL) $$r/$(TARGET_SUBDIR)/libstdc++-v3/scripts/testsuite_flags --build-includes` -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs' - echo "$ac_t""just compiled" 1>&6 + { echo "$as_me:$LINENO: result: just compiled" >&5 +echo "${ECHO_T}just compiled" >&6; } elif expr "x$CXX_FOR_TARGET" : "x/" > /dev/null; then # We already found the complete path - echo "$ac_t""pre-installed in `dirname $CXX_FOR_TARGET`" 1>&6 + { echo "$as_me:$LINENO: result: pre-installed in \`dirname $CXX_FOR_TARGET\`" >&5 +echo "${ECHO_T}pre-installed in \`dirname $CXX_FOR_TARGET\`" >&6; } elif test "x$target" = "x$host"; then # We can use an host tool CXX_FOR_TARGET='$(CXX)' - echo "$ac_t""host tool" 1>&6 + { echo "$as_me:$LINENO: result: host tool" >&5 +echo "${ECHO_T}host tool" >&6; } else # We need a cross tool - echo "$ac_t""pre-installed" 1>&6 + { echo "$as_me:$LINENO: result: pre-installed" >&5 +echo "${ECHO_T}pre-installed" >&6; } fi fi -echo $ac_n "checking where to find the target c++ for libstdc++""... $ac_c" 1>&6 -echo "configure:6925: checking where to find the target c++ for libstdc++" >&5 +{ echo "$as_me:$LINENO: checking where to find the target c++ for libstdc++" >&5 +echo $ECHO_N "checking where to find the target c++ for libstdc++... $ECHO_C" >&6; } if test "x${build}" != "x${host}" ; then if expr "x$RAW_CXX_FOR_TARGET" : "x/" > /dev/null; then # We already found the complete path - echo "$ac_t""pre-installed in `dirname $RAW_CXX_FOR_TARGET`" 1>&6 + { echo "$as_me:$LINENO: result: pre-installed in \`dirname $RAW_CXX_FOR_TARGET\`" >&5 +echo "${ECHO_T}pre-installed in \`dirname $RAW_CXX_FOR_TARGET\`" >&6; } else # Canadian cross, just use what we found - echo "$ac_t""pre-installed" 1>&6 + { echo "$as_me:$LINENO: result: pre-installed" >&5 +echo "${ECHO_T}pre-installed" >&6; } fi else ok=yes @@ -6943,28 +9615,34 @@ if test $ok = yes; then # An in-tree tool is available and we can use it RAW_CXX_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/xgcc -shared-libgcc -B$$r/$(HOST_SUBDIR)/gcc -nostdinc++ -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs' - echo "$ac_t""just compiled" 1>&6 + { echo "$as_me:$LINENO: result: just compiled" >&5 +echo "${ECHO_T}just compiled" >&6; } elif expr "x$RAW_CXX_FOR_TARGET" : "x/" > /dev/null; then # We already found the complete path - echo "$ac_t""pre-installed in `dirname $RAW_CXX_FOR_TARGET`" 1>&6 + { echo "$as_me:$LINENO: result: pre-installed in \`dirname $RAW_CXX_FOR_TARGET\`" >&5 +echo "${ECHO_T}pre-installed in \`dirname $RAW_CXX_FOR_TARGET\`" >&6; } elif test "x$target" = "x$host"; then # We can use an host tool RAW_CXX_FOR_TARGET='$(CXX)' - echo "$ac_t""host tool" 1>&6 + { echo "$as_me:$LINENO: result: host tool" >&5 +echo "${ECHO_T}host tool" >&6; } else # We need a cross tool - echo "$ac_t""pre-installed" 1>&6 + { echo "$as_me:$LINENO: result: pre-installed" >&5 +echo "${ECHO_T}pre-installed" >&6; } fi fi -echo $ac_n "checking where to find the target dlltool""... $ac_c" 1>&6 -echo "configure:6961: checking where to find the target dlltool" >&5 +{ echo "$as_me:$LINENO: checking where to find the target dlltool" >&5 +echo $ECHO_N "checking where to find the target dlltool... $ECHO_C" >&6; } if test "x${build}" != "x${host}" ; then if expr "x$DLLTOOL_FOR_TARGET" : "x/" > /dev/null; then # We already found the complete path - echo "$ac_t""pre-installed in `dirname $DLLTOOL_FOR_TARGET`" 1>&6 + { echo "$as_me:$LINENO: result: pre-installed in \`dirname $DLLTOOL_FOR_TARGET\`" >&5 +echo "${ECHO_T}pre-installed in \`dirname $DLLTOOL_FOR_TARGET\`" >&6; } else # Canadian cross, just use what we found - echo "$ac_t""pre-installed" 1>&6 + { echo "$as_me:$LINENO: result: pre-installed" >&5 +echo "${ECHO_T}pre-installed" >&6; } fi else ok=yes @@ -6972,32 +9650,38 @@ *" binutils "*) ;; *) ok=no ;; esac - + if test $ok = yes; then # An in-tree tool is available and we can use it DLLTOOL_FOR_TARGET='$$r/$(HOST_SUBDIR)/binutils/dlltool' - echo "$ac_t""just compiled" 1>&6 + { echo "$as_me:$LINENO: result: just compiled" >&5 +echo "${ECHO_T}just compiled" >&6; } elif expr "x$DLLTOOL_FOR_TARGET" : "x/" > /dev/null; then # We already found the complete path - echo "$ac_t""pre-installed in `dirname $DLLTOOL_FOR_TARGET`" 1>&6 + { echo "$as_me:$LINENO: result: pre-installed in \`dirname $DLLTOOL_FOR_TARGET\`" >&5 +echo "${ECHO_T}pre-installed in \`dirname $DLLTOOL_FOR_TARGET\`" >&6; } elif test "x$target" = "x$host"; then # We can use an host tool DLLTOOL_FOR_TARGET='$(DLLTOOL)' - echo "$ac_t""host tool" 1>&6 + { echo "$as_me:$LINENO: result: host tool" >&5 +echo "${ECHO_T}host tool" >&6; } else # We need a cross tool - echo "$ac_t""pre-installed" 1>&6 + { echo "$as_me:$LINENO: result: pre-installed" >&5 +echo "${ECHO_T}pre-installed" >&6; } fi fi -echo $ac_n "checking where to find the target gcc""... $ac_c" 1>&6 -echo "configure:6994: checking where to find the target gcc" >&5 +{ echo "$as_me:$LINENO: checking where to find the target gcc" >&5 +echo $ECHO_N "checking where to find the target gcc... $ECHO_C" >&6; } if test "x${build}" != "x${host}" ; then if expr "x$GCC_FOR_TARGET" : "x/" > /dev/null; then # We already found the complete path - echo "$ac_t""pre-installed in `dirname $GCC_FOR_TARGET`" 1>&6 + { echo "$as_me:$LINENO: result: pre-installed in \`dirname $GCC_FOR_TARGET\`" >&5 +echo "${ECHO_T}pre-installed in \`dirname $GCC_FOR_TARGET\`" >&6; } else # Canadian cross, just use what we found - echo "$ac_t""pre-installed" 1>&6 + { echo "$as_me:$LINENO: result: pre-installed" >&5 +echo "${ECHO_T}pre-installed" >&6; } fi else ok=yes @@ -7005,32 +9689,38 @@ *" gcc "*) ;; *) ok=no ;; esac - + if test $ok = yes; then # An in-tree tool is available and we can use it GCC_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/xgcc -B$$r/$(HOST_SUBDIR)/gcc/' - echo "$ac_t""just compiled" 1>&6 + { echo "$as_me:$LINENO: result: just compiled" >&5 +echo "${ECHO_T}just compiled" >&6; } elif expr "x$GCC_FOR_TARGET" : "x/" > /dev/null; then # We already found the complete path - echo "$ac_t""pre-installed in `dirname $GCC_FOR_TARGET`" 1>&6 + { echo "$as_me:$LINENO: result: pre-installed in \`dirname $GCC_FOR_TARGET\`" >&5 +echo "${ECHO_T}pre-installed in \`dirname $GCC_FOR_TARGET\`" >&6; } elif test "x$target" = "x$host"; then # We can use an host tool GCC_FOR_TARGET='$()' - echo "$ac_t""host tool" 1>&6 + { echo "$as_me:$LINENO: result: host tool" >&5 +echo "${ECHO_T}host tool" >&6; } else # We need a cross tool - echo "$ac_t""pre-installed" 1>&6 + { echo "$as_me:$LINENO: result: pre-installed" >&5 +echo "${ECHO_T}pre-installed" >&6; } fi fi -echo $ac_n "checking where to find the target gcj""... $ac_c" 1>&6 -echo "configure:7027: checking where to find the target gcj" >&5 +{ echo "$as_me:$LINENO: checking where to find the target gcj" >&5 +echo $ECHO_N "checking where to find the target gcj... $ECHO_C" >&6; } if test "x${build}" != "x${host}" ; then if expr "x$GCJ_FOR_TARGET" : "x/" > /dev/null; then # We already found the complete path - echo "$ac_t""pre-installed in `dirname $GCJ_FOR_TARGET`" 1>&6 + { echo "$as_me:$LINENO: result: pre-installed in \`dirname $GCJ_FOR_TARGET\`" >&5 +echo "${ECHO_T}pre-installed in \`dirname $GCJ_FOR_TARGET\`" >&6; } else # Canadian cross, just use what we found - echo "$ac_t""pre-installed" 1>&6 + { echo "$as_me:$LINENO: result: pre-installed" >&5 +echo "${ECHO_T}pre-installed" >&6; } fi else ok=yes @@ -7045,28 +9735,34 @@ if test $ok = yes; then # An in-tree tool is available and we can use it GCJ_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/gcj -B$$r/$(HOST_SUBDIR)/gcc/' - echo "$ac_t""just compiled" 1>&6 + { echo "$as_me:$LINENO: result: just compiled" >&5 +echo "${ECHO_T}just compiled" >&6; } elif expr "x$GCJ_FOR_TARGET" : "x/" > /dev/null; then # We already found the complete path - echo "$ac_t""pre-installed in `dirname $GCJ_FOR_TARGET`" 1>&6 + { echo "$as_me:$LINENO: result: pre-installed in \`dirname $GCJ_FOR_TARGET\`" >&5 +echo "${ECHO_T}pre-installed in \`dirname $GCJ_FOR_TARGET\`" >&6; } elif test "x$target" = "x$host"; then # We can use an host tool GCJ_FOR_TARGET='$(GCJ)' - echo "$ac_t""host tool" 1>&6 + { echo "$as_me:$LINENO: result: host tool" >&5 +echo "${ECHO_T}host tool" >&6; } else # We need a cross tool - echo "$ac_t""pre-installed" 1>&6 + { echo "$as_me:$LINENO: result: pre-installed" >&5 +echo "${ECHO_T}pre-installed" >&6; } fi fi -echo $ac_n "checking where to find the target gfortran""... $ac_c" 1>&6 -echo "configure:7063: checking where to find the target gfortran" >&5 +{ echo "$as_me:$LINENO: checking where to find the target gfortran" >&5 +echo $ECHO_N "checking where to find the target gfortran... $ECHO_C" >&6; } if test "x${build}" != "x${host}" ; then if expr "x$GFORTRAN_FOR_TARGET" : "x/" > /dev/null; then # We already found the complete path - echo "$ac_t""pre-installed in `dirname $GFORTRAN_FOR_TARGET`" 1>&6 + { echo "$as_me:$LINENO: result: pre-installed in \`dirname $GFORTRAN_FOR_TARGET\`" >&5 +echo "${ECHO_T}pre-installed in \`dirname $GFORTRAN_FOR_TARGET\`" >&6; } else # Canadian cross, just use what we found - echo "$ac_t""pre-installed" 1>&6 + { echo "$as_me:$LINENO: result: pre-installed" >&5 +echo "${ECHO_T}pre-installed" >&6; } fi else ok=yes @@ -7081,28 +9777,34 @@ if test $ok = yes; then # An in-tree tool is available and we can use it GFORTRAN_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/gfortran -B$$r/$(HOST_SUBDIR)/gcc/' - echo "$ac_t""just compiled" 1>&6 + { echo "$as_me:$LINENO: result: just compiled" >&5 +echo "${ECHO_T}just compiled" >&6; } elif expr "x$GFORTRAN_FOR_TARGET" : "x/" > /dev/null; then # We already found the complete path - echo "$ac_t""pre-installed in `dirname $GFORTRAN_FOR_TARGET`" 1>&6 + { echo "$as_me:$LINENO: result: pre-installed in \`dirname $GFORTRAN_FOR_TARGET\`" >&5 +echo "${ECHO_T}pre-installed in \`dirname $GFORTRAN_FOR_TARGET\`" >&6; } elif test "x$target" = "x$host"; then # We can use an host tool GFORTRAN_FOR_TARGET='$(GFORTRAN)' - echo "$ac_t""host tool" 1>&6 + { echo "$as_me:$LINENO: result: host tool" >&5 +echo "${ECHO_T}host tool" >&6; } else # We need a cross tool - echo "$ac_t""pre-installed" 1>&6 + { echo "$as_me:$LINENO: result: pre-installed" >&5 +echo "${ECHO_T}pre-installed" >&6; } fi fi -echo $ac_n "checking where to find the target ld""... $ac_c" 1>&6 -echo "configure:7099: checking where to find the target ld" >&5 +{ echo "$as_me:$LINENO: checking where to find the target ld" >&5 +echo $ECHO_N "checking where to find the target ld... $ECHO_C" >&6; } if test "x${build}" != "x${host}" ; then if expr "x$LD_FOR_TARGET" : "x/" > /dev/null; then # We already found the complete path - echo "$ac_t""pre-installed in `dirname $LD_FOR_TARGET`" 1>&6 + { echo "$as_me:$LINENO: result: pre-installed in \`dirname $LD_FOR_TARGET\`" >&5 +echo "${ECHO_T}pre-installed in \`dirname $LD_FOR_TARGET\`" >&6; } else # Canadian cross, just use what we found - echo "$ac_t""pre-installed" 1>&6 + { echo "$as_me:$LINENO: result: pre-installed" >&5 +echo "${ECHO_T}pre-installed" >&6; } fi else ok=yes @@ -7110,55 +9812,66 @@ *" ld "*) ;; *) ok=no ;; esac - + if test $ok = yes; then # An in-tree tool is available and we can use it LD_FOR_TARGET='$$r/$(HOST_SUBDIR)/ld/ld-new' - echo "$ac_t""just compiled" 1>&6 + { echo "$as_me:$LINENO: result: just compiled" >&5 +echo "${ECHO_T}just compiled" >&6; } elif expr "x$LD_FOR_TARGET" : "x/" > /dev/null; then # We already found the complete path - echo "$ac_t""pre-installed in `dirname $LD_FOR_TARGET`" 1>&6 + { echo "$as_me:$LINENO: result: pre-installed in \`dirname $LD_FOR_TARGET\`" >&5 +echo "${ECHO_T}pre-installed in \`dirname $LD_FOR_TARGET\`" >&6; } elif test "x$target" = "x$host"; then # We can use an host tool LD_FOR_TARGET='$(LD)' - echo "$ac_t""host tool" 1>&6 + { echo "$as_me:$LINENO: result: host tool" >&5 +echo "${ECHO_T}host tool" >&6; } else # We need a cross tool - echo "$ac_t""pre-installed" 1>&6 + { echo "$as_me:$LINENO: result: pre-installed" >&5 +echo "${ECHO_T}pre-installed" >&6; } fi fi -echo $ac_n "checking where to find the target lipo""... $ac_c" 1>&6 -echo "configure:7132: checking where to find the target lipo" >&5 +{ echo "$as_me:$LINENO: checking where to find the target lipo" >&5 +echo $ECHO_N "checking where to find the target lipo... $ECHO_C" >&6; } if test "x${build}" != "x${host}" ; then if expr "x$LIPO_FOR_TARGET" : "x/" > /dev/null; then # We already found the complete path - echo "$ac_t""pre-installed in `dirname $LIPO_FOR_TARGET`" 1>&6 + { echo "$as_me:$LINENO: result: pre-installed in \`dirname $LIPO_FOR_TARGET\`" >&5 +echo "${ECHO_T}pre-installed in \`dirname $LIPO_FOR_TARGET\`" >&6; } else # Canadian cross, just use what we found - echo "$ac_t""pre-installed" 1>&6 + { echo "$as_me:$LINENO: result: pre-installed" >&5 +echo "${ECHO_T}pre-installed" >&6; } fi else if expr "x$LIPO_FOR_TARGET" : "x/" > /dev/null; then # We already found the complete path - echo "$ac_t""pre-installed in `dirname $LIPO_FOR_TARGET`" 1>&6 + { echo "$as_me:$LINENO: result: pre-installed in \`dirname $LIPO_FOR_TARGET\`" >&5 +echo "${ECHO_T}pre-installed in \`dirname $LIPO_FOR_TARGET\`" >&6; } elif test "x$target" = "x$host"; then # We can use an host tool LIPO_FOR_TARGET='$(LIPO)' - echo "$ac_t""host tool" 1>&6 + { echo "$as_me:$LINENO: result: host tool" >&5 +echo "${ECHO_T}host tool" >&6; } else # We need a cross tool - echo "$ac_t""pre-installed" 1>&6 + { echo "$as_me:$LINENO: result: pre-installed" >&5 +echo "${ECHO_T}pre-installed" >&6; } fi fi -echo $ac_n "checking where to find the target nm""... $ac_c" 1>&6 -echo "configure:7155: checking where to find the target nm" >&5 +{ echo "$as_me:$LINENO: checking where to find the target nm" >&5 +echo $ECHO_N "checking where to find the target nm... $ECHO_C" >&6; } if test "x${build}" != "x${host}" ; then if expr "x$NM_FOR_TARGET" : "x/" > /dev/null; then # We already found the complete path - echo "$ac_t""pre-installed in `dirname $NM_FOR_TARGET`" 1>&6 + { echo "$as_me:$LINENO: result: pre-installed in \`dirname $NM_FOR_TARGET\`" >&5 +echo "${ECHO_T}pre-installed in \`dirname $NM_FOR_TARGET\`" >&6; } else # Canadian cross, just use what we found - echo "$ac_t""pre-installed" 1>&6 + { echo "$as_me:$LINENO: result: pre-installed" >&5 +echo "${ECHO_T}pre-installed" >&6; } fi else ok=yes @@ -7166,32 +9879,38 @@ *" binutils "*) ;; *) ok=no ;; esac - + if test $ok = yes; then # An in-tree tool is available and we can use it NM_FOR_TARGET='$$r/$(HOST_SUBDIR)/binutils/nm-new' - echo "$ac_t""just compiled" 1>&6 + { echo "$as_me:$LINENO: result: just compiled" >&5 +echo "${ECHO_T}just compiled" >&6; } elif expr "x$NM_FOR_TARGET" : "x/" > /dev/null; then # We already found the complete path - echo "$ac_t""pre-installed in `dirname $NM_FOR_TARGET`" 1>&6 + { echo "$as_me:$LINENO: result: pre-installed in \`dirname $NM_FOR_TARGET\`" >&5 +echo "${ECHO_T}pre-installed in \`dirname $NM_FOR_TARGET\`" >&6; } elif test "x$target" = "x$host"; then # We can use an host tool NM_FOR_TARGET='$(NM)' - echo "$ac_t""host tool" 1>&6 + { echo "$as_me:$LINENO: result: host tool" >&5 +echo "${ECHO_T}host tool" >&6; } else # We need a cross tool - echo "$ac_t""pre-installed" 1>&6 + { echo "$as_me:$LINENO: result: pre-installed" >&5 +echo "${ECHO_T}pre-installed" >&6; } fi fi -echo $ac_n "checking where to find the target objdump""... $ac_c" 1>&6 -echo "configure:7188: checking where to find the target objdump" >&5 +{ echo "$as_me:$LINENO: checking where to find the target objdump" >&5 +echo $ECHO_N "checking where to find the target objdump... $ECHO_C" >&6; } if test "x${build}" != "x${host}" ; then if expr "x$OBJDUMP_FOR_TARGET" : "x/" > /dev/null; then # We already found the complete path - echo "$ac_t""pre-installed in `dirname $OBJDUMP_FOR_TARGET`" 1>&6 + { echo "$as_me:$LINENO: result: pre-installed in \`dirname $OBJDUMP_FOR_TARGET\`" >&5 +echo "${ECHO_T}pre-installed in \`dirname $OBJDUMP_FOR_TARGET\`" >&6; } else # Canadian cross, just use what we found - echo "$ac_t""pre-installed" 1>&6 + { echo "$as_me:$LINENO: result: pre-installed" >&5 +echo "${ECHO_T}pre-installed" >&6; } fi else ok=yes @@ -7199,32 +9918,38 @@ *" binutils "*) ;; *) ok=no ;; esac - + if test $ok = yes; then # An in-tree tool is available and we can use it OBJDUMP_FOR_TARGET='$$r/$(HOST_SUBDIR)/binutils/objdump' - echo "$ac_t""just compiled" 1>&6 + { echo "$as_me:$LINENO: result: just compiled" >&5 +echo "${ECHO_T}just compiled" >&6; } elif expr "x$OBJDUMP_FOR_TARGET" : "x/" > /dev/null; then # We already found the complete path - echo "$ac_t""pre-installed in `dirname $OBJDUMP_FOR_TARGET`" 1>&6 + { echo "$as_me:$LINENO: result: pre-installed in \`dirname $OBJDUMP_FOR_TARGET\`" >&5 +echo "${ECHO_T}pre-installed in \`dirname $OBJDUMP_FOR_TARGET\`" >&6; } elif test "x$target" = "x$host"; then # We can use an host tool OBJDUMP_FOR_TARGET='$(OBJDUMP)' - echo "$ac_t""host tool" 1>&6 + { echo "$as_me:$LINENO: result: host tool" >&5 +echo "${ECHO_T}host tool" >&6; } else # We need a cross tool - echo "$ac_t""pre-installed" 1>&6 + { echo "$as_me:$LINENO: result: pre-installed" >&5 +echo "${ECHO_T}pre-installed" >&6; } fi fi -echo $ac_n "checking where to find the target ranlib""... $ac_c" 1>&6 -echo "configure:7221: checking where to find the target ranlib" >&5 +{ echo "$as_me:$LINENO: checking where to find the target ranlib" >&5 +echo $ECHO_N "checking where to find the target ranlib... $ECHO_C" >&6; } if test "x${build}" != "x${host}" ; then if expr "x$RANLIB_FOR_TARGET" : "x/" > /dev/null; then # We already found the complete path - echo "$ac_t""pre-installed in `dirname $RANLIB_FOR_TARGET`" 1>&6 + { echo "$as_me:$LINENO: result: pre-installed in \`dirname $RANLIB_FOR_TARGET\`" >&5 +echo "${ECHO_T}pre-installed in \`dirname $RANLIB_FOR_TARGET\`" >&6; } else # Canadian cross, just use what we found - echo "$ac_t""pre-installed" 1>&6 + { echo "$as_me:$LINENO: result: pre-installed" >&5 +echo "${ECHO_T}pre-installed" >&6; } fi else ok=yes @@ -7232,32 +9957,38 @@ *" binutils "*) ;; *) ok=no ;; esac - + if test $ok = yes; then # An in-tree tool is available and we can use it RANLIB_FOR_TARGET='$$r/$(HOST_SUBDIR)/binutils/ranlib' - echo "$ac_t""just compiled" 1>&6 + { echo "$as_me:$LINENO: result: just compiled" >&5 +echo "${ECHO_T}just compiled" >&6; } elif expr "x$RANLIB_FOR_TARGET" : "x/" > /dev/null; then # We already found the complete path - echo "$ac_t""pre-installed in `dirname $RANLIB_FOR_TARGET`" 1>&6 + { echo "$as_me:$LINENO: result: pre-installed in \`dirname $RANLIB_FOR_TARGET\`" >&5 +echo "${ECHO_T}pre-installed in \`dirname $RANLIB_FOR_TARGET\`" >&6; } elif test "x$target" = "x$host"; then # We can use an host tool RANLIB_FOR_TARGET='$(RANLIB)' - echo "$ac_t""host tool" 1>&6 + { echo "$as_me:$LINENO: result: host tool" >&5 +echo "${ECHO_T}host tool" >&6; } else # We need a cross tool - echo "$ac_t""pre-installed" 1>&6 + { echo "$as_me:$LINENO: result: pre-installed" >&5 +echo "${ECHO_T}pre-installed" >&6; } fi fi -echo $ac_n "checking where to find the target strip""... $ac_c" 1>&6 -echo "configure:7254: checking where to find the target strip" >&5 +{ echo "$as_me:$LINENO: checking where to find the target strip" >&5 +echo $ECHO_N "checking where to find the target strip... $ECHO_C" >&6; } if test "x${build}" != "x${host}" ; then if expr "x$STRIP_FOR_TARGET" : "x/" > /dev/null; then # We already found the complete path - echo "$ac_t""pre-installed in `dirname $STRIP_FOR_TARGET`" 1>&6 + { echo "$as_me:$LINENO: result: pre-installed in \`dirname $STRIP_FOR_TARGET\`" >&5 +echo "${ECHO_T}pre-installed in \`dirname $STRIP_FOR_TARGET\`" >&6; } else # Canadian cross, just use what we found - echo "$ac_t""pre-installed" 1>&6 + { echo "$as_me:$LINENO: result: pre-installed" >&5 +echo "${ECHO_T}pre-installed" >&6; } fi else ok=yes @@ -7265,32 +9996,38 @@ *" binutils "*) ;; *) ok=no ;; esac - + if test $ok = yes; then # An in-tree tool is available and we can use it STRIP_FOR_TARGET='$$r/$(HOST_SUBDIR)/binutils/strip' - echo "$ac_t""just compiled" 1>&6 + { echo "$as_me:$LINENO: result: just compiled" >&5 +echo "${ECHO_T}just compiled" >&6; } elif expr "x$STRIP_FOR_TARGET" : "x/" > /dev/null; then # We already found the complete path - echo "$ac_t""pre-installed in `dirname $STRIP_FOR_TARGET`" 1>&6 + { echo "$as_me:$LINENO: result: pre-installed in \`dirname $STRIP_FOR_TARGET\`" >&5 +echo "${ECHO_T}pre-installed in \`dirname $STRIP_FOR_TARGET\`" >&6; } elif test "x$target" = "x$host"; then # We can use an host tool STRIP_FOR_TARGET='$(STRIP)' - echo "$ac_t""host tool" 1>&6 + { echo "$as_me:$LINENO: result: host tool" >&5 +echo "${ECHO_T}host tool" >&6; } else # We need a cross tool - echo "$ac_t""pre-installed" 1>&6 + { echo "$as_me:$LINENO: result: pre-installed" >&5 +echo "${ECHO_T}pre-installed" >&6; } fi fi -echo $ac_n "checking where to find the target windres""... $ac_c" 1>&6 -echo "configure:7287: checking where to find the target windres" >&5 +{ echo "$as_me:$LINENO: checking where to find the target windres" >&5 +echo $ECHO_N "checking where to find the target windres... $ECHO_C" >&6; } if test "x${build}" != "x${host}" ; then if expr "x$WINDRES_FOR_TARGET" : "x/" > /dev/null; then # We already found the complete path - echo "$ac_t""pre-installed in `dirname $WINDRES_FOR_TARGET`" 1>&6 + { echo "$as_me:$LINENO: result: pre-installed in \`dirname $WINDRES_FOR_TARGET\`" >&5 +echo "${ECHO_T}pre-installed in \`dirname $WINDRES_FOR_TARGET\`" >&6; } else # Canadian cross, just use what we found - echo "$ac_t""pre-installed" 1>&6 + { echo "$as_me:$LINENO: result: pre-installed" >&5 +echo "${ECHO_T}pre-installed" >&6; } fi else ok=yes @@ -7298,21 +10035,25 @@ *" binutils "*) ;; *) ok=no ;; esac - + if test $ok = yes; then # An in-tree tool is available and we can use it WINDRES_FOR_TARGET='$$r/$(HOST_SUBDIR)/binutils/windres' - echo "$ac_t""just compiled" 1>&6 + { echo "$as_me:$LINENO: result: just compiled" >&5 +echo "${ECHO_T}just compiled" >&6; } elif expr "x$WINDRES_FOR_TARGET" : "x/" > /dev/null; then # We already found the complete path - echo "$ac_t""pre-installed in `dirname $WINDRES_FOR_TARGET`" 1>&6 + { echo "$as_me:$LINENO: result: pre-installed in \`dirname $WINDRES_FOR_TARGET\`" >&5 +echo "${ECHO_T}pre-installed in \`dirname $WINDRES_FOR_TARGET\`" >&6; } elif test "x$target" = "x$host"; then # We can use an host tool WINDRES_FOR_TARGET='$(WINDRES)' - echo "$ac_t""host tool" 1>&6 + { echo "$as_me:$LINENO: result: host tool" >&5 +echo "${ECHO_T}host tool" >&6; } else # We need a cross tool - echo "$ac_t""pre-installed" 1>&6 + { echo "$as_me:$LINENO: result: pre-installed" >&5 +echo "${ECHO_T}pre-installed" >&6; } fi fi @@ -7343,17 +10084,17 @@ -echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:7348: checking whether to enable maintainer-specific portions of Makefiles" >&5 -# Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. +{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; } +# Check whether --enable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then - enableval="$enable_maintainer_mode" - USE_MAINTAINER_MODE=$enableval + enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval else USE_MAINTAINER_MODE=no fi -echo "$ac_t""$USE_MAINTAINER_MODE" 1>&6 +{ echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 +echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; } if test "$USE_MAINTAINER_MODE" = yes; then @@ -7362,7 +10103,7 @@ else MAINTAINER_MODE_TRUE='#' MAINTAINER_MODE_FALSE= -fi +fi MAINT=$MAINTAINER_MODE_TRUE # --------------------- @@ -7394,32 +10135,57 @@ # Pass -fkeep-inline-functions for stage 1 if the GCC version supports it. CFLAGS="$CFLAGS -fkeep-inline-functions" - echo $ac_n "checking whether -fkeep-inline-functions is supported""... $ac_c" 1>&6 -echo "configure:7399: checking whether -fkeep-inline-functions is supported" >&5 - cat > conftest.$ac_ext <&5 +echo $ECHO_N "checking whether -fkeep-inline-functions is supported... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #if (__GNUC__ < 3) \ || (__GNUC__ == 3 && (__GNUC_MINOR__ < 3 \ || (__GNUC_MINOR__ == 3 && __GNUC_PATCHLEVEL__ < 1))) #error http://gcc.gnu.org/PR29382 #endif - -int main() { -; return 0; } -EOF -if { (eval echo configure:7414: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - echo "$ac_t""yes" 1>&6; stage1_cflags="$stage1_cflags -fkeep-inline-functions" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - echo "$ac_t""no" 1>&6 +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; }; stage1_cflags="$stage1_cflags -fkeep-inline-functions" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi -rm -f conftest* + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CFLAGS="$saved_CFLAGS" fi @@ -7429,10 +10195,9 @@ # Enable --enable-checking in stage1 of the compiler. -# Check whether --enable-stage1-checking or --disable-stage1-checking was given. +# Check whether --enable-stage1-checking was given. if test "${enable_stage1_checking+set}" = set; then - enableval="$enable_stage1_checking" - stage1_checking=--enable-checking=${enable_stage1_checking} + enableval=$enable_stage1_checking; stage1_checking=--enable-checking=${enable_stage1_checking} else if test "x$enable_checking" = xno; then # LLVM LOCAL begin - don't enable checking when we meant to disable it @@ -7446,10 +10211,9 @@ # Enable -Werror in bootstrap stage2 and later. -# Check whether --enable-werror or --disable-werror was given. +# Check whether --enable-werror was given. if test "${enable_werror+set}" = set; then - enableval="$enable_werror" - : + enableval=$enable_werror; else if test -d gcc && test x"`cat $srcdir/gcc/DEV-PHASE`" = xexperimental; then enable_werror=yes @@ -7465,28 +10229,28 @@ # Flags needed to enable html installing and building -# Check whether --with-datarootdir or --without-datarootdir was given. + +# Check whether --with-datarootdir was given. if test "${with_datarootdir+set}" = set; then - withval="$with_datarootdir" - datarootdir="\${prefix}/${withval}" + withval=$with_datarootdir; datarootdir="\${prefix}/${withval}" else datarootdir="\${prefix}/share" fi -# Check whether --with-docdir or --without-docdir was given. + +# Check whether --with-docdir was given. if test "${with_docdir+set}" = set; then - withval="$with_docdir" - docdir="\${prefix}/${withval}" + withval=$with_docdir; docdir="\${prefix}/${withval}" else docdir="\${datarootdir}/doc" fi -# Check whether --with-htmldir or --without-htmldir was given. + +# Check whether --with-htmldir was given. if test "${with_htmldir+set}" = set; then - withval="$with_htmldir" - htmldir="\${prefix}/${withval}" + withval=$with_htmldir; htmldir="\${prefix}/${withval}" else htmldir="\${docdir}" fi @@ -7496,365 +10260,1169 @@ -trap '' 1 2 15 -cat > confcache <<\EOF +ac_config_files="$ac_config_files Makefile" + +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. It is not useful on other systems. -# If it contains results you don't want to keep, you may remove or edit it. +# 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. # -# By default, configure uses ./config.cache as the cache file, -# creating it if it does not exist already. You can give configure -# the --cache-file=FILE option to use a different cache file; that is -# what configure does when it calls configure scripts in -# subdirectories, so they share the cache. -# Giving --cache-file=/dev/null disables caching, for debugging configure. -# config.status only pays attention to the cache file if you give it the -# --recheck option to rerun configure. +# config.status only pays attention to the cache file if you give it +# the --recheck option to rerun configure. # -EOF +# `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. +# So, we kill variables containing newlines. # 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 \ - -e "s/'/'\\\\''/g" \ - -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p" - ;; - *) - # `set' quotes correctly as required by POSIX, so do not add quotes. - sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p' - ;; - esac >> confcache -if cmp -s $cache_file confcache; then - : -else - if test -w $cache_file; then - echo "updating cache $cache_file" - cat confcache > $cache_file +( + for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do + eval ac_val=\$$ac_var + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( + *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 +echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + *) $as_unset $ac_var ;; + esac ;; + esac + done + + (set) 2>&1 | + case $as_nl`(ac_space=' '; set) 2>&1` in #( + *${as_nl}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 "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" + ;; + esac | + sort +) | + sed ' + /^ac_cv_env_/b end + t clear + :clear + s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + t end + 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 "$as_me:$LINENO: updating cache $cache_file" >&5 +echo "$as_me: updating cache $cache_file" >&6;} + cat confcache >$cache_file else - echo "not updating unwritable cache $cache_file" + { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 +echo "$as_me: not updating unwritable cache $cache_file" >&6;} fi fi rm -f confcache -trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 - test "x$prefix" = xNONE && prefix=$ac_default_prefix # Let make expand exec_prefix. test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' -# Any assignment to VPATH causes Sun make to only execute -# the first set of double-colon rules, so remove it if not needed. -# If there is a colon in the path, we need to keep it. -if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=[^:]*$/d' -fi - -trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15 - # Transform confdefs.h into DEFS. # Protect against shell expansion while executing Makefile rules. # Protect against Makefile macro expansion. -cat > conftest.defs <<\EOF -s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g -s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g -s%\[%\\&%g -s%\]%\\&%g -s%\$%$$%g -EOF -DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '` -rm -f conftest.defs +# +# If the first sed substitution is executed (which looks for macros that +# take arguments), then branch to the quote section. Otherwise, +# look for a macro that doesn't take arguments. +ac_script=' +t clear +:clear +s/^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\)/-D\1=\2/g +t quote +s/^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)/-D\1=\2/g +t quote +b any +:quote +s/[ `~#$^&*(){}\\|;'\''"<>?]/\\&/g +s/\[/\\&/g +s/\]/\\&/g +s/\$/$$/g +H +:any +${ + g + s/^\n// + s/\n/ /g + p +} +' +DEFS=`sed -n "$ac_script" confdefs.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_script='s/\$U\././;s/\.o$//;s/\.obj$//' + ac_i=`echo "$ac_i" | sed "$ac_script"` + # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR + # will be set to the directory where LIBOBJS objects are built. + ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" + ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' +done +LIBOBJS=$ac_libobjs +LTLIBOBJS=$ac_ltlibobjs -# Without the "./", some shells look in PATH for config.status. -: ${CONFIG_STATUS=./config.status} -echo creating $CONFIG_STATUS -rm -f $CONFIG_STATUS -cat > $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. -# This directory was configured as follows, -# on host `(hostname || uname -n) 2>/dev/null | sed 1q`: -# -# $0 $ac_configure_args -# # Compiler output produced by configure, useful for debugging -# configure, is in ./config.log if it exists. +# configure, is in config.log if it exists. -ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]" -for ac_option +debug=false +ac_cs_recheck=false +ac_cs_silent=false +SHELL=\${CONFIG_SHELL-$SHELL} +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF +## --------------------- ## +## M4sh Initialization. ## +## --------------------- ## + +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh +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+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + +fi + + + + +# PATH needs CR +# 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 + +# Support unset when possible. +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then + as_unset=unset +else + as_unset=false +fi + + +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. +# (If _AS_PATH_WALK were called with IFS unset, it would disable word +# splitting by setting IFS to empty value.) +as_nl=' +' +IFS=" "" $as_nl" + +# Find who we are. Look in the path if we contain no directory separator. +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 +IFS=$as_save_IFS + + ;; +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_myself: error: cannot find myself; rerun with an absolute file name" >&2 + { (exit 1); exit 1; } +fi + +# Work around bugs in pre-3.0 UWIN ksh. +for as_var in ENV MAIL MAILPATH +do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +done +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 - case "\$ac_option" in + if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then + eval $as_var=C; export $as_var + else + ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var + fi +done + +# Required to use basename. +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; 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'` + +# CDPATH. +$as_unset CDPATH + + + + as_lineno_1=$LINENO + as_lineno_2=$LINENO + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { + + # 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 after each line using $LINENO; the second 'sed' + # does the real work. The second script uses 'N' to pair each + # line-number line with the line containing $LINENO, 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 + # scripts with optimization help from Paolo Bonzini. Blame Lee + # E. McMahon (1931-1989) for sed's syntax. :-) + sed -n ' + p + /[$]LINENO/= + ' <$as_myself | + sed ' + s/[$]LINENO.*/&-/ + t lineno + b + :lineno + N + :loop + s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ + t loop + s/-\n.*// + ' >$as_me.lineno && + chmod +x "$as_me.lineno" || + { 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 sensitive to this). + . "./$as_me.lineno" + # Exit status is that of the last command. + exit +} + + +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi + +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in +-n*) + case `echo 'x\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + *) ECHO_C='\c';; + esac;; +*) + ECHO_N='-n';; +esac + +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +else + as_expr=false +fi + +rm -f conf$$ conf$$.exe conf$$.file +if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file +else + rm -f conf$$.dir + mkdir conf$$.dir +fi +echo >conf$$.file +if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -p' +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$$.dir/conf$$.file conf$$.file +rmdir conf$$.dir 2>/dev/null + +if mkdir -p . 2>/dev/null; then + as_mkdir_p=: +else + test -d ./-p && rmdir ./-p + as_mkdir_p=false +fi + +if test -x / >/dev/null 2>&1; then + as_test_x='test -x' +else + if ls -dL / >/dev/null 2>&1; then + as_ls_L_option=L + else + as_ls_L_option= + fi + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then + test -d "$1/."; + else + case $1 in + -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' +fi +as_executable_p=$as_test_x + +# Sed expression to map a string onto a valid CPP name. +as_tr_cpp="eval 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="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" + + +exec 6>&1 + +# Save the log message, to keep $[0] and so on meaningful, and to +# report actual input values of CONFIG_FILES etc. instead of their +# values after options handling. +ac_log=" +This file was extended by $as_me, which was +generated by GNU Autoconf 2.61. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS + CONFIG_LINKS = $CONFIG_LINKS + CONFIG_COMMANDS = $CONFIG_COMMANDS + $ $0 $@ + +on `(hostname || uname -n) 2>/dev/null | sed 1q` +" + +_ACEOF + +cat >>$CONFIG_STATUS <<_ACEOF +# Files that config.status was made for. +config_files="$ac_config_files" + +_ACEOF + +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 and configuration settings, 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="\\ +config.status +configured by $0, generated by GNU Autoconf 2.61, + with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" + +Copyright (C) 2006 Free Software Foundation, Inc. +This config.status script is free software; the Free Software Foundation +gives unlimited permission to copy, distribute and modify it." + +ac_pwd='$ac_pwd' +srcdir='$srcdir' +INSTALL='$INSTALL' +_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 + ;; + esac + + case $ac_option in + # Handling of the options. -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" - exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; - -version | --version | --versio | --versi | --vers | --ver | --ve | --v) - echo "$CONFIG_STATUS generated by autoconf version 2.13" - exit 0 ;; - -help | --help | --hel | --he | --h) - echo "\$ac_cs_usage"; exit 0 ;; - *) echo "\$ac_cs_usage"; exit 1 ;; + ac_cs_recheck=: ;; + --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) + echo "$ac_cs_version"; exit ;; + --debug | --debu | --deb | --de | --d | -d ) + debug=: ;; + --file | --fil | --fi | --f ) + $ac_shift + CONFIG_FILES="$CONFIG_FILES $ac_optarg" + ac_need_defaults=false;; + --he | --h | --help | --hel | -h ) + echo "$ac_cs_usage"; exit ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil | --si | --s) + ac_cs_silent=: ;; + + # This is an error. + -*) { 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" + ac_need_defaults=false ;; + + 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 CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 + CONFIG_SHELL=$SHELL + export CONFIG_SHELL + exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion +fi + +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF +exec 5>>config.log +{ + echo + sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX +## Running $as_me. ## +_ASBOX + echo "$ac_log" +} >&5 + +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF + +# Handling of arguments. +for ac_config_target in $ac_config_targets +do + case $ac_config_target in + "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; + + *) { { 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 -ac_given_srcdir=$srcdir -ac_given_INSTALL="$INSTALL" -trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 -EOF -cat >> $CONFIG_STATUS </dev/null` && + test -n "$tmp" && test -d "$tmp" +} || +{ + tmp=./conf$$-$RANDOM + (umask 077 && mkdir "$tmp") +} || +{ + echo "$me: cannot create a temporary directory in ." >&2 + { (exit 1); exit 1; } +} -# Protect against being on the right side of a sed subst in config.status. -sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g; - s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF -$ac_vpsub -$extrasub -s%@SHELL@%$SHELL%g -s%@CFLAGS@%$CFLAGS%g -s%@CPPFLAGS@%$CPPFLAGS%g -s%@CXXFLAGS@%$CXXFLAGS%g -s%@FFLAGS@%$FFLAGS%g -s%@DEFS@%$DEFS%g -s%@LDFLAGS@%$LDFLAGS%g -s%@LIBS@%$LIBS%g -s%@exec_prefix@%$exec_prefix%g -s%@prefix@%$prefix%g -s%@program_transform_name@%$program_transform_name%g -s%@bindir@%$bindir%g -s%@sbindir@%$sbindir%g -s%@libexecdir@%$libexecdir%g -s%@datadir@%$datadir%g -s%@sysconfdir@%$sysconfdir%g -s%@sharedstatedir@%$sharedstatedir%g -s%@localstatedir@%$localstatedir%g -s%@libdir@%$libdir%g -s%@includedir@%$includedir%g -s%@oldincludedir@%$oldincludedir%g -s%@infodir@%$infodir%g -s%@mandir@%$mandir%g -s%@host@%$host%g -s%@host_alias@%$host_alias%g -s%@host_cpu@%$host_cpu%g -s%@host_vendor@%$host_vendor%g -s%@host_os@%$host_os%g -s%@target@%$target%g -s%@target_alias@%$target_alias%g -s%@target_cpu@%$target_cpu%g -s%@target_vendor@%$target_vendor%g -s%@target_os@%$target_os%g -s%@build@%$build%g -s%@build_alias@%$build_alias%g -s%@build_cpu@%$build_cpu%g -s%@build_vendor@%$build_vendor%g -s%@build_os@%$build_os%g -s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g -s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g -s%@INSTALL_DATA@%$INSTALL_DATA%g -s%@LN@%$LN%g -s%@LN_S@%$LN_S%g -s%@TOPLEVEL_CONFIGURE_ARGUMENTS@%$TOPLEVEL_CONFIGURE_ARGUMENTS%g -s%@build_libsubdir@%$build_libsubdir%g -s%@build_subdir@%$build_subdir%g -s%@host_subdir@%$host_subdir%g -s%@target_subdir@%$target_subdir%g -s%@CC@%$CC%g -s%@GNATBIND@%$GNATBIND%g -s%@do_compare@%$do_compare%g -s%@gmplibs@%$gmplibs%g -s%@gmpinc@%$gmpinc%g -s%@stage1_languages@%$stage1_languages%g -s%@SYSROOT_CFLAGS_FOR_TARGET@%$SYSROOT_CFLAGS_FOR_TARGET%g -/@serialization_dependencies@/r $serialization_dependencies -s%@serialization_dependencies@%%g -/@host_makefile_frag@/r $host_makefile_frag -s%@host_makefile_frag@%%g -/@target_makefile_frag@/r $target_makefile_frag -s%@target_makefile_frag@%%g -/@alphaieee_frag@/r $alphaieee_frag -s%@alphaieee_frag@%%g -/@ospace_frag@/r $ospace_frag -s%@ospace_frag@%%g -s%@RPATH_ENVVAR@%$RPATH_ENVVAR%g -s%@tooldir@%$tooldir%g -s%@build_tooldir@%$build_tooldir%g -s%@CONFIGURE_GDB_TK@%$CONFIGURE_GDB_TK%g -s%@GDB_TK@%$GDB_TK%g -s%@INSTALL_GDB_TK@%$INSTALL_GDB_TK%g -s%@build_configargs@%$build_configargs%g -s%@build_configdirs@%$build_configdirs%g -s%@host_configargs@%$host_configargs%g -s%@configdirs@%$configdirs%g -s%@target_configargs@%$target_configargs%g -s%@CC_FOR_BUILD@%$CC_FOR_BUILD%g -s%@config_shell@%$config_shell%g -s%@YACC@%$YACC%g -s%@BISON@%$BISON%g -s%@M4@%$M4%g -s%@LEX@%$LEX%g -s%@FLEX@%$FLEX%g -s%@MAKEINFO@%$MAKEINFO%g -s%@EXPECT@%$EXPECT%g -s%@RUNTEST@%$RUNTEST%g -s%@AR@%$AR%g -s%@AS@%$AS%g -s%@DLLTOOL@%$DLLTOOL%g -s%@LD@%$LD%g -s%@LIPO@%$LIPO%g -s%@NM@%$NM%g -s%@RANLIB@%$RANLIB%g -s%@STRIP@%$STRIP%g -s%@WINDRES@%$WINDRES%g -s%@OBJCOPY@%$OBJCOPY%g -s%@OBJDUMP@%$OBJDUMP%g -s%@CXX@%$CXX%g -s%@CFLAGS_FOR_BUILD@%$CFLAGS_FOR_BUILD%g -s%@CC_FOR_TARGET@%$CC_FOR_TARGET%g -s%@CXX_FOR_TARGET@%$CXX_FOR_TARGET%g -s%@GCC_FOR_TARGET@%$GCC_FOR_TARGET%g -s%@GCJ_FOR_TARGET@%$GCJ_FOR_TARGET%g -s%@GFORTRAN_FOR_TARGET@%$GFORTRAN_FOR_TARGET%g -s%@AR_FOR_TARGET@%$AR_FOR_TARGET%g -s%@AS_FOR_TARGET@%$AS_FOR_TARGET%g -s%@DLLTOOL_FOR_TARGET@%$DLLTOOL_FOR_TARGET%g -s%@LD_FOR_TARGET@%$LD_FOR_TARGET%g -s%@LIPO_FOR_TARGET@%$LIPO_FOR_TARGET%g -s%@NM_FOR_TARGET@%$NM_FOR_TARGET%g -s%@OBJDUMP_FOR_TARGET@%$OBJDUMP_FOR_TARGET%g -s%@RANLIB_FOR_TARGET@%$RANLIB_FOR_TARGET%g -s%@STRIP_FOR_TARGET@%$STRIP_FOR_TARGET%g -s%@WINDRES_FOR_TARGET@%$WINDRES_FOR_TARGET%g -s%@FLAGS_FOR_TARGET@%$FLAGS_FOR_TARGET%g -s%@RAW_CXX_FOR_TARGET@%$RAW_CXX_FOR_TARGET%g -s%@COMPILER_AS_FOR_TARGET@%$COMPILER_AS_FOR_TARGET%g -s%@COMPILER_LD_FOR_TARGET@%$COMPILER_LD_FOR_TARGET%g -s%@COMPILER_NM_FOR_TARGET@%$COMPILER_NM_FOR_TARGET%g -s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%g -s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g -s%@MAINT@%$MAINT%g -s%@stage1_cflags@%$stage1_cflags%g -s%@stage1_checking@%$stage1_checking%g -s%@stage2_werror_flag@%$stage2_werror_flag%g -s%@datarootdir@%$datarootdir%g -s%@docdir@%$docdir%g -s%@htmldir@%$htmldir%g +# +# Set up the sed scripts for CONFIG_FILES section. +# -CEOF -EOF +# 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 + +_ACEOF + +# Create sed commands to just substitute file output variables. + +# Remaining file output variables are in a fragment that also has non-file +# output varibles. + + + +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF +SHELL!$SHELL$ac_delim +PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim +PACKAGE_NAME!$PACKAGE_NAME$ac_delim +PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim +PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim +PACKAGE_STRING!$PACKAGE_STRING$ac_delim +PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim +exec_prefix!$exec_prefix$ac_delim +prefix!$prefix$ac_delim +program_transform_name!$program_transform_name$ac_delim +bindir!$bindir$ac_delim +sbindir!$sbindir$ac_delim +libexecdir!$libexecdir$ac_delim +datarootdir!$datarootdir$ac_delim +datadir!$datadir$ac_delim +sysconfdir!$sysconfdir$ac_delim +sharedstatedir!$sharedstatedir$ac_delim +localstatedir!$localstatedir$ac_delim +includedir!$includedir$ac_delim +oldincludedir!$oldincludedir$ac_delim +docdir!$docdir$ac_delim +infodir!$infodir$ac_delim +htmldir!$htmldir$ac_delim +dvidir!$dvidir$ac_delim +pdfdir!$pdfdir$ac_delim +psdir!$psdir$ac_delim +libdir!$libdir$ac_delim +localedir!$localedir$ac_delim +mandir!$mandir$ac_delim +DEFS!$DEFS$ac_delim +ECHO_C!$ECHO_C$ac_delim +ECHO_N!$ECHO_N$ac_delim +ECHO_T!$ECHO_T$ac_delim +LIBS!$LIBS$ac_delim +build_alias!$build_alias$ac_delim +host_alias!$host_alias$ac_delim +target_alias!$target_alias$ac_delim +build!$build$ac_delim +build_cpu!$build_cpu$ac_delim +build_vendor!$build_vendor$ac_delim +build_os!$build_os$ac_delim +host!$host$ac_delim +host_cpu!$host_cpu$ac_delim +host_vendor!$host_vendor$ac_delim +host_os!$host_os$ac_delim +target!$target$ac_delim +target_cpu!$target_cpu$ac_delim +target_vendor!$target_vendor$ac_delim +target_os!$target_os$ac_delim +INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim +INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim +INSTALL_DATA!$INSTALL_DATA$ac_delim +LN!$LN$ac_delim +LN_S!$LN_S$ac_delim +TOPLEVEL_CONFIGURE_ARGUMENTS!$TOPLEVEL_CONFIGURE_ARGUMENTS$ac_delim +build_libsubdir!$build_libsubdir$ac_delim +build_subdir!$build_subdir$ac_delim +host_subdir!$host_subdir$ac_delim +target_subdir!$target_subdir$ac_delim +CC!$CC$ac_delim +CFLAGS!$CFLAGS$ac_delim +LDFLAGS!$LDFLAGS$ac_delim +CPPFLAGS!$CPPFLAGS$ac_delim +ac_ct_CC!$ac_ct_CC$ac_delim +EXEEXT!$EXEEXT$ac_delim +OBJEXT!$OBJEXT$ac_delim +GNATBIND!$GNATBIND$ac_delim +do_compare!$do_compare$ac_delim +gmplibs!$gmplibs$ac_delim +gmpinc!$gmpinc$ac_delim +stage1_languages!$stage1_languages$ac_delim +SYSROOT_CFLAGS_FOR_TARGET!$SYSROOT_CFLAGS_FOR_TARGET$ac_delim +RPATH_ENVVAR!$RPATH_ENVVAR$ac_delim +tooldir!$tooldir$ac_delim +build_tooldir!$build_tooldir$ac_delim +CONFIGURE_GDB_TK!$CONFIGURE_GDB_TK$ac_delim +GDB_TK!$GDB_TK$ac_delim +INSTALL_GDB_TK!$INSTALL_GDB_TK$ac_delim +build_configargs!$build_configargs$ac_delim +build_configdirs!$build_configdirs$ac_delim +host_configargs!$host_configargs$ac_delim +configdirs!$configdirs$ac_delim +_ACEOF -cat >> $CONFIG_STATUS <<\EOF + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 82; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done -# 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_cmds=90 # Maximum number of lines to put in a sed script. -ac_file=1 # Number of current file. -ac_beg=1 # First line for current file. -ac_end=$ac_max_sed_cmds # 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" conftest.subs > conftest.s$ac_file - else - sed "${ac_end}q" conftest.subs > conftest.s$ac_file - fi - if test ! -s conftest.s$ac_file; then - ac_more_lines=false - rm -f conftest.s$ac_file +ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` +if test -n "$ac_eof"; then + ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` + ac_eof=`expr $ac_eof + 1` +fi + +cat >>$CONFIG_STATUS <<_ACEOF +cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b +/^[ ]*@serialization_dependencies@[ ]*$/{ +r $serialization_dependencies +d +} +/^[ ]*@host_makefile_frag@[ ]*$/{ +r $host_makefile_frag +d +} +/^[ ]*@target_makefile_frag@[ ]*$/{ +r $target_makefile_frag +d +} +/^[ ]*@alphaieee_frag@[ ]*$/{ +r $alphaieee_frag +d +} +/^[ ]*@ospace_frag@[ ]*$/{ +r $ospace_frag +d +} +_ACEOF +sed ' +s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g +s/^/s,@/; s/!/@,|#_!!_#|/ +:n +t n +s/'"$ac_delim"'$/,g/; t +s/$/\\/; p +N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n +' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF +CEOF$ac_eof +_ACEOF + + +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF +target_configargs!$target_configargs$ac_delim +CC_FOR_BUILD!$CC_FOR_BUILD$ac_delim +config_shell!$config_shell$ac_delim +YACC!$YACC$ac_delim +BISON!$BISON$ac_delim +M4!$M4$ac_delim +LEX!$LEX$ac_delim +FLEX!$FLEX$ac_delim +MAKEINFO!$MAKEINFO$ac_delim +EXPECT!$EXPECT$ac_delim +RUNTEST!$RUNTEST$ac_delim +AR!$AR$ac_delim +AS!$AS$ac_delim +DLLTOOL!$DLLTOOL$ac_delim +LD!$LD$ac_delim +LIPO!$LIPO$ac_delim +NM!$NM$ac_delim +RANLIB!$RANLIB$ac_delim +STRIP!$STRIP$ac_delim +WINDRES!$WINDRES$ac_delim +OBJCOPY!$OBJCOPY$ac_delim +OBJDUMP!$OBJDUMP$ac_delim +CXX!$CXX$ac_delim +CFLAGS_FOR_BUILD!$CFLAGS_FOR_BUILD$ac_delim +CXXFLAGS!$CXXFLAGS$ac_delim +CC_FOR_TARGET!$CC_FOR_TARGET$ac_delim +CXX_FOR_TARGET!$CXX_FOR_TARGET$ac_delim +GCC_FOR_TARGET!$GCC_FOR_TARGET$ac_delim +GCJ_FOR_TARGET!$GCJ_FOR_TARGET$ac_delim +GFORTRAN_FOR_TARGET!$GFORTRAN_FOR_TARGET$ac_delim +AR_FOR_TARGET!$AR_FOR_TARGET$ac_delim +AS_FOR_TARGET!$AS_FOR_TARGET$ac_delim +DLLTOOL_FOR_TARGET!$DLLTOOL_FOR_TARGET$ac_delim +LD_FOR_TARGET!$LD_FOR_TARGET$ac_delim +LIPO_FOR_TARGET!$LIPO_FOR_TARGET$ac_delim +NM_FOR_TARGET!$NM_FOR_TARGET$ac_delim +OBJDUMP_FOR_TARGET!$OBJDUMP_FOR_TARGET$ac_delim +RANLIB_FOR_TARGET!$RANLIB_FOR_TARGET$ac_delim +STRIP_FOR_TARGET!$STRIP_FOR_TARGET$ac_delim +WINDRES_FOR_TARGET!$WINDRES_FOR_TARGET$ac_delim +FLAGS_FOR_TARGET!$FLAGS_FOR_TARGET$ac_delim +RAW_CXX_FOR_TARGET!$RAW_CXX_FOR_TARGET$ac_delim +COMPILER_AS_FOR_TARGET!$COMPILER_AS_FOR_TARGET$ac_delim +COMPILER_LD_FOR_TARGET!$COMPILER_LD_FOR_TARGET$ac_delim +COMPILER_NM_FOR_TARGET!$COMPILER_NM_FOR_TARGET$ac_delim +MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim +MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim +MAINT!$MAINT$ac_delim +stage1_cflags!$stage1_cflags$ac_delim +stage1_checking!$stage1_checking$ac_delim +stage2_werror_flag!$stage2_werror_flag$ac_delim +LIBOBJS!$LIBOBJS$ac_delim +LTLIBOBJS!$LTLIBOBJS$ac_delim +_ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 53; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } else - if test -z "$ac_sed_cmds"; then - ac_sed_cmds="sed -f conftest.s$ac_file" - else - ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file" - fi - ac_file=`expr $ac_file + 1` - ac_beg=$ac_end - ac_end=`expr $ac_end + $ac_max_sed_cmds` + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi done -if test -z "$ac_sed_cmds"; then - ac_sed_cmds=cat + +ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` +if test -n "$ac_eof"; then + ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` + ac_eof=`expr $ac_eof + 1` +fi + +cat >>$CONFIG_STATUS <<_ACEOF +cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end +_ACEOF +sed ' +s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g +s/^/s,@/; s/!/@,|#_!!_#|/ +:n +t n +s/'"$ac_delim"'$/,g/; t +s/$/\\/; p +N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n +' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF +:end +s/|#_!!_#|//g +CEOF$ac_eof +_ACEOF + + +# 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 -EOF -cat >> $CONFIG_STATUS <>$CONFIG_STATUS <<\_ACEOF +fi # test -n "$CONFIG_FILES" -CONFIG_FILES=\${CONFIG_FILES-"Makefile"} -EOF -cat >> $CONFIG_STATUS <<\EOF -for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". - case "$ac_file" in - *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` - ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; - *) ac_file_in="${ac_file}.in" ;; - esac - - # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories. - - # Remove last slash and all that follows it. Not all systems have dirname. - ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` - if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then - # The file is in a subdirectory. - test ! -d "$ac_dir" && mkdir "$ac_dir" - ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`" - # A "../" for each directory in $ac_dir_suffix. - ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'` - else - ac_dir_suffix= ac_dots= - fi - - case "$ac_given_srcdir" in - .) srcdir=. - if test -z "$ac_dots"; then top_srcdir=. - else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;; - /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; - *) # Relative path. - srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix" - top_srcdir="$ac_dots$ac_given_srcdir" ;; - esac - - case "$ac_given_INSTALL" in - [/$]*) INSTALL="$ac_given_INSTALL" ;; - *) INSTALL="$ac_dots$ac_given_INSTALL" ;; - esac - - echo creating "$ac_file" - rm -f "$ac_file" - configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure." - case "$ac_file" in - *Makefile*) ac_comsub="1i\\ -# $configure_input" ;; - *) ac_comsub= ;; - esac - - ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` - sed -e "$ac_comsub -s%@configure_input@%$configure_input%g -s%@srcdir@%$srcdir%g -s%@top_srcdir@%$top_srcdir%g -s%@INSTALL@%$INSTALL%g -" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file -fi; done -rm -f conftest.s* -EOF -cat >> $CONFIG_STATUS <&5 +echo "$as_me: error: Invalid tag $ac_tag." >&2;} + { (exit 1); exit 1; }; };; + :[FH]-) ac_tag=-:-;; + :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; + esac + ac_save_IFS=$IFS + IFS=: + set x $ac_tag + IFS=$ac_save_IFS + shift + ac_file=$1 + shift -EOF -cat >> $CONFIG_STATUS <<\EOF + case $ac_mode in + :L) ac_source=$1;; + :[FH]) + ac_file_inputs= + for ac_f + do + case $ac_f in + -) ac_f="$tmp/stdin";; + *) # Look for the file first in the build tree, then in the source tree + # (if the path is not absolute). The absolute path cannot be DOS-style, + # because $ac_f cannot contain `:'. + test -f "$ac_f" || + case $ac_f in + [\\/$]*) false;; + *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; + esac || + { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 +echo "$as_me: error: cannot find input file: $ac_f" >&2;} + { (exit 1); exit 1; }; };; + esac + ac_file_inputs="$ac_file_inputs $ac_f" + done -exit 0 -EOF + # 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. */ + configure_input="Generated from "`IFS=: + echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure." + if test x"$ac_file" != x-; then + configure_input="$ac_file. $configure_input" + { echo "$as_me:$LINENO: creating $ac_file" >&5 +echo "$as_me: creating $ac_file" >&6;} + fi + + case $ac_tag in + *:-:* | *:-) cat >"$tmp/stdin";; + esac + ;; + esac + + ac_dir=`$as_dirname -- "$ac_file" || +$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'` + { as_dir="$ac_dir" + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$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'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 +echo "$as_me: error: cannot create directory $as_dir" >&2;} + { (exit 1); exit 1; }; }; } + ac_builddir=. + +case "$ac_dir" in +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +*) + ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` + # A ".." for each directory in $ac_dir_suffix. + ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; + esac ;; +esac +ac_abs_top_builddir=$ac_pwd +ac_abs_builddir=$ac_pwd$ac_dir_suffix +# for backward compatibility: +ac_top_builddir=$ac_top_build_prefix + +case $srcdir in + .) # We are building in place. + ac_srcdir=. + ac_top_srcdir=$ac_top_builddir_sub + ac_abs_top_srcdir=$ac_pwd ;; + [\\/]* | ?:[\\/]* ) # Absolute name. + ac_srcdir=$srcdir$ac_dir_suffix; + ac_top_srcdir=$srcdir + ac_abs_top_srcdir=$srcdir ;; + *) # Relative name. + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_build_prefix$srcdir + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; +esac +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix + + + case $ac_mode in + :F) + # + # CONFIG_FILE + # + + case $INSTALL in + [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; + *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; + esac +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF +# If the template does not know about datarootdir, expand it. +# FIXME: This hack should be removed a few years after 2.60. +ac_datarootdir_hack=; ac_datarootdir_seen= + +case `sed -n '/datarootdir/ { + p + q +} +/@datadir@/p +/@docdir@/p +/@infodir@/p +/@localedir@/p +/@mandir@/p +' $ac_file_inputs` in +*datarootdir*) ac_datarootdir_seen=yes;; +*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) + { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF + ac_datarootdir_hack=' + s&@datadir@&$datadir&g + s&@docdir@&$docdir&g + s&@infodir@&$infodir&g + s&@localedir@&$localedir&g + s&@mandir@&$mandir&g + s&\\\${datarootdir}&$datarootdir&g' ;; +esac +_ACEOF + +# Neutralize VPATH when `$srcdir' = `.'. +# Shell code in configure.ac might set extrasub. +# FIXME: do we really want to maintain this feature? +cat >>$CONFIG_STATUS <<_ACEOF + sed "$ac_vpsub +$extrasub +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF +:t +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b +s&@configure_input@&$configure_input&;t t +s&@top_builddir@&$ac_top_builddir_sub&;t t +s&@srcdir@&$ac_srcdir&;t t +s&@abs_srcdir@&$ac_abs_srcdir&;t t +s&@top_srcdir@&$ac_top_srcdir&;t t +s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t +s&@builddir@&$ac_builddir&;t t +s&@abs_builddir@&$ac_abs_builddir&;t t +s&@abs_top_builddir@&$ac_abs_top_builddir&;t t +s&@INSTALL@&$ac_INSTALL&;t t +$ac_datarootdir_hack +" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out + +test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && + { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && + { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined." >&5 +echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined." >&2;} + + rm -f "$tmp/stdin" + case $ac_file in + -) cat "$tmp/out"; rm -f "$tmp/out";; + *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;; + esac + ;; + + + + esac + +done # for ac_tag + + +{ (exit 0); exit 0; } +_ACEOF chmod +x $CONFIG_STATUS -rm -fr confdefs* $ac_clean_files -test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 +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 Modified: llvm-gcc-4.2/tags/llvmgcc42-2077.2/configure.in URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/tags/llvmgcc42-2077.2/configure.in?rev=58208&r1=58203&r2=58208&view=diff ============================================================================== --- llvm-gcc-4.2/tags/llvmgcc42-2077.2/configure.in (original) +++ llvm-gcc-4.2/tags/llvmgcc42-2077.2/configure.in Sun Oct 26 17:45:02 2008 @@ -988,6 +988,9 @@ # APPLE LOCAL begin dynamic-no-pic i[[3456789]]86-*-darwin*) host_makefile_frag="config/mh-x86-darwin" + # gcc and c++ can default to x86_64 code generation, avoid that. + CC="${CC-gcc} -m32" + CXX="${CXX-c++} -m32" ;; # APPLE LOCAL end dynamic-no-pic powerpc-*-aix*) From isanbard at gmail.com Sun Oct 26 17:46:10 2008 From: isanbard at gmail.com (Bill Wendling) Date: Sun, 26 Oct 2008 22:46:10 -0000 Subject: [llvm-commits] [llvm] r58209 - /llvm/tags/Apple/llvmCore-2077.2/ Message-ID: <200810262246.m9QMkBkb023230@zion.cs.uiuc.edu> Author: void Date: Sun Oct 26 17:46:10 2008 New Revision: 58209 URL: http://llvm.org/viewvc/llvm-project?rev=58209&view=rev Log: Copy to sync up with llvmgcc42-2077.2 Added: llvm/tags/Apple/llvmCore-2077.2/ - copied from r58208, llvm/tags/Apple/llvmCore-2077.1/ From nicholas at mxc.ca Sun Oct 26 18:59:36 2008 From: nicholas at mxc.ca (Nick Lewycky) Date: Sun, 26 Oct 2008 23:59:36 -0000 Subject: [llvm-commits] [llvm] r58221 - in /llvm/trunk: docs/Bugpoint.html docs/CommandGuide/bugpoint.pod tools/bugpoint/ExecutionDriver.cpp Message-ID: <200810262359.m9QNxa4F025656@zion.cs.uiuc.edu> Author: nicholas Date: Sun Oct 26 18:59:36 2008 New Revision: 58221 URL: http://llvm.org/viewvc/llvm-project?rev=58221&view=rev Log: Remove -check-exit-code from bugpoint. This is subsumed by -append-exit-code. Note that -check-exit-code was on by default while -append-exit-code is not. Modified: llvm/trunk/docs/Bugpoint.html llvm/trunk/docs/CommandGuide/bugpoint.pod llvm/trunk/tools/bugpoint/ExecutionDriver.cpp Modified: llvm/trunk/docs/Bugpoint.html URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/Bugpoint.html?rev=58221&r1=58220&r2=58221&view=diff ============================================================================== --- llvm/trunk/docs/Bugpoint.html (original) +++ llvm/trunk/docs/Bugpoint.html Sun Oct 26 18:59:36 2008 @@ -211,11 +211,6 @@ you might try llvm-link -v on the same set of input files. If that also crashes, you may be experiencing a linker bug. -
  • If your program is supposed to crash, bugpoint will be - confused. One way to deal with this is to cause bugpoint to ignore the exit - code from your program, by giving it the -check-exit-code=false - option. -
  • bugpoint is useful for proactively finding bugs in LLVM. Invoking bugpoint with the -find-bugs option will cause the list of specified optimizations to be randomized and applied to the Modified: llvm/trunk/docs/CommandGuide/bugpoint.pod URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/CommandGuide/bugpoint.pod?rev=58221&r1=58220&r2=58221&view=diff ============================================================================== --- llvm/trunk/docs/CommandGuide/bugpoint.pod (original) +++ llvm/trunk/docs/CommandGuide/bugpoint.pod Sun Oct 26 18:59:36 2008 @@ -29,6 +29,11 @@ run. This is useful if you are debugging programs which depend on non-LLVM libraries (such as the X or curses libraries) to run. +=item B<--append-exit-code>=I<{true,false}> + +Append the test programs exit code to the output file so that a change in exit +code is considered a test failure. Defaults to false. + =item B<--args> I Pass all arguments specified after -args to the test program whenever it runs. @@ -52,11 +57,6 @@ options starting with C<-> to be part of the B<--tool-args> option, not as options to B itself. (See B<--args>, above.) -=item B<--check-exit-code>=I<{true,false}> - -Assume a non-zero exit code or core dump from the test program is a failure. -Defaults to true. - =item B<--disable-{dce,simplifycfg}> Do not run the specified passes to clean up and reduce the size of the test Modified: llvm/trunk/tools/bugpoint/ExecutionDriver.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/bugpoint/ExecutionDriver.cpp?rev=58221&r1=58220&r2=58221&view=diff ============================================================================== --- llvm/trunk/tools/bugpoint/ExecutionDriver.cpp (original) +++ llvm/trunk/tools/bugpoint/ExecutionDriver.cpp Sun Oct 26 18:59:36 2008 @@ -55,11 +55,6 @@ cl::init(AutoPick)); cl::opt - CheckProgramExitCode("check-exit-code", - cl::desc("Assume nonzero exit code is failure (default on)"), - cl::init(true)); - - cl::opt AppendProgramExitCode("append-exit-code", cl::desc("Append the exit code to the output so it gets diff'd too"), cl::init(false)); @@ -317,12 +312,6 @@ bool ProgramExitedNonzero; std::string outFN = executeProgram(OutputFile, "", "", cbe, &ProgramExitedNonzero); - if (ProgramExitedNonzero) { - std::cerr - << "Warning: While generating reference output, program exited with\n" - << "non-zero exit code. This will NOT be treated as a failure.\n"; - CheckProgramExitCode = false; - } return outFN; } @@ -384,14 +373,6 @@ sys::Path Output(executeProgram("", BitcodeFile, SharedObject, 0, &ProgramExitedNonzero)); - // If we're checking the program exit code, assume anything nonzero is bad. - if (CheckProgramExitCode && ProgramExitedNonzero) { - Output.eraseFromDisk(); - if (RemoveBitcode) - sys::Path(BitcodeFile).eraseFromDisk(); - return true; - } - std::string Error; bool FilesDifferent = false; if (int Diff = DiffFilesWithTolerance(sys::Path(ReferenceOutputFile), From isanbard at gmail.com Sun Oct 26 20:18:08 2008 From: isanbard at gmail.com (Bill Wendling) Date: Mon, 27 Oct 2008 01:18:08 -0000 Subject: [llvm-commits] [llvm-gcc-4.2] r58223 - /llvm-gcc-4.2/tags/llvmgcc42-2077.2/configure Message-ID: <200810270118.m9R1I9MP028510@zion.cs.uiuc.edu> Author: void Date: Sun Oct 26 20:18:08 2008 New Revision: 58223 URL: http://llvm.org/viewvc/llvm-project?rev=58223&view=rev Log: Generate configure with proper autoconf version. Modified: llvm-gcc-4.2/tags/llvmgcc42-2077.2/configure Modified: llvm-gcc-4.2/tags/llvmgcc42-2077.2/configure URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/tags/llvmgcc42-2077.2/configure?rev=58223&r1=58222&r2=58223&view=diff ============================================================================== --- llvm-gcc-4.2/tags/llvmgcc42-2077.2/configure (original) +++ llvm-gcc-4.2/tags/llvmgcc42-2077.2/configure Sun Oct 26 20:18:08 2008 @@ -1,740 +1,83 @@ #! /bin/sh + # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61. +# Generated automatically using autoconf version 2.13 +# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. # -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## - -# Be more Bourne compatible -DUALCASE=1; export DUALCASE # for MKS sh -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+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; -esac - -fi - - - - -# PATH needs CR -# 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 - -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi - - -# IFS -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent editors from complaining about space-tab. -# (If _AS_PATH_WALK were called with IFS unset, it would disable word -# splitting by setting IFS to empty value.) -as_nl=' -' -IFS=" "" $as_nl" - -# Find who we are. Look in the path if we contain no directory separator. -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 -IFS=$as_save_IFS - - ;; -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_myself: error: cannot find myself; rerun with an absolute file name" >&2 - { (exit 1); exit 1; } -fi - -# Work around bugs in pre-3.0 UWIN ksh. -for as_var in ENV MAIL MAILPATH -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -done -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 -z "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else - ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - fi -done - -# Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; 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'` - -# CDPATH. -$as_unset CDPATH - - -if test "x$CONFIG_SHELL" = x; then - if (eval ":") 2>/dev/null; then - as_have_required=yes -else - as_have_required=no -fi - - if test $as_have_required = yes && (eval ": -(as_func_return () { - (exit \$1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} - -exitcode=0 -if as_func_success; then - : -else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi - -if as_func_ret_success; then - : -else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. -fi - -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then - : -else - exitcode=1 - echo positional parameters were not saved. -fi - -test \$exitcode = 0) || { (exit 1); exit 1; } - -( - as_lineno_1=\$LINENO - as_lineno_2=\$LINENO - test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && - test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } -") 2> /dev/null; then - : -else - as_candidate_shells= - 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=. - case $as_dir in - /*) - for as_base in sh bash ksh sh5; do - as_candidate_shells="$as_candidate_shells $as_dir/$as_base" - done;; - esac -done -IFS=$as_save_IFS - - - for as_shell in $as_candidate_shells $SHELL; do - # Try only shells that exist, to save several forks. - if { test -f "$as_shell" || test -f "$as_shell.exe"; } && - { ("$as_shell") 2> /dev/null <<\_ASEOF -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+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; -esac - -fi - - -: -_ASEOF -}; then - CONFIG_SHELL=$as_shell - as_have_required=yes - if { "$as_shell" 2> /dev/null <<\_ASEOF -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+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; -esac - -fi - - -: -(as_func_return () { - (exit $1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} - -exitcode=0 -if as_func_success; then - : -else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi - -if as_func_ret_success; then - : -else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. -fi - -if ( set x; as_func_ret_success y && test x = "$1" ); then - : -else - exitcode=1 - echo positional parameters were not saved. -fi - -test $exitcode = 0) || { (exit 1); exit 1; } - -( - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } - -_ASEOF -}; then - break -fi - -fi - - done - - if test "x$CONFIG_SHELL" != x; then - for as_var in BASH_ENV ENV - do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - done - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} -fi - - - if test $as_have_required = no; then - echo This script requires a shell more modern than all the - echo shells that I found on your system. Please install a - echo modern shell, or manually run the script under such a - echo shell if you do have one. - { (exit 1); exit 1; } -fi - - -fi - -fi - - - -(eval "as_func_return () { - (exit \$1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} - -exitcode=0 -if as_func_success; then - : -else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi - -if as_func_ret_success; then - : -else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. -fi - -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then - : -else - exitcode=1 - echo positional parameters were not saved. -fi - -test \$exitcode = 0") || { - echo No shell found that supports shell functions. - echo Please tell autoconf at gnu.org about your system, - echo including any error possibly output before this - echo message -} - - - - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { - - # 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 after each line using $LINENO; the second 'sed' - # does the real work. The second script uses 'N' to pair each - # line-number line with the line containing $LINENO, 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 - # scripts with optimization help from Paolo Bonzini. Blame Lee - # E. McMahon (1931-1989) for sed's syntax. :-) - sed -n ' - p - /[$]LINENO/= - ' <$as_myself | - sed ' - s/[$]LINENO.*/&-/ - t lineno - b - :lineno - N - :loop - s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ - t loop - s/-\n.*// - ' >$as_me.lineno && - chmod +x "$as_me.lineno" || - { 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 sensitive to this). - . "./$as_me.lineno" - # Exit status is that of the last command. - exit -} - - -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi - -ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in --n*) - case `echo 'x\c'` in - *c*) ECHO_T=' ';; # ECHO_T is single tab character. - *) ECHO_C='\c';; - esac;; -*) - ECHO_N='-n';; -esac - -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi - -rm -f conf$$ conf$$.exe conf$$.file -if test -d conf$$.dir; then - rm -f conf$$.dir/conf$$.file -else - rm -f conf$$.dir - mkdir conf$$.dir -fi -echo >conf$$.file -if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' -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$$.dir/conf$$.file conf$$.file -rmdir conf$$.dir 2>/dev/null - -if mkdir -p . 2>/dev/null; then - as_mkdir_p=: -else - test -d ./-p && rmdir ./-p - as_mkdir_p=false -fi - -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x - -# Sed expression to map a string onto a valid CPP name. -as_tr_cpp="eval 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="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - - -exec 7<&0 &1 - -# Name of the host. -# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, -# so uname gets run too. -ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` - -# -# Initializations. -# +# Defaults: +ac_help= ac_default_prefix=/usr/local -ac_clean_files= -ac_config_libobj_dir=. -LIBOBJS= -cross_compiling=no -subdirs= -MFLAGS= -MAKEFLAGS= -SHELL=${CONFIG_SHELL-/bin/sh} - -# Identity of this package. -PACKAGE_NAME= -PACKAGE_TARNAME= -PACKAGE_VERSION= -PACKAGE_STRING= -PACKAGE_BUGREPORT= - -ac_unique_file="move-if-change" -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 -datarootdir -datadir -sysconfdir -sharedstatedir -localstatedir -includedir -oldincludedir -docdir -infodir -htmldir -dvidir -pdfdir -psdir -libdir -localedir -mandir -DEFS -ECHO_C -ECHO_N -ECHO_T -LIBS -build_alias -host_alias -target_alias -build -build_cpu -build_vendor -build_os -host -host_cpu -host_vendor -host_os -target -target_cpu -target_vendor -target_os -INSTALL_PROGRAM -INSTALL_SCRIPT -INSTALL_DATA -LN -LN_S -TOPLEVEL_CONFIGURE_ARGUMENTS -build_libsubdir -build_subdir -host_subdir -target_subdir -CC -CFLAGS -LDFLAGS -CPPFLAGS -ac_ct_CC -EXEEXT -OBJEXT -GNATBIND -do_compare -gmplibs -gmpinc -stage1_languages -SYSROOT_CFLAGS_FOR_TARGET -RPATH_ENVVAR -tooldir -build_tooldir -CONFIGURE_GDB_TK -GDB_TK -INSTALL_GDB_TK -build_configargs -build_configdirs -host_configargs -configdirs -target_configargs -CC_FOR_BUILD -config_shell -YACC -BISON -M4 -LEX -FLEX -MAKEINFO -EXPECT -RUNTEST -AR -AS -DLLTOOL -LD -LIPO -NM -RANLIB -STRIP -WINDRES -OBJCOPY -OBJDUMP -CXX -CFLAGS_FOR_BUILD -CXXFLAGS -CC_FOR_TARGET -CXX_FOR_TARGET -GCC_FOR_TARGET -GCJ_FOR_TARGET -GFORTRAN_FOR_TARGET -AR_FOR_TARGET -AS_FOR_TARGET -DLLTOOL_FOR_TARGET -LD_FOR_TARGET -LIPO_FOR_TARGET -NM_FOR_TARGET -OBJDUMP_FOR_TARGET -RANLIB_FOR_TARGET -STRIP_FOR_TARGET -WINDRES_FOR_TARGET -FLAGS_FOR_TARGET -RAW_CXX_FOR_TARGET -COMPILER_AS_FOR_TARGET -COMPILER_LD_FOR_TARGET -COMPILER_NM_FOR_TARGET -MAINTAINER_MODE_TRUE -MAINTAINER_MODE_FALSE -MAINT -stage1_cflags -stage1_checking -stage2_werror_flag -LIBOBJS -LTLIBOBJS' -ac_subst_files='serialization_dependencies -host_makefile_frag -target_makefile_frag -alphaieee_frag -ospace_frag' - ac_precious_vars='build_alias -host_alias -target_alias -CC -CFLAGS -LDFLAGS -LIBS -CPPFLAGS' - +# Any additions from configure.in: +ac_help="$ac_help + --with-build-libsubdir=[DIR] Directory where to find libraries for build system" +ac_help="$ac_help + --enable-libada Builds libada directory" +ac_help="$ac_help + --enable-libssp Builds libssp directory" +ac_help="$ac_help + --with-mpfr-dir=PATH This option has been REMOVED" +ac_help="$ac_help + --with-mpfr=PATH Specify prefix directory for installed MPFR package + Equivalent to --with-mpfr-include=PATH/include + plus --with-mpfr-lib=PATH/lib" +ac_help="$ac_help + --with-mpfr-include=PATH + Specify directory for installed MPFR include files" +ac_help="$ac_help + --with-mpfr-lib=PATH Specify the directory for the installed MPFR library" +ac_help="$ac_help + --with-gmp-dir=PATH This option has been REMOVED" +ac_help="$ac_help + --with-gmp=PATH Specify prefix directory for the installed GMP package + Equivalent to --with-gmp-include=PATH/include + plus --with-gmp-lib=PATH/lib" +ac_help="$ac_help + --with-gmp-include=PATH Specify directory for installed GMP include files" +ac_help="$ac_help + --with-gmp-lib=PATH Specify the directory for the installed GMP library" +ac_help="$ac_help + --enable-objc-gc enable the use of Boehm's garbage collector with + the GNU Objective-C runtime." +ac_help="$ac_help + --with-build-sysroot=sysroot + use sysroot as the system root during the build" +ac_help="$ac_help + --enable-bootstrap Enable bootstrapping [yes if native build]" +ac_help="$ac_help + --enable-serial-[{host,target,build}-]configure + Force sequential configuration of + sub-packages for the host, target or build + machine, or all sub-packages" +ac_help="$ac_help + --with-build-time-tools=path + use given path to find target tools during the build" +ac_help="$ac_help + --enable-maintainer-mode enable make rules and dependencies not useful + (and sometimes confusing) to the casual installer" +ac_help="$ac_help + --enable-stage1-checking[=all] choose additional checking for stage1 + of the compiler." +ac_help="$ac_help + --enable-werror enable -Werror in bootstrap stage2 and later" +ac_help="$ac_help + --with-datarootdir Use datarootdir as the data root directory." +ac_help="$ac_help + --with-docdir Install documentation in this directory." +ac_help="$ac_help + --with-htmldir Install html in this directory." # Initialize some variables set by options. -ac_init_help= -ac_init_version=false # The variables have the same names as the options, with # dashes changed to underlines. -cache_file=/dev/null +build=NONE +cache_file=./config.cache exec_prefix=NONE +host=NONE no_create= +nonopt=NONE no_recursion= prefix=NONE program_prefix=NONE @@ -743,117 +86,94 @@ silent= site= srcdir= +target=NONE verbose= x_includes=NONE x_libraries=NONE - -# Installation directory options. -# These are left unexpanded so users can "make install exec_prefix=/foo" -# and all the variables that are supposed to be based on exec_prefix -# by default will actually change. -# Use braces instead of parens because sh, perl, etc. also accept them. -# (The list follows the same order as the GNU Coding Standards.) bindir='${exec_prefix}/bin' sbindir='${exec_prefix}/sbin' libexecdir='${exec_prefix}/libexec' -datarootdir='${prefix}/share' -datadir='${datarootdir}' +datadir='${prefix}/share' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +libdir='${exec_prefix}/lib' includedir='${prefix}/include' oldincludedir='/usr/include' -docdir='${datarootdir}/doc/${PACKAGE}' -infodir='${datarootdir}/info' -htmldir='${docdir}' -dvidir='${docdir}' -pdfdir='${docdir}' -psdir='${docdir}' -libdir='${exec_prefix}/lib' -localedir='${datarootdir}/locale' -mandir='${datarootdir}/man' +infodir='${prefix}/info' +mandir='${prefix}/man' + +# Initialize some other variables. +subdirs= +MFLAGS= MAKEFLAGS= +SHELL=${CONFIG_SHELL-/bin/sh} +# Maximum number of lines to put in a shell here document. +ac_max_here_lines=12 ac_prev= -ac_dashdash= for ac_option do + # If the previous option needs an argument, assign it. if test -n "$ac_prev"; then - eval $ac_prev=\$ac_option + eval "$ac_prev=\$ac_option" ac_prev= continue fi - case $ac_option in - *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; - *) ac_optarg=yes ;; + case "$ac_option" in + -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;; + *) ac_optarg= ;; esac # Accept the important Cygnus configure options, so we can diagnose typos. - case $ac_dashdash$ac_option in - --) - ac_dashdash=yes ;; + case "$ac_option" in -bindir | --bindir | --bindi | --bind | --bin | --bi) ac_prev=bindir ;; -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) - bindir=$ac_optarg ;; + bindir="$ac_optarg" ;; -build | --build | --buil | --bui | --bu) - ac_prev=build_alias ;; + ac_prev=build ;; -build=* | --build=* | --buil=* | --bui=* | --bu=*) - build_alias=$ac_optarg ;; + build="$ac_optarg" ;; -cache-file | --cache-file | --cache-fil | --cache-fi \ | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) ac_prev=cache_file ;; -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) - cache_file=$ac_optarg ;; - - --config-cache | -C) - cache_file=config.cache ;; + cache_file="$ac_optarg" ;; - -datadir | --datadir | --datadi | --datad) + -datadir | --datadir | --datadi | --datad | --data | --dat | --da) ac_prev=datadir ;; - -datadir=* | --datadir=* | --datadi=* | --datad=*) - datadir=$ac_optarg ;; - - -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ - | --dataroo | --dataro | --datar) - ac_prev=datarootdir ;; - -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ - | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) - datarootdir=$ac_optarg ;; + -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ + | --da=*) + datadir="$ac_optarg" ;; -disable-* | --disable-*) - ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` + ac_feature=`echo $ac_option|sed -e 's/-*disable-//'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 - { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` - eval enable_$ac_feature=no ;; - - -docdir | --docdir | --docdi | --doc | --do) - ac_prev=docdir ;; - -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) - docdir=$ac_optarg ;; - - -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) - ac_prev=dvidir ;; - -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) - dvidir=$ac_optarg ;; + if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then + { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } + fi + ac_feature=`echo $ac_feature| sed 's/-/_/g'` + eval "enable_${ac_feature}=no" ;; -enable-* | --enable-*) - ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` + ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 - { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` - eval enable_$ac_feature=\$ac_optarg ;; + if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then + { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } + fi + ac_feature=`echo $ac_feature| sed 's/-/_/g'` + case "$ac_option" in + *=*) ;; + *) ac_optarg=yes ;; + esac + eval "enable_${ac_feature}='$ac_optarg'" ;; -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ @@ -862,77 +182,116 @@ -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ | --exec=* | --exe=* | --ex=*) - exec_prefix=$ac_optarg ;; + exec_prefix="$ac_optarg" ;; -gas | --gas | --ga | --g) # Obsolete; use --with-gas. with_gas=yes ;; - -help | --help | --hel | --he | -h) - ac_init_help=long ;; - -help=r* | --help=r* | --hel=r* | --he=r* | -hr*) - ac_init_help=recursive ;; - -help=s* | --help=s* | --hel=s* | --he=s* | -hs*) - ac_init_help=short ;; + -help | --help | --hel | --he) + # Omit some internal or obsolete options to make the list less imposing. + # This message is too long to be a string in the A/UX 3.1 sh. + cat << EOF +Usage: configure [options] [host] +Options: [defaults in brackets after descriptions] +Configuration: + --cache-file=FILE cache test results in FILE + --help print this message + --no-create do not create output files + --quiet, --silent do not print \`checking...' messages + --version print the version of autoconf that created configure +Directory and file names: + --prefix=PREFIX install architecture-independent files in PREFIX + [$ac_default_prefix] + --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX + [same as prefix] + --bindir=DIR user executables in DIR [EPREFIX/bin] + --sbindir=DIR system admin executables in DIR [EPREFIX/sbin] + --libexecdir=DIR program executables in DIR [EPREFIX/libexec] + --datadir=DIR read-only architecture-independent data in DIR + [PREFIX/share] + --sysconfdir=DIR read-only single-machine data in DIR [PREFIX/etc] + --sharedstatedir=DIR modifiable architecture-independent data in DIR + [PREFIX/com] + --localstatedir=DIR modifiable single-machine data in DIR [PREFIX/var] + --libdir=DIR object code libraries in DIR [EPREFIX/lib] + --includedir=DIR C header files in DIR [PREFIX/include] + --oldincludedir=DIR C header files for non-gcc in DIR [/usr/include] + --infodir=DIR info documentation in DIR [PREFIX/info] + --mandir=DIR man documentation in DIR [PREFIX/man] + --srcdir=DIR find the sources in DIR [configure dir or ..] + --program-prefix=PREFIX prepend PREFIX to installed program names + --program-suffix=SUFFIX append SUFFIX to installed program names + --program-transform-name=PROGRAM + run sed PROGRAM on installed program names +EOF + cat << EOF +Host type: + --build=BUILD configure for building on BUILD [BUILD=HOST] + --host=HOST configure for HOST [guessed] + --target=TARGET configure for TARGET [TARGET=HOST] +Features and packages: + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] + --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --x-includes=DIR X include files are in DIR + --x-libraries=DIR X library files are in DIR +EOF + if test -n "$ac_help"; then + echo "--enable and --with options recognized:$ac_help" + fi + exit 0 ;; -host | --host | --hos | --ho) - ac_prev=host_alias ;; + ac_prev=host ;; -host=* | --host=* | --hos=* | --ho=*) - host_alias=$ac_optarg ;; - - -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) - ac_prev=htmldir ;; - -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ - | --ht=*) - htmldir=$ac_optarg ;; + host="$ac_optarg" ;; -includedir | --includedir | --includedi | --included | --include \ | --includ | --inclu | --incl | --inc) ac_prev=includedir ;; -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ | --includ=* | --inclu=* | --incl=* | --inc=*) - includedir=$ac_optarg ;; + includedir="$ac_optarg" ;; -infodir | --infodir | --infodi | --infod | --info | --inf) ac_prev=infodir ;; -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) - infodir=$ac_optarg ;; + infodir="$ac_optarg" ;; -libdir | --libdir | --libdi | --libd) ac_prev=libdir ;; -libdir=* | --libdir=* | --libdi=* | --libd=*) - libdir=$ac_optarg ;; + libdir="$ac_optarg" ;; -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ | --libexe | --libex | --libe) ac_prev=libexecdir ;; -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ | --libexe=* | --libex=* | --libe=*) - libexecdir=$ac_optarg ;; - - -localedir | --localedir | --localedi | --localed | --locale) - ac_prev=localedir ;; - -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) - localedir=$ac_optarg ;; + libexecdir="$ac_optarg" ;; -localstatedir | --localstatedir | --localstatedi | --localstated \ - | --localstate | --localstat | --localsta | --localst | --locals) + | --localstate | --localstat | --localsta | --localst \ + | --locals | --local | --loca | --loc | --lo) ac_prev=localstatedir ;; -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ - | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) - localstatedir=$ac_optarg ;; + | --localstate=* | --localstat=* | --localsta=* | --localst=* \ + | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) + localstatedir="$ac_optarg" ;; -mandir | --mandir | --mandi | --mand | --man | --ma | --m) ac_prev=mandir ;; -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) - mandir=$ac_optarg ;; + mandir="$ac_optarg" ;; -nfp | --nfp | --nf) # Obsolete; use --without-fp. with_fp=no ;; -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c | -n) + | --no-cr | --no-c) no_create=yes ;; -no-recursion | --no-recursion | --no-recursio | --no-recursi \ @@ -946,26 +305,26 @@ -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) - oldincludedir=$ac_optarg ;; + oldincludedir="$ac_optarg" ;; -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) ac_prev=prefix ;; -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) - prefix=$ac_optarg ;; + prefix="$ac_optarg" ;; -program-prefix | --program-prefix | --program-prefi | --program-pref \ | --program-pre | --program-pr | --program-p) ac_prev=program_prefix ;; -program-prefix=* | --program-prefix=* | --program-prefi=* \ | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) - program_prefix=$ac_optarg ;; + program_prefix="$ac_optarg" ;; -program-suffix | --program-suffix | --program-suffi | --program-suff \ | --program-suf | --program-su | --program-s) ac_prev=program_suffix ;; -program-suffix=* | --program-suffix=* | --program-suffi=* \ | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) - program_suffix=$ac_optarg ;; + program_suffix="$ac_optarg" ;; -program-transform-name | --program-transform-name \ | --program-transform-nam | --program-transform-na \ @@ -982,17 +341,7 @@ | --program-transfo=* | --program-transf=* \ | --program-trans=* | --program-tran=* \ | --progr-tra=* | --program-tr=* | --program-t=*) - program_transform_name=$ac_optarg ;; - - -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) - ac_prev=pdfdir ;; - -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) - pdfdir=$ac_optarg ;; - - -psdir | --psdir | --psdi | --psd | --ps) - ac_prev=psdir ;; - -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) - psdir=$ac_optarg ;; + program_transform_name="$ac_optarg" ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil) @@ -1002,7 +351,7 @@ ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ | --sbi=* | --sb=*) - sbindir=$ac_optarg ;; + sbindir="$ac_optarg" ;; -sharedstatedir | --sharedstatedir | --sharedstatedi \ | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ @@ -1013,53 +362,58 @@ | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ | --sha=* | --sh=*) - sharedstatedir=$ac_optarg ;; + sharedstatedir="$ac_optarg" ;; -site | --site | --sit) ac_prev=site ;; -site=* | --site=* | --sit=*) - site=$ac_optarg ;; + site="$ac_optarg" ;; -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) ac_prev=srcdir ;; -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) - srcdir=$ac_optarg ;; + srcdir="$ac_optarg" ;; -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ | --syscon | --sysco | --sysc | --sys | --sy) ac_prev=sysconfdir ;; -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) - sysconfdir=$ac_optarg ;; + sysconfdir="$ac_optarg" ;; -target | --target | --targe | --targ | --tar | --ta | --t) - ac_prev=target_alias ;; + ac_prev=target ;; -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) - target_alias=$ac_optarg ;; + target="$ac_optarg" ;; -v | -verbose | --verbose | --verbos | --verbo | --verb) verbose=yes ;; - -version | --version | --versio | --versi | --vers | -V) - ac_init_version=: ;; + -version | --version | --versio | --versi | --vers) + echo "configure generated by autoconf version 2.13" + exit 0 ;; -with-* | --with-*) - ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` + ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 - { (exit 1); exit 1; }; } - ac_package=`echo $ac_package | sed 's/[-.]/_/g'` - eval with_$ac_package=\$ac_optarg ;; + if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then + { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } + fi + ac_package=`echo $ac_package| sed 's/-/_/g'` + case "$ac_option" in + *=*) ;; + *) ac_optarg=yes ;; + esac + eval "with_${ac_package}='$ac_optarg'" ;; -without-* | --without-*) - ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` + ac_package=`echo $ac_option|sed -e 's/-*without-//'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 - { (exit 1); exit 1; }; } - ac_package=`echo $ac_package | sed 's/[-.]/_/g'` - eval with_$ac_package=no ;; + if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then + { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } + fi + ac_package=`echo $ac_package| sed 's/-/_/g'` + eval "with_${ac_package}=no" ;; --x) # Obsolete; use --with-x. @@ -1070,880 +424,287 @@ ac_prev=x_includes ;; -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) - x_includes=$ac_optarg ;; + x_includes="$ac_optarg" ;; -x-libraries | --x-libraries | --x-librarie | --x-librari \ | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) ac_prev=x_libraries ;; -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) - x_libraries=$ac_optarg ;; + x_libraries="$ac_optarg" ;; - -*) { echo "$as_me: error: unrecognized option: $ac_option -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } + -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; } ;; - *=*) - ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` - # Reject names that are not valid shell variable names. - expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 - { (exit 1); exit 1; }; } - eval $ac_envvar=\$ac_optarg - export $ac_envvar ;; - *) - # FIXME: should be removed in autoconf 3.0. - echo "$as_me: WARNING: you should use --build, --host, --target" >&2 - expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && - echo "$as_me: WARNING: invalid host type: $ac_option" >&2 - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} + if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then + echo "configure: warning: $ac_option: invalid host type" 1>&2 + fi + if test "x$nonopt" != xNONE; then + { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } + fi + nonopt="$ac_option" ;; esac done if test -n "$ac_prev"; then - ac_option=--`echo $ac_prev | sed 's/_/-/g'` - { echo "$as_me: error: missing argument to $ac_option" >&2 - { (exit 1); exit 1; }; } + { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; } fi -# Be sure to have absolute directory names. -for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ - datadir sysconfdir sharedstatedir localstatedir includedir \ - oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir +trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 + +# File descriptor usage: +# 0 standard input +# 1 file creation +# 2 errors and warnings +# 3 some systems may open it to /dev/tty +# 4 used on the Kubota Titan +# 6 checking for... messages and results +# 5 compiler messages saved in config.log +if test "$silent" = yes; then + exec 6>/dev/null +else + exec 6>&1 +fi +exec 5>./config.log + +echo "\ +This file contains any messages produced by compilers while +running configure, to aid debugging if configure makes a mistake. +" 1>&5 + +# Strip out --no-create and --no-recursion so they do not pile up. +# Also quote any args containing shell metacharacters. +ac_configure_args= +for ac_arg do - eval ac_val=\$$ac_var - case $ac_val in - [\\/$]* | ?:[\\/]* ) continue;; - NONE | '' ) case $ac_var in *prefix ) continue;; esac;; + case "$ac_arg" in + -no-create | --no-create | --no-creat | --no-crea | --no-cre \ + | --no-cr | --no-c) ;; + -no-recursion | --no-recursion | --no-recursio | --no-recursi \ + | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;; + *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*) + ac_configure_args="$ac_configure_args '$ac_arg'" ;; + *) ac_configure_args="$ac_configure_args $ac_arg" ;; esac - { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; } done -# There might be people who depend on the old broken behavior: `$host' -# used to hold the argument of --host etc. -# FIXME: To remove some day. -build=$build_alias -host=$host_alias -target=$target_alias - -# FIXME: To remove some day. -if test "x$host_alias" != x; then - if test "x$build_alias" = x; then - cross_compiling=maybe - echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used." >&2 - elif test "x$build_alias" != "x$host_alias"; then - cross_compiling=yes - fi -fi - -ac_tool_prefix= -test -n "$host_alias" && ac_tool_prefix=$host_alias- - -test "$silent" = yes && exec 6>/dev/null - - -ac_pwd=`pwd` && test -n "$ac_pwd" && -ac_ls_di=`ls -di .` && -ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - { echo "$as_me: error: Working directory cannot be determined" >&2 - { (exit 1); exit 1; }; } -test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - { echo "$as_me: error: pwd does not report name of working directory" >&2 - { (exit 1); exit 1; }; } +# NLS nuisances. +# Only set these to C if already set. These must not be set unconditionally +# because not all systems understand e.g. LANG=C (notably SCO). +# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! +# Non-C LC_CTYPE values break the ctype check. +if test "${LANG+set}" = set; then LANG=C; export LANG; fi +if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi +if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi +if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi +# confdefs.h avoids OS command line length limits that DEFS can exceed. +rm -rf conftest* confdefs.h +# AIX cpp loses on an empty file, so make sure it contains at least a newline. +echo > confdefs.h + +# A filename unique to this package, relative to the directory that +# configure is in, which we can look for to find out if srcdir is correct. +ac_unique_file=move-if-change # Find the source files, if location was not specified. if test -z "$srcdir"; then ac_srcdir_defaulted=yes - # Try the directory containing this script, then the parent directory. - ac_confdir=`$as_dirname -- "$0" || -$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$0" : 'X\(//\)[^/]' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || -echo X"$0" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` + # Try the directory containing this script, then its parent. + ac_prog=$0 + ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'` + test "x$ac_confdir" = "x$ac_prog" && ac_confdir=. srcdir=$ac_confdir - if test ! -r "$srcdir/$ac_unique_file"; then + if test ! -r $srcdir/$ac_unique_file; then srcdir=.. fi else ac_srcdir_defaulted=no fi -if test ! -r "$srcdir/$ac_unique_file"; then - test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 - { (exit 1); exit 1; }; } -fi -ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" -ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2 - { (exit 1); exit 1; }; } - pwd)` -# When building in place, set srcdir=. -if test "$ac_abs_confdir" = "$ac_pwd"; then - srcdir=. -fi -# Remove unnecessary trailing slashes from srcdir. -# Double slashes in file names in object file debugging info -# mess up M-x gdb in Emacs. -case $srcdir in -*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; -esac -for ac_var in $ac_precious_vars; do - eval ac_env_${ac_var}_set=\${${ac_var}+set} - eval ac_env_${ac_var}_value=\$${ac_var} - eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} - eval ac_cv_env_${ac_var}_value=\$${ac_var} -done - -# -# Report the --help message. -# -if test "$ac_init_help" = "long"; then - # Omit some internal or obsolete options to make the list less imposing. - # This message is too long to be a string in the A/UX 3.1 sh. - cat <<_ACEOF -\`configure' configures this package to adapt to many kinds of systems. - -Usage: $0 [OPTION]... [VAR=VALUE]... - -To assign environment variables (e.g., CC, CFLAGS...), specify them as -VAR=VALUE. See below for descriptions of some of the useful variables. - -Defaults for the options are specified in brackets. - -Configuration: - -h, --help display this help and exit - --help=short display options specific to this package - --help=recursive display the short help of all the included packages - -V, --version display version information and exit - -q, --quiet, --silent do not print \`checking...' messages - --cache-file=FILE cache test results in FILE [disabled] - -C, --config-cache alias for \`--cache-file=config.cache' - -n, --no-create do not create output files - --srcdir=DIR find the sources in DIR [configure dir or \`..'] - -Installation directories: - --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] - --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [PREFIX] - -By default, \`make install' will install all the files in -\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify -an installation prefix other than \`$ac_default_prefix' using \`--prefix', -for instance \`--prefix=\$HOME'. - -For better control, use the options below. - -Fine tuning of the installation directories: - --bindir=DIR user executables [EPREFIX/bin] - --sbindir=DIR system admin executables [EPREFIX/sbin] - --libexecdir=DIR program executables [EPREFIX/libexec] - --sysconfdir=DIR read-only single-machine data [PREFIX/etc] - --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] - --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --libdir=DIR object code libraries [EPREFIX/lib] - --includedir=DIR C header files [PREFIX/include] - --oldincludedir=DIR C header files for non-gcc [/usr/include] - --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] - --datadir=DIR read-only architecture-independent data [DATAROOTDIR] - --infodir=DIR info documentation [DATAROOTDIR/info] - --localedir=DIR locale-dependent data [DATAROOTDIR/locale] - --mandir=DIR man documentation [DATAROOTDIR/man] - --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE] - --htmldir=DIR html documentation [DOCDIR] - --dvidir=DIR dvi documentation [DOCDIR] - --pdfdir=DIR pdf documentation [DOCDIR] - --psdir=DIR ps documentation [DOCDIR] -_ACEOF - - cat <<\_ACEOF - -Program names: - --program-prefix=PREFIX prepend PREFIX to installed program names - --program-suffix=SUFFIX append SUFFIX to installed program names - --program-transform-name=PROGRAM run sed PROGRAM on installed program names - -System types: - --build=BUILD configure for building on BUILD [guessed] - --host=HOST cross-compile to build programs to run on HOST [BUILD] - --target=TARGET configure for building compilers for TARGET [HOST] -_ACEOF -fi - -if test -n "$ac_init_help"; then - - cat <<\_ACEOF - -Optional Features: - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) - --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-libada Builds libada directory - --enable-libssp Builds libssp directory - --enable-objc-gc enable the use of Boehm's garbage collector with - the GNU Objective-C runtime. - --enable-bootstrap Enable bootstrapping yes if native build - --enable-serial-{host,target,build}-configure - Force sequential configuration of - sub-packages for the host, target or build - machine, or all sub-packages - --enable-maintainer-mode enable make rules and dependencies not useful - (and sometimes confusing) to the casual installer - --enable-stage1-checking=all choose additional checking for stage1 - of the compiler. - --enable-werror enable -Werror in bootstrap stage2 and later - -Optional Packages: - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] - --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-build-libsubdir=DIR Directory where to find libraries for build system - --with-mpfr-dir=PATH This option has been REMOVED - --with-mpfr=PATH Specify prefix directory for installed MPFR package - Equivalent to --with-mpfr-include=PATH/include - plus --with-mpfr-lib=PATH/lib - --with-mpfr-include=PATH - Specify directory for installed MPFR include files - --with-mpfr-lib=PATH Specify the directory for the installed MPFR library - --with-gmp-dir=PATH This option has been REMOVED - --with-gmp=PATH Specify prefix directory for the installed GMP package - Equivalent to --with-gmp-include=PATH/include - plus --with-gmp-lib=PATH/lib - --with-gmp-include=PATH Specify directory for installed GMP include files - --with-gmp-lib=PATH Specify the directory for the installed GMP library - --with-build-sysroot=sysroot - use sysroot as the system root during the build - --with-build-time-tools=path - use given path to find target tools during the build - --with-datarootdir Use datarootdir as the data root directory. - --with-docdir Install documentation in this directory. - --with-htmldir Install html in this directory. - -Some influential environment variables: - CC C compiler command - CFLAGS C compiler flags - LDFLAGS linker flags, e.g. -L if you have libraries in a - nonstandard directory - LIBS libraries to pass to the linker, e.g. -l - CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if - you have headers in a nonstandard directory - -Use these variables to override the choices made by `configure' or to help -it to find libraries and programs with nonstandard names/locations. - -_ACEOF -ac_status=$? -fi - -if test "$ac_init_help" = "recursive"; then - # If there are subdirs, report their specific --help. - for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue - test -d "$ac_dir" || continue - ac_builddir=. - -case "$ac_dir" in -.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -*) - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` - case $ac_top_builddir_sub in - "") ac_top_builddir_sub=. ac_top_build_prefix= ;; - *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; - esac ;; -esac -ac_abs_top_builddir=$ac_pwd -ac_abs_builddir=$ac_pwd$ac_dir_suffix -# for backward compatibility: -ac_top_builddir=$ac_top_build_prefix - -case $srcdir in - .) # We are building in place. - ac_srcdir=. - ac_top_srcdir=$ac_top_builddir_sub - ac_abs_top_srcdir=$ac_pwd ;; - [\\/]* | ?:[\\/]* ) # Absolute name. - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir - ac_abs_top_srcdir=$srcdir ;; - *) # Relative name. - ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_build_prefix$srcdir - ac_abs_top_srcdir=$ac_pwd/$srcdir ;; -esac -ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - - cd "$ac_dir" || { ac_status=$?; continue; } - # Check for guested configure. - if test -f "$ac_srcdir/configure.gnu"; then - echo && - $SHELL "$ac_srcdir/configure.gnu" --help=recursive - elif test -f "$ac_srcdir/configure"; then - echo && - $SHELL "$ac_srcdir/configure" --help=recursive - else - echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 - fi || ac_status=$? - cd "$ac_pwd" || { ac_status=$?; break; } - done -fi - -test -n "$ac_init_help" && exit $ac_status -if $ac_init_version; then - cat <<\_ACEOF -configure -generated by GNU Autoconf 2.61 - -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -This configure script is free software; the Free Software Foundation -gives unlimited permission to copy, distribute and modify it. -_ACEOF - exit +if test ! -r $srcdir/$ac_unique_file; then + if test "$ac_srcdir_defaulted" = yes; then + { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; } + else + { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; } + fi fi -cat >config.log <<_ACEOF -This file contains any messages produced by compilers while -running configure, to aid debugging if configure makes a mistake. - -It was created by $as_me, which was -generated by GNU Autoconf 2.61. Invocation command line was - - $ $0 $@ - -_ACEOF -exec 5>>config.log -{ -cat <<_ASUNAME -## --------- ## -## Platform. ## -## --------- ## - -hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` -uname -m = `(uname -m) 2>/dev/null || echo unknown` -uname -r = `(uname -r) 2>/dev/null || echo unknown` -uname -s = `(uname -s) 2>/dev/null || echo unknown` -uname -v = `(uname -v) 2>/dev/null || echo unknown` - -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` -/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` - -/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` -/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` -/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` -/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` -/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` -/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` +srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` -_ASUNAME - -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - echo "PATH: $as_dir" -done -IFS=$as_save_IFS - -} >&5 - -cat >&5 <<_ACEOF - - -## ----------- ## -## Core tests. ## -## ----------- ## - -_ACEOF - - -# 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_must_keep_next=false -for ac_pass in 1 2 -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_arg'" - ;; - 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 -# would cause problems or look ugly. -# WARNING: Use '\'' to represent an apostrophe within the trap. -# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. -trap 'exit_status=$? - # Save into config.log some information that might help in debugging. - { - echo - - cat <<\_ASBOX -## ---------------- ## -## Cache variables. ## -## ---------------- ## -_ASBOX - echo - # The following way of writing the cache mishandles newlines in values, -( - for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do - eval ac_val=\$$ac_var - case $ac_val in #( - *${as_nl}*) - case $ac_var in #( - *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 -echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; - esac - case $ac_var in #( - _ | IFS | as_nl) ;; #( - *) $as_unset $ac_var ;; - esac ;; - esac - done - (set) 2>&1 | - case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( - *${as_nl}ac_space=\ *) - sed -n \ - "s/'\''/'\''\\\\'\'''\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" - ;; #( - *) - sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" - ;; - esac | - sort -) - echo - - cat <<\_ASBOX -## ----------------- ## -## Output variables. ## -## ----------------- ## -_ASBOX - echo - for ac_var in $ac_subst_vars - do - eval ac_val=\$$ac_var - case $ac_val in - *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; - esac - echo "$ac_var='\''$ac_val'\''" - done | sort - echo - - if test -n "$ac_subst_files"; then - cat <<\_ASBOX -## ------------------- ## -## File substitutions. ## -## ------------------- ## -_ASBOX - echo - for ac_var in $ac_subst_files - do - eval ac_val=\$$ac_var - case $ac_val in - *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; - esac - echo "$ac_var='\''$ac_val'\''" - done | sort - echo - fi - - if test -s confdefs.h; then - cat <<\_ASBOX -## ----------- ## -## confdefs.h. ## -## ----------- ## -_ASBOX - echo - cat confdefs.h - echo - fi - test "$ac_signal" != 0 && - echo "$as_me: caught signal $ac_signal" - echo "$as_me: exit $exit_status" - } >&5 - rm -f core *.core core.conftest.* && - rm -f -r conftest* confdefs* conf$$* $ac_clean_files && - exit $exit_status -' 0 -for ac_signal in 1 2 13 15; do - trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal -done -ac_signal=0 - -# confdefs.h avoids OS command line length limits that DEFS can exceed. -rm -f -r conftest* confdefs.h - -# Predefined preprocessor variables. - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_NAME "$PACKAGE_NAME" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_TARNAME "$PACKAGE_TARNAME" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_VERSION "$PACKAGE_VERSION" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_STRING "$PACKAGE_STRING" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" -_ACEOF - - -# Let the site file select an alternate cache file if it wants to. # Prefer explicitly selected file to automatically selected ones. -if test -n "$CONFIG_SITE"; then - set x "$CONFIG_SITE" -elif test "x$prefix" != xNONE; then - set x "$prefix/share/config.site" "$prefix/etc/config.site" -else - set x "$ac_default_prefix/share/config.site" \ - "$ac_default_prefix/etc/config.site" +if test -z "$CONFIG_SITE"; then + if test "x$prefix" != xNONE; then + CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" + else + CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" + fi fi -shift -for ac_site_file -do +for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then - { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 -echo "$as_me: loading site script $ac_site_file" >&6;} - sed 's/^/| /' "$ac_site_file" >&5 + echo "loading site script $ac_site_file" . "$ac_site_file" fi done if test -r "$cache_file"; then - # Some versions of bash will fail to source /dev/null (special - # files actually), so we avoid doing that. - if test -f "$cache_file"; then - { echo "$as_me:$LINENO: loading cache $cache_file" >&5 -echo "$as_me: loading cache $cache_file" >&6;} - case $cache_file in - [\\/]* | ?:[\\/]* ) . "$cache_file";; - *) . "./$cache_file";; - esac - fi + echo "loading cache $cache_file" + . $cache_file else - { echo "$as_me:$LINENO: creating cache $cache_file" >&5 -echo "$as_me: creating cache $cache_file" >&6;} - >$cache_file -fi - -# Check that the precious variables saved in the cache have kept the same -# value. -ac_cache_corrupted=false -for ac_var in $ac_precious_vars; do - eval ac_old_set=\$ac_cv_env_${ac_var}_set - eval ac_new_set=\$ac_env_${ac_var}_set - eval ac_old_val=\$ac_cv_env_${ac_var}_value - eval ac_new_val=\$ac_env_${ac_var}_value - case $ac_old_set,$ac_new_set in - set,) - { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,set) - { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 -echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,);; - *) - if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 -echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 -echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 -echo "$as_me: current value: $ac_new_val" >&2;} - ac_cache_corrupted=: - fi;; - esac - # Pass precious variables to config.status. - if test "$ac_new_set" = set; then - case $ac_new_val in - *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; - *) ac_arg=$ac_var=$ac_new_val ;; - esac - case " $ac_configure_args " in - *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. - *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; - esac - fi -done -if $ac_cache_corrupted; then - { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 -echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 -echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} - { (exit 1); exit 1; }; } + echo "creating cache $cache_file" + > $cache_file fi - - - - - - - - - - - - - - - - ac_ext=c +# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross + +ac_exeext= +ac_objext=o +if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then + # Stardent Vistra SVR4 grep lacks -e, says ghazi at caip.rutgers.edu. + if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then + ac_n= ac_c=' +' ac_t=' ' + else + ac_n=-n ac_c= ac_t= + fi +else + ac_n= ac_c='\c' ac_t= +fi ac_aux_dir= -for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do - if test -f "$ac_dir/install-sh"; then +for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do + if test -f $ac_dir/install-sh; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/install-sh -c" break - elif test -f "$ac_dir/install.sh"; then + elif test -f $ac_dir/install.sh; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/install.sh -c" break - elif test -f "$ac_dir/shtool"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break fi done if test -z "$ac_aux_dir"; then - { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 -echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} - { (exit 1); exit 1; }; } + { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; } fi +ac_config_guess=$ac_aux_dir/config.guess +ac_config_sub=$ac_aux_dir/config.sub +ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. -# These three variables are undocumented and unsupported, -# and are intended to be withdrawn in a future Autoconf release. -# They can cause serious problems if a builder's source tree is in a directory -# whose full name contains unusual characters. -ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. -ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. -ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. + +# Do some error checking and defaulting for the host and target type. +# The inputs are: +# configure --host=HOST --target=TARGET --build=BUILD NONOPT +# +# The rules are: +# 1. You are not allowed to specify --host, --target, and nonopt at the +# same time. +# 2. Host defaults to nonopt. +# 3. If nonopt is not specified, then host defaults to the current host, +# as determined by config.guess. +# 4. Target and build default to nonopt. +# 5. If nonopt is not specified, then target and build default to host. + +# The aliases save the names the user supplied, while $host etc. +# will get canonicalized. +case $host---$target---$nonopt in +NONE---*---* | *---NONE---* | *---*---NONE) ;; +*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;; +esac # Make sure we can run config.sub. -$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 -echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} - { (exit 1); exit 1; }; } - -{ echo "$as_me:$LINENO: checking build system type" >&5 -echo $ECHO_N "checking build system type... $ECHO_C" >&6; } -if test "${ac_cv_build+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_build_alias=$build_alias -test "x$ac_build_alias" = x && - ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` -test "x$ac_build_alias" = x && - { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 -echo "$as_me: error: cannot guess build type; you must specify one" >&2;} - { (exit 1); exit 1; }; } -ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 -echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} - { (exit 1); exit 1; }; } - -fi -{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5 -echo "${ECHO_T}$ac_cv_build" >&6; } -case $ac_cv_build in -*-*-*) ;; -*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 -echo "$as_me: error: invalid value of canonical build" >&2;} - { (exit 1); exit 1; }; };; -esac -build=$ac_cv_build -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_build -shift -build_cpu=$1 -build_vendor=$2 -shift; shift -# Remember, the first character of IFS is used to create $*, -# except with old shells: -build_os=$* -IFS=$ac_save_IFS -case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac - - -{ echo "$as_me:$LINENO: checking host system type" >&5 -echo $ECHO_N "checking host system type... $ECHO_C" >&6; } -if test "${ac_cv_host+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "x$host_alias" = x; then - ac_cv_host=$ac_cv_build -else - ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || - { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 -echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} - { (exit 1); exit 1; }; } +if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then : +else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi -fi -{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5 -echo "${ECHO_T}$ac_cv_host" >&6; } -case $ac_cv_host in -*-*-*) ;; -*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 -echo "$as_me: error: invalid value of canonical host" >&2;} - { (exit 1); exit 1; }; };; -esac -host=$ac_cv_host -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_host -shift -host_cpu=$1 -host_vendor=$2 -shift; shift -# Remember, the first character of IFS is used to create $*, -# except with old shells: -host_os=$* -IFS=$ac_save_IFS -case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac - - -{ echo "$as_me:$LINENO: checking target system type" >&5 -echo $ECHO_N "checking target system type... $ECHO_C" >&6; } -if test "${ac_cv_target+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "x$target_alias" = x; then - ac_cv_target=$ac_cv_host -else - ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` || - { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5 -echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;} - { (exit 1); exit 1; }; } -fi +echo $ac_n "checking host system type""... $ac_c" 1>&6 +echo "configure:630: checking host system type" >&5 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_target" >&5 -echo "${ECHO_T}$ac_cv_target" >&6; } -case $ac_cv_target in -*-*-*) ;; -*) { { echo "$as_me:$LINENO: error: invalid value of canonical target" >&5 -echo "$as_me: error: invalid value of canonical target" >&2;} - { (exit 1); exit 1; }; };; -esac -target=$ac_cv_target -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_target -shift -target_cpu=$1 -target_vendor=$2 -shift; shift -# Remember, the first character of IFS is used to create $*, -# except with old shells: -target_os=$* -IFS=$ac_save_IFS -case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac +host_alias=$host +case "$host_alias" in +NONE) + case $nonopt in + NONE) + if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then : + else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; } + fi ;; + *) host_alias=$nonopt ;; + esac ;; +esac + +host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias` +host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +echo "$ac_t""$host" 1>&6 + +echo $ac_n "checking target system type""... $ac_c" 1>&6 +echo "configure:651: checking target system type" >&5 + +target_alias=$target +case "$target_alias" in +NONE) + case $nonopt in + NONE) target_alias=$host_alias ;; + *) target_alias=$nonopt ;; + esac ;; +esac +target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias` +target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +echo "$ac_t""$target" 1>&6 + +echo $ac_n "checking build system type""... $ac_c" 1>&6 +echo "configure:669: checking build system type" >&5 + +build_alias=$build +case "$build_alias" in +NONE) + case $nonopt in + NONE) build_alias=$host_alias ;; + *) build_alias=$nonopt ;; + esac ;; +esac -# The aliases save the names the user supplied, while $host etc. -# will get canonicalized. -test -n "$target_alias" && +build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias` +build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +echo "$ac_t""$build" 1>&6 + +test "$host_alias" != "$target_alias" && test "$program_prefix$program_suffix$program_transform_name" = \ NONENONEs,x,x, && program_prefix=${target_alias}- + +if test "$program_transform_name" = s,x,x,; then + program_transform_name= +else + # Double any \ or $. echo might interpret backslashes. + cat <<\EOF_SED > conftestsed +s,\\,\\\\,g; s,\$,$$,g +EOF_SED + program_transform_name="`echo $program_transform_name|sed -f conftestsed`" + rm -f conftestsed +fi test "$program_prefix" != NONE && - program_transform_name="s&^&$program_prefix&;$program_transform_name" + program_transform_name="s,^,${program_prefix},; $program_transform_name" # Use a double $ so make ignores it. test "$program_suffix" != NONE && - program_transform_name="s&\$&$program_suffix&;$program_transform_name" -# Double any \ or $. echo might interpret backslashes. -# By default was `s,x,x', remove it if useless. -cat <<\_ACEOF >conftest.sed -s/[\\$]/&&/g;s/;s,x,x,$// -_ACEOF -program_transform_name=`echo $program_transform_name | sed -f conftest.sed` -rm -f conftest.sed + program_transform_name="s,\$\$,${program_suffix},; $program_transform_name" + +# sed with no file args requires a program. +test "$program_transform_name" = "" && program_transform_name="s,x,x," # Get 'install' or 'install-sh' and its variants. @@ -1954,83 +715,67 @@ # SunOS /usr/etc/install # IRIX /sbin/install # AIX /bin/install -# AmigaOS /C/install, which installs bootblocks on floppy discs # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag # AFS /usr/afsws/bin/install, which mishandles nonexistent args # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -# OS/2's system install, which has a completely different semantic # ./install, which can be erroneously created by make from ./install.sh. -{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 -echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } +echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 +echo "configure:724: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - # Account for people who put trailing slashes in PATH elements. -case $as_dir/ in - ./ | .// | /cC/* | \ - /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ - ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ - /usr/ucb/* ) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" + for ac_dir in $PATH; do + # Account for people who put trailing slashes in PATH elements. + case "$ac_dir/" in + /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; + *) + # OSF1 and SCO ODT 3.0 have their own names for install. + # Don't use installbsd from OSF since it installs stuff as root + # by default. + for ac_prog in ginstall scoinst install; do + if test -f $ac_dir/$ac_prog; then if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. : - elif test $ac_prog = install && - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : else - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" - break 3 + ac_cv_path_install="$ac_dir/$ac_prog -c" + break 2 fi fi done - done - ;; -esac -done -IFS=$as_save_IFS - + ;; + esac + done + IFS="$ac_save_IFS" fi if test "${ac_cv_path_install+set}" = set; then - INSTALL=$ac_cv_path_install + INSTALL="$ac_cv_path_install" else - # As a last resort, use the slow shell script. Don't cache a - # value for INSTALL within a source directory, because that will + # As a last resort, use the slow shell script. We don't cache a + # path for INSTALL within a source directory, because that will # break other packages using the cache if that directory is - # removed, or if the value is a relative name. - INSTALL=$ac_install_sh + # removed, or if the path is relative. + INSTALL="$ac_install_sh" fi fi -{ echo "$as_me:$LINENO: result: $INSTALL" >&5 -echo "${ECHO_T}$INSTALL" >&6; } +echo "$ac_t""$INSTALL" 1>&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. # It thinks the first close brace ends the variable substitution. test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -{ echo "$as_me:$LINENO: checking whether ln works" >&5 -echo $ECHO_N "checking whether ln works... $ECHO_C" >&6; } -if test "${acx_cv_prog_LN+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking whether ln works""... $ac_c" 1>&6 +echo "configure:777: checking whether ln works" >&5 +if eval "test \"`echo '$''{'acx_cv_prog_LN'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else rm -f conftestdata_t echo >conftestdata_f @@ -2045,23 +790,31 @@ fi if test $acx_cv_prog_LN = no; then LN="cp" - { echo "$as_me:$LINENO: result: no, using $LN" >&5 -echo "${ECHO_T}no, using $LN" >&6; } + echo "$ac_t""no, using $LN" 1>&6 else LN="$acx_cv_prog_LN" - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$ac_t""yes" 1>&6 fi -{ echo "$as_me:$LINENO: checking whether ln -s works" >&5 -echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; } -LN_S=$as_ln_s -if test "$LN_S" = "ln -s"; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } +echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 +echo "configure:801: checking whether ln -s works" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else - { echo "$as_me:$LINENO: result: no, using $LN_S" >&5 -echo "${ECHO_T}no, using $LN_S" >&6; } + rm -f conftestdata +if ln -s X conftestdata 2>/dev/null +then + rm -f conftestdata + ac_cv_prog_LN_S="ln -s" +else + ac_cv_prog_LN_S=ln +fi +fi +LN_S="$ac_cv_prog_LN_S" +if test "$ac_cv_prog_LN_S" = "ln -s"; then + echo "$ac_t""yes" 1>&6 +else + echo "$ac_t""no" 1>&6 fi @@ -2138,11 +891,11 @@ ### or a host dependent tool. Then put it into the appropriate list ### (library or tools, host or target), doing a dependency sort. -# Subdirs will be configured in the order listed in build_configdirs, +# Subdirs will be configured in the order listed in build_configdirs, # configdirs, or target_configdirs; see the serialization section below. -# Dependency sorting is only needed when *configuration* must be done in -# a particular order. In all cases a dependency should be specified in +# Dependency sorting is only needed when *configuration* must be done in +# a particular order. In all cases a dependency should be specified in # the Makefile, whether or not it's implicitly specified here. # Double entries in build_configdirs, configdirs, or target_configdirs may @@ -2222,7 +975,7 @@ is_cross_compiler=no else is_cross_compiler=yes -fi +fi # Find the build and target subdir names. case ${build_alias} in @@ -2240,7 +993,7 @@ *) target_noncanonical=${target_alias} ;; esac - + # post-stage1 host modules use a different CC_FOR_BUILD so, in order to # have matching libraries, they should use host libraries: Makefile.tpl # arranges to pass --with-build-libsubdir=$(HOST_SUBDIR). @@ -2252,10 +1005,10 @@ # Prefix 'build-' so this never conflicts with target_subdir. build_subdir="build-${build_noncanonical}" - -# Check whether --with-build-libsubdir was given. +# Check whether --with-build-libsubdir or --without-build-libsubdir was given. if test "${with_build_libsubdir+set}" = set; then - withval=$with_build_libsubdir; build_libsubdir="$withval" + withval="$with_build_libsubdir" + build_libsubdir="$withval" else build_libsubdir="$build_subdir" fi @@ -2269,7 +1022,7 @@ fi # No prefix. target_subdir=${target_noncanonical} - + # Skipdirs are removed silently. skipdirs= @@ -2290,7 +1043,7 @@ noconfigdirs="$noconfigdirs gas" fi -# some tools are so dependent upon X11 that if we're not building with X, +# some tools are so dependent upon X11 that if we're not building with X, # it's not even worth trying to configure, much less build, that tool. case ${with_x} in @@ -2298,13 +1051,13 @@ no) skipdirs="${skipdirs} tk itcl libgui" # We won't be able to build gdbtk without X. - enable_gdbtk=no + enable_gdbtk=no ;; *) echo "*** bad value \"${with_x}\" for -with-x flag; ignored" 1>&2 ;; esac # Some tools are only suitable for building in a "native" situation. -# Remove these if host!=target. +# Remove these if host!=target. native_only="autoconf automake libtool fileutils find gawk gettext gzip hello indent m4 rcs recode sed shellutils tar textutils uudecode wdiff target-groff guile perl time ash bash bzip2 prms gnuserv target-gperf" # Similarly, some are only suitable for cross toolchains. @@ -2342,7 +1095,7 @@ # Only spaces may be used in this macro; not newlines or tabs. unsupported_languages= -# Remove more programs from consideration, based on the host or +# Remove more programs from consideration, based on the host or # target this usually means that a port of the program doesn't # exist yet. @@ -2378,9 +1131,10 @@ esac -# Check whether --enable-libada was given. +# Check whether --enable-libada or --disable-libada was given. if test "${enable_libada+set}" = set; then - enableval=$enable_libada; ENABLE_LIBADA=$enableval + enableval="$enable_libada" + ENABLE_LIBADA=$enableval else ENABLE_LIBADA=yes fi @@ -2389,9 +1143,10 @@ noconfigdirs="$noconfigdirs gnattools" fi -# Check whether --enable-libssp was given. +# Check whether --enable-libssp or --disable-libssp was given. if test "${enable_libssp+set}" = set; then - enableval=$enable_libssp; ENABLE_LIBSSP=$enableval + enableval="$enable_libssp" + ENABLE_LIBSSP=$enableval else ENABLE_LIBSSP=yes fi @@ -2562,7 +1317,7 @@ ;; sh-*-linux*) noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss" - ;; + ;; sh*-*-pe|mips*-*-pe|*arm-wince-pe) noconfigdirs="$noconfigdirs ${libgcj}" noconfigdirs="$noconfigdirs target-examples" @@ -2725,7 +1480,7 @@ i[3456789]86-*-mingw32*) target_configdirs="$target_configdirs target-winsup" noconfigdirs="$noconfigdirs expect target-libgloss target-newlib ${libgcj}" - ;; + ;; *-*-cygwin*) target_configdirs="$target_configdirs target-libtermcap target-winsup" noconfigdirs="$noconfigdirs target-gperf target-libgloss ${libgcj}" @@ -2735,7 +1490,7 @@ elif test -d "$srcdir/newlib"; then echo "Warning: winsup/cygwin is missing so newlib can't be built." fi - ;; + ;; i[3456789]86-moss-msdos | i[3456789]86-*-moss* | \ i[3456789]86-*-uwin* | i[3456789]86-*-interix* ) ;; @@ -2914,7 +1669,7 @@ ;; *-*-lynxos*) noconfigdirs="$noconfigdirs target-newlib target-libgloss ${libgcj}" - ;; + ;; *-*-*) noconfigdirs="$noconfigdirs ${libgcj}" ;; @@ -3138,791 +1893,214 @@ # This is all going to change when we autoconfiscate... CC_FOR_BUILD="\$(CC)" - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. -set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="${ac_tool_prefix}gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CC="gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - if test "x$ac_ct_CC" = x; then - CC="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf at gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf at gnu.org." >&2;} -ac_tool_warned=yes ;; -esac - CC=$ac_ct_CC - fi -else - CC="$ac_cv_prog_CC" -fi - -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. -set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:1900: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="${ac_tool_prefix}cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_CC="gcc" + break + fi + done + IFS="$ac_save_ifs" fi fi -CC=$ac_cv_prog_CC +CC="$ac_cv_prog_CC" if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } + echo "$ac_t""$CC" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi - - fi -fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:1930: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ac_prog_rejected=no -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue - fi - ac_cv_prog_CC="cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" + break + fi + done + IFS="$ac_save_ifs" if test $ac_prog_rejected = yes; then # We found a bogon in the path, so make sure we never use it. set dummy $ac_cv_prog_CC shift - if test $# != 0; then + if test $# -gt 0; then # We chose a different compiler from the bogus one. # However, it has the same basename, so the bogon will be chosen # first if we set CC to just the basename; use the full file name. shift - ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" + set dummy "$ac_dir/$ac_word" "$@" + shift + ac_cv_prog_CC="$@" fi fi fi fi -CC=$ac_cv_prog_CC +CC="$ac_cv_prog_CC" if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } + echo "$ac_t""$CC" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi - -fi -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - for ac_prog in cl.exe - 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 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + if test -z "$CC"; then + case "`uname -s`" in + *win32* | *WIN32*) + # Extract the first word of "cl", so it can be a program name with args. +set dummy cl; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:1981: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - - test -n "$CC" && break + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_CC="cl" + break + fi done -fi -if test -z "$CC"; then - ac_ct_CC=$CC - for ac_prog in cl.exe -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CC="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - + IFS="$ac_save_ifs" fi fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6; } +CC="$ac_cv_prog_CC" +if test -n "$CC"; then + echo "$ac_t""$CC" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi - - - test -n "$ac_ct_CC" && break -done - - if test "x$ac_ct_CC" = x; then - CC="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf at gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf at gnu.org." >&2;} -ac_tool_warned=yes ;; -esac - CC=$ac_ct_CC + ;; + esac fi + test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } fi -fi - +echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 +echo "configure:2013: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 -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. -echo "$as_me:$LINENO: checking for C compiler version" >&5 -ac_compiler=`set X $ac_compile; echo $2` -{ (ac_try="$ac_compiler --version >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler -v >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler -V >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -ac_clean_files_save=$ac_clean_files -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. -{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 -echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; } -ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -# -# List of possible output files, starting from the most likely. -# The algorithm is not robust to junk in `.', hence go to wildcards (a.*) -# only as a last resort. b.out is created by i960 compilers. -ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out' -# -# The IRIX 6 linker writes into existing files which may not be -# executable, retaining their permissions. Remove them first so a -# subsequent execution test works. -ac_rmfiles= -for ac_file in $ac_files -do - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; - * ) ac_rmfiles="$ac_rmfiles $ac_file";; - esac -done -rm -f $ac_rmfiles +ac_ext=c +# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CPP $CPPFLAGS' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross -if { (ac_try="$ac_link_default" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link_default") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. -# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' -# in a Makefile. We should not override ac_cv_exeext if it was cached, -# so that the user can short-circuit this test for compilers unknown to -# Autoconf. -for ac_file in $ac_files '' -do - test -f "$ac_file" || continue - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) - ;; - [ab].out ) - # We found the default executable, but exeext='' is most - # certainly right. - break;; - *.* ) - if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; - then :; else - ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - fi - # We set ac_cv_exeext here because the later test for it is not - # safe: cross compilers may not add the suffix if given an `-o' - # argument, so we may need to know it at that point already. - # Even if this section looks crufty: it has the advantage of - # actually working. - break;; - * ) - break;; - esac -done -test "$ac_cv_exeext" = no && ac_cv_exeext= +cat > conftest.$ac_ext << EOF -else - ac_file='' -fi +#line 2024 "configure" +#include "confdefs.h" -{ echo "$as_me:$LINENO: result: $ac_file" >&5 -echo "${ECHO_T}$ac_file" >&6; } -if test -z "$ac_file"; then - 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;} - { (exit 77); exit 77; }; } -fi - -ac_exeext=$ac_cv_exeext - -# Check that the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5 -echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; } -# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 -# If not cross compiling, check that we can run a simple program. -if test "$cross_compiling" != yes; then - if { ac_try='./$ac_file' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cross_compiling=no +main(){return(0);} +EOF +if { (eval echo configure:2029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + ac_cv_prog_cc_works=yes + # If we can't run a trivial program, we are probably using a cross compiler. + if (./conftest; exit) 2>/dev/null; then + ac_cv_prog_cc_cross=no else - if test "$cross_compiling" = maybe; then - 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 -echo "$as_me: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - fi + ac_cv_prog_cc_cross=yes fi +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + ac_cv_prog_cc_works=no fi -{ echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - -rm -f a.out a.exe conftest$ac_cv_exeext b.out -ac_clean_files=$ac_clean_files_save -# Check that the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 -echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; } -{ echo "$as_me:$LINENO: result: $cross_compiling" >&5 -echo "${ECHO_T}$cross_compiling" >&6; } - -{ echo "$as_me:$LINENO: checking for suffix of executables" >&5 -echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; } -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - # If both `conftest.exe' and `conftest' are `present' (well, observable) -# 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 - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; - *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - break;; - * ) break;; - esac -done +rm -fr conftest* +ac_ext=c +# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CPP $CPPFLAGS' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross + +echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 +if test $ac_cv_prog_cc_works = no; then + { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } +fi +echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 +echo "configure:2055: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 +cross_compiling=$ac_cv_prog_cc_cross + +echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 +echo "configure:2060: checking whether we are using GNU C" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 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;} - { (exit 1); exit 1; }; } -fi - -rm -f conftest$ac_cv_exeext -{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 -echo "${ECHO_T}$ac_cv_exeext" >&6; } - -rm -f conftest.$ac_ext -EXEEXT=$ac_cv_exeext -ac_exeext=$EXEEXT -{ echo "$as_me:$LINENO: checking for suffix of object files" >&5 -echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; } -if test "${ac_cv_objext+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.o conftest.obj -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - for ac_file in conftest.o conftest.obj conftest.*; do - test -f "$ac_file" || continue; - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;; - *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` - break;; - esac -done + cat > conftest.c <&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then + ac_cv_prog_gcc=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_prog_gcc=no +fi +fi -{ { 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 - -rm -f conftest.$ac_cv_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 -echo "${ECHO_T}$ac_cv_objext" >&6; } -OBJEXT=$ac_cv_objext -ac_objext=$OBJEXT -{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } -if test "${ac_cv_c_compiler_gnu+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ -#ifndef __GNUC__ - choke me -#endif +echo "$ac_t""$ac_cv_prog_gcc" 1>&6 - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_compiler_gnu=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_compiler_gnu=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -ac_cv_c_compiler_gnu=$ac_compiler_gnu - -fi -{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } -GCC=`test $ac_compiler_gnu = yes && echo yes` -ac_test_CFLAGS=${CFLAGS+set} -ac_save_CFLAGS=$CFLAGS -{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 -echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } -if test "${ac_cv_prog_cc_g+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_save_c_werror_flag=$ac_c_werror_flag - ac_c_werror_flag=yes - ac_cv_prog_cc_g=no - CFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_cc_g=yes +if test $ac_cv_prog_gcc = yes; then + GCC=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + GCC= +fi - CFLAGS="" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : +ac_test_CFLAGS="${CFLAGS+set}" +ac_save_CFLAGS="$CFLAGS" +CFLAGS= +echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 +echo "configure:2088: checking whether ${CC-cc} accepts -g" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_c_werror_flag=$ac_save_c_werror_flag - CFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + echo 'void f(){}' > conftest.c +if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then ac_cv_prog_cc_g=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cv_prog_cc_g=no fi +rm -f conftest* -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_c_werror_flag=$ac_save_c_werror_flag -fi -{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } +echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 if test "$ac_test_CFLAGS" = set; then - CFLAGS=$ac_save_CFLAGS + CFLAGS="$ac_save_CFLAGS" elif test $ac_cv_prog_cc_g = yes; then if test "$GCC" = yes; then CFLAGS="-g -O2" @@ -3936,126 +2114,6 @@ CFLAGS= fi fi -{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 -echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_prog_cc_c89=no -ac_save_CC=$CC -cat >conftest.$ac_ext <<_ACEOF -/* 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; -} - -/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has - function prototypes and stuff, but not '\xHH' hex character constants. - These don't provoke an error unfortunately, instead are silently treated - as 'x'. The following induces an error, until -std is added to get - proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an - array size at least. It's necessary to write '\x00'==0 to get something - that's true only with -std. */ -int osf4_cc_array ['\x00' == 0 ? 1 : -1]; - -/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters - inside strings and character constants. */ -#define FOO(x) 'x' -int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; - -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 -for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ - -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" -do - CC="$ac_save_CC $ac_arg" - rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_cc_c89=$ac_arg -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext - test "x$ac_cv_prog_cc_c89" != "xno" && break -done -rm -f conftest.$ac_ext -CC=$ac_save_CC - -fi -# AC_CACHE_VAL -case "x$ac_cv_prog_cc_c89" in - x) - { echo "$as_me:$LINENO: result: none needed" >&5 -echo "${ECHO_T}none needed" >&6; } ;; - xno) - { echo "$as_me:$LINENO: result: unsupported" >&5 -echo "${ECHO_T}unsupported" >&6; } ;; - *) - CC="$CC $ac_cv_prog_cc_c89" - { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; -esac - - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu # We must set the default linker to the linker used by gcc for the correct @@ -4082,109 +2140,85 @@ CXXFLAGS=${CXXFLAGS-"-g -O2"} fi +if test $host != $build; then + ac_tool_prefix=${host_alias}- +else + ac_tool_prefix= +fi -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}gnatbind", so it can be a program name with args. +# Extract the first word of "${ac_tool_prefix}gnatbind", so it can be a program name with args. set dummy ${ac_tool_prefix}gnatbind; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_GNATBIND+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:2155: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_GNATBIND'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$GNATBIND"; then ac_cv_prog_GNATBIND="$GNATBIND" # Let the user override the test. else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_GNATBIND="${ac_tool_prefix}gnatbind" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_GNATBIND="${ac_tool_prefix}gnatbind" + break + fi + done + IFS="$ac_save_ifs" fi fi -GNATBIND=$ac_cv_prog_GNATBIND +GNATBIND="$ac_cv_prog_GNATBIND" if test -n "$GNATBIND"; then - { echo "$as_me:$LINENO: result: $GNATBIND" >&5 -echo "${ECHO_T}$GNATBIND" >&6; } + echo "$ac_t""$GNATBIND" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi -fi if test -z "$ac_cv_prog_GNATBIND"; then - ac_ct_GNATBIND=$GNATBIND +if test -n "$ac_tool_prefix"; then # Extract the first word of "gnatbind", so it can be a program name with args. set dummy gnatbind; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_GNATBIND+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:2187: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_GNATBIND'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else - if test -n "$ac_ct_GNATBIND"; then - ac_cv_prog_ac_ct_GNATBIND="$ac_ct_GNATBIND" # Let the user override the test. + if test -n "$GNATBIND"; then + ac_cv_prog_GNATBIND="$GNATBIND" # Let the user override the test. else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_GNATBIND="gnatbind" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_GNATBIND="gnatbind" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_prog_GNATBIND" && ac_cv_prog_GNATBIND="no" fi fi -ac_ct_GNATBIND=$ac_cv_prog_ac_ct_GNATBIND -if test -n "$ac_ct_GNATBIND"; then - { echo "$as_me:$LINENO: result: $ac_ct_GNATBIND" >&5 -echo "${ECHO_T}$ac_ct_GNATBIND" >&6; } +GNATBIND="$ac_cv_prog_GNATBIND" +if test -n "$GNATBIND"; then + echo "$ac_t""$GNATBIND" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi - if test "x$ac_ct_GNATBIND" = x; then - GNATBIND="no" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf at gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf at gnu.org." >&2;} -ac_tool_warned=yes ;; -esac - GNATBIND=$ac_ct_GNATBIND - fi else - GNATBIND="$ac_cv_prog_GNATBIND" + GNATBIND="no" +fi fi -{ echo "$as_me:$LINENO: checking whether compiler driver understands Ada" >&5 -echo $ECHO_N "checking whether compiler driver understands Ada... $ECHO_C" >&6; } -if test "${acx_cv_cc_gcc_supports_ada+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking whether compiler driver understands Ada""... $ac_c" 1>&6 +echo "configure:2220: checking whether compiler driver understands Ada" >&5 +if eval "test \"`echo '$''{'acx_cv_cc_gcc_supports_ada'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else cat >conftest.adb <&5 -echo "${ECHO_T}$acx_cv_cc_gcc_supports_ada" >&6; } + +echo "$ac_t""$acx_cv_cc_gcc_supports_ada" 1>&6 if test x$GNATBIND != xno && test x$acx_cv_cc_gcc_supports_ada != xno; then have_gnat=yes @@ -4213,10 +2247,10 @@ have_gnat=no fi -{ echo "$as_me:$LINENO: checking how to compare bootstrapped objects" >&5 -echo $ECHO_N "checking how to compare bootstrapped objects... $ECHO_C" >&6; } -if test "${gcc_cv_prog_cmp_skip+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking how to compare bootstrapped objects""... $ac_c" 1>&6 +echo "configure:2252: checking how to compare bootstrapped objects" >&5 +if eval "test \"`echo '$''{'gcc_cv_prog_cmp_skip'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else echo abfoo >t1 echo cdfoo >t2 @@ -4238,8 +2272,8 @@ rm t1 t2 fi -{ echo "$as_me:$LINENO: result: $gcc_cv_prog_cmp_skip" >&5 -echo "${ECHO_T}$gcc_cv_prog_cmp_skip" >&6; } + +echo "$ac_t""$gcc_cv_prog_cmp_skip" 1>&6 do_compare="$gcc_cv_prog_cmp_skip" @@ -4250,33 +2284,30 @@ have_gmp=yes # Specify a location for mpfr # check for this first so it ends up on the link line before gmp. - -# Check whether --with-mpfr-dir was given. +# Check whether --with-mpfr-dir or --without-mpfr-dir was given. if test "${with_mpfr_dir+set}" = set; then - withval=$with_mpfr_dir; { { echo "$as_me:$LINENO: error: The --with-mpfr-dir=PATH option has been removed. -Use --with-mpfr=PATH or --with-mpfr-include=PATH plus --with-mpfr-lib=PATH" >&5 -echo "$as_me: error: The --with-mpfr-dir=PATH option has been removed. -Use --with-mpfr=PATH or --with-mpfr-include=PATH plus --with-mpfr-lib=PATH" >&2;} - { (exit 1); exit 1; }; } + withval="$with_mpfr_dir" + { echo "configure: error: The --with-mpfr-dir=PATH option has been removed. +Use --with-mpfr=PATH or --with-mpfr-include=PATH plus --with-mpfr-lib=PATH" 1>&2; exit 1; } fi - -# Check whether --with-mpfr was given. +# Check whether --with-mpfr or --without-mpfr was given. if test "${with_mpfr+set}" = set; then - withval=$with_mpfr; + withval="$with_mpfr" + : fi - -# Check whether --with-mpfr_include was given. +# Check whether --with-mpfr_include or --without-mpfr_include was given. if test "${with_mpfr_include+set}" = set; then - withval=$with_mpfr_include; + withval="$with_mpfr_include" + : fi - -# Check whether --with-mpfr_lib was given. +# Check whether --with-mpfr_lib or --without-mpfr_lib was given. if test "${with_mpfr_lib+set}" = set; then - withval=$with_mpfr_lib; + withval="$with_mpfr_lib" + : fi @@ -4292,35 +2323,32 @@ fi # Specify a location for gmp - -# Check whether --with-gmp-dir was given. +# Check whether --with-gmp-dir or --without-gmp-dir was given. if test "${with_gmp_dir+set}" = set; then - withval=$with_gmp_dir; { { echo "$as_me:$LINENO: error: The --with-gmp-dir=PATH option has been removed. -Use --with-gmp=PATH or --with-gmp-include=PATH plus --with-gmp-lib=PATH" >&5 -echo "$as_me: error: The --with-gmp-dir=PATH option has been removed. -Use --with-gmp=PATH or --with-gmp-include=PATH plus --with-gmp-lib=PATH" >&2;} - { (exit 1); exit 1; }; } + withval="$with_gmp_dir" + { echo "configure: error: The --with-gmp-dir=PATH option has been removed. +Use --with-gmp=PATH or --with-gmp-include=PATH plus --with-gmp-lib=PATH" 1>&2; exit 1; } fi gmplibs="$gmplibs -lgmp" - -# Check whether --with-gmp was given. +# Check whether --with-gmp or --without-gmp was given. if test "${with_gmp+set}" = set; then - withval=$with_gmp; + withval="$with_gmp" + : fi - -# Check whether --with-gmp_include was given. +# Check whether --with-gmp_include or --without-gmp_include was given. if test "${with_gmp_include+set}" = set; then - withval=$with_gmp_include; + withval="$with_gmp_include" + : fi - -# Check whether --with-gmp_lib was given. +# Check whether --with-gmp_lib or --without-gmp_lib was given. if test "${with_gmp_lib+set}" = set; then - withval=$with_gmp_lib; + withval="$with_gmp_lib" + : fi @@ -4339,159 +2367,81 @@ saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $gmpinc" # Check GMP actually works -{ echo "$as_me:$LINENO: checking for correct version of gmp.h" >&5 -echo $ECHO_N "checking for correct version of gmp.h... $ECHO_C" >&6; } - -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +echo $ac_n "checking for correct version of gmp.h""... $ac_c" 1>&6 +echo "configure:2372: checking for correct version of gmp.h" >&5 +cat > conftest.$ac_ext <&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; }; have_gmp=no +; return 0; } +EOF +if { (eval echo configure:2385: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + echo "$ac_t""yes" 1>&6 +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + echo "$ac_t""no" 1>&6; have_gmp=no fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest* if test x"$have_gmp" = xyes; then - { echo "$as_me:$LINENO: checking for correct version of mpfr.h" >&5 -echo $ECHO_N "checking for correct version of mpfr.h... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ + echo $ac_n "checking for correct version of mpfr.h""... $ac_c" 1>&6 +echo "configure:2398: checking for correct version of mpfr.h" >&5 + cat > conftest.$ac_ext < -int -main () -{ +int main() { #if MPFR_VERSION < MPFR_VERSION_NUM(2,2,1) choke me #endif - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { echo "$as_me:$LINENO: result: buggy version of MPFR detected" >&5 -echo "${ECHO_T}buggy version of MPFR detected" >&6; } +; return 0; } +EOF +if { (eval echo configure:2412: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + echo "$ac_t""yes" 1>&6 +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + echo "$ac_t""buggy version of MPFR detected" 1>&6 fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest* saved_LIBS="$LIBS" LIBS="$LIBS $gmplibs" - { echo "$as_me:$LINENO: checking for any version of mpfr.h" >&5 -echo $ECHO_N "checking for any version of mpfr.h... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ + echo $ac_n "checking for any version of mpfr.h""... $ac_c" 1>&6 +echo "configure:2426: checking for any version of mpfr.h" >&5 + cat > conftest.$ac_ext < #include -int -main () -{ +int main() { mpfr_t n; mpfr_init(n); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; }; have_gmp=no +; return 0; } +EOF +if { (eval echo configure:2436: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + echo "$ac_t""yes" 1>&6 +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + echo "$ac_t""no" 1>&6; have_gmp=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest* LIBS="$saved_LIBS" fi CFLAGS="$saved_CFLAGS" @@ -4575,7 +2525,7 @@ # an apparent bug in bash 1.12 on linux. ${srcdir}/gcc/[*]/config-lang.in) ;; *) - # From the config-lang.in, get $language, $target_libs, + # From the config-lang.in, get $language, $target_libs, # $lang_dirs, $boot_language, and $build_by_default language= target_libs= @@ -4620,9 +2570,7 @@ case ,${enable_languages}, in *,${language},*) # Specifically requested language; tell them. - { { echo "$as_me:$LINENO: error: The gcc/$i directory contains parts of $language but is missing" >&5 -echo "$as_me: error: The gcc/$i directory contains parts of $language but is missing" >&2;} - { (exit 1); exit 1; }; } + { echo "configure: error: The gcc/$i directory contains parts of $language but is missing" 1>&2; exit 1; } ;; *) # Silently disable. @@ -4635,9 +2583,7 @@ case ,${enable_languages},:${have_gmp}:${need_gmp} in *,${language},*:no:yes) # Specifically requested language; tell them. - { { echo "$as_me:$LINENO: error: GMP 4.1 and MPFR 2.2.1 or newer versions required by $language" >&5 -echo "$as_me: error: GMP 4.1 and MPFR 2.2.1 or newer versions required by $language" >&2;} - { (exit 1); exit 1; }; } + { echo "configure: error: GMP 4.1 and MPFR 2.2.1 or newer versions required by $language" 1>&2; exit 1; } ;; *:no:yes) # Silently disable. @@ -4674,13 +2620,9 @@ missing_languages=`echo "$missing_languages" | sed -e "s/^,//" -e "s/,$//"` if test "x$missing_languages" != x; then - { { echo "$as_me:$LINENO: error: -The following requested languages could not be built: ${missing_languages} -Recognised languages are: ${potential_languages}" >&5 -echo "$as_me: error: + { echo "configure: error: The following requested languages could not be built: ${missing_languages} -Recognised languages are: ${potential_languages}" >&2;} - { (exit 1); exit 1; }; } +Recognised languages are: ${potential_languages}" 1>&2; exit 1; } fi if test "x$new_enable_languages" != "x$enable_languages"; then @@ -4699,13 +2641,12 @@ done # Check for Boehm's garbage collector -# Check whether --enable-objc-gc was given. +# Check whether --enable-objc-gc or --disable-objc-gc was given. if test "${enable_objc_gc+set}" = set; then - enableval=$enable_objc_gc; case ,${enable_languages},:${enable_objc_gc}:${noconfigdirs} in + enableval="$enable_objc_gc" + case ,${enable_languages},:${enable_objc_gc}:${noconfigdirs} in *,objc,*:*:yes:*target-boehm-gc*) - { { echo "$as_me:$LINENO: error: Boehm's garbage collector was requested yet not supported in this configuration" >&5 -echo "$as_me: error: Boehm's garbage collector was requested yet not supported in this configuration" >&2;} - { (exit 1); exit 1; }; } + { echo "configure: error: Boehm's garbage collector was requested yet not supported in this configuration" 1>&2; exit 1; } ;; esac fi @@ -4786,7 +2727,7 @@ build_configdirs_all="$build_configdirs" build_configdirs= for i in ${build_configdirs_all} ; do - j=`echo $i | sed -e s/build-//g` + j=`echo $i | sed -e s/build-//g` if test -f ${srcdir}/$j/configure ; then build_configdirs="${build_configdirs} $i" fi @@ -4803,7 +2744,7 @@ target_configdirs_all="$target_configdirs" target_configdirs= for i in ${target_configdirs_all} ; do - j=`echo $i | sed -e s/target-//g` + j=`echo $i | sed -e s/target-//g` if test -f ${srcdir}/$j/configure ; then target_configdirs="${target_configdirs} $i" fi @@ -4851,10 +2792,10 @@ copy_dirs= - -# Check whether --with-build-sysroot was given. +# Check whether --with-build-sysroot or --without-build-sysroot was given. if test "${with_build_sysroot+set}" = set; then - withval=$with_build_sysroot; if test x"$withval" != x ; then + withval="$with_build_sysroot" + if test x"$withval" != x ; then SYSROOT_CFLAGS_FOR_TARGET="--sysroot=$withval" fi else @@ -4905,11 +2846,11 @@ # This is done by determining whether or not the appropriate directory # is available, and by checking whether or not specific configurations # have requested that this magic not happen. -# -# The command line options always override the explicit settings in +# +# The command line options always override the explicit settings in # configure.in, and the settings in configure.in override this magic. # -# If the default for a toolchain is to use GNU as and ld, and you don't +# If the default for a toolchain is to use GNU as and ld, and you don't # want to do that, then you should use the --without-gnu-as and # --without-gnu-ld options for the configure script. @@ -5025,7 +2966,7 @@ target_makefile_frag="config/mt-gnu" ;; *-*-aix4.[3456789]* | *-*-aix[56789].*) - # nm and ar from AIX 4.3 and above require -X32_64 flag to all ar and nm + # nm and ar from AIX 4.3 and above require -X32_64 flag to all ar and nm # commands to handle both 32-bit and 64-bit objects. These flags are # harmless if we're using GNU nm or ar. extra_arflags_for_target=" -X32_64" @@ -5085,7 +3026,7 @@ # hpux11 in 64bit mode has libraries in a weird place. Arrange to find # them automatically. case "${host}" in - hppa*64*-*-hpux11*) + hppa*64*-*-hpux11*) extra_host_args="$extra_host_args -x-libraries=/usr/lib/pa20_64 -x-includes=/usr/X11R6/include" ;; esac @@ -5122,7 +3063,7 @@ if test -s conftest || test -s conftest.exe ; then we_are_ok=yes fi -fi +fi case $we_are_ok in no) echo 1>&2 "*** The command '${CC} -o conftest ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} conftest.c' failed." @@ -5213,9 +3154,10 @@ # to maintain later. In this particular case, you just have to be careful # not to nest @if/@endif pairs, because configure will not warn you at all. -# Check whether --enable-bootstrap was given. +# Check whether --enable-bootstrap or --disable-bootstrap was given. if test "${enable_bootstrap+set}" = set; then - enableval=$enable_bootstrap; + enableval="$enable_bootstrap" + : else enable_bootstrap=default fi @@ -5245,21 +3187,16 @@ # Other configurations, but we have a compiler. Assume the user knows # what he's doing. yes:*:*:yes) - { echo "$as_me:$LINENO: WARNING: trying to bootstrap a cross compiler" >&5 -echo "$as_me: WARNING: trying to bootstrap a cross compiler" >&2;} + echo "configure: warning: trying to bootstrap a cross compiler" 1>&2 ;; # No compiler: if they passed --enable-bootstrap explicitly, fail no:*:*:yes) - { { echo "$as_me:$LINENO: error: cannot bootstrap without a compiler" >&5 -echo "$as_me: error: cannot bootstrap without a compiler" >&2;} - { (exit 1); exit 1; }; } ;; + { echo "configure: error: cannot bootstrap without a compiler" 1>&2; exit 1; } ;; # Fail if wrong command line *) - { { echo "$as_me:$LINENO: error: invalid option for --enable-bootstrap" >&5 -echo "$as_me: error: invalid option for --enable-bootstrap" >&2;} - { (exit 1); exit 1; }; } + { echo "configure: error: invalid option for --enable-bootstrap" 1>&2; exit 1; } ;; esac @@ -5316,9 +3253,10 @@ # Create the serialization dependencies. This uses a temporary file. -# Check whether --enable-serial-configure was given. +# Check whether --enable-serial-configure or --disable-serial-configure was given. if test "${enable_serial_configure+set}" = set; then - enableval=$enable_serial_configure; + enableval="$enable_serial_configure" + : fi @@ -5395,7 +3333,7 @@ s,\$,$$,g EOF_SED sed -f conftestsed < conftestsed.out - ${ac_configure_args} + ${ac_configure_args} EOF_SED baseargs=`cat conftestsed.out` rm -f conftestsed conftestsed.out @@ -5404,7 +3342,7 @@ # --program-suffix have been applied to it. Autoconf has already # doubled dollar signs and backslashes in program_transform_name; we want # the backslashes un-doubled, and then the entire thing wrapped in single -# quotes, because this will be expanded first by make and then by the shell. +# quotes, because this will be expanded first by make and then by the shell. # Also, because we want to override the logic in subdir configure scripts to # choose program_transform_name, replace any s,x,x, with s,y,y,. sed -e "s,\\\\\\\\,\\\\,g; s,','\\\\'',g; s/s,x,x,/s,y,y,/" < conftestsed.out @@ -5602,44 +3540,36 @@ for ac_prog in 'bison -y' byacc yacc do - # Extract the first word of "$ac_prog", so it can be a program name with args. +# Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_YACC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:3547: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$YACC"; then ac_cv_prog_YACC="$YACC" # Let the user override the test. else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_YACC="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_YACC="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" fi fi -YACC=$ac_cv_prog_YACC +YACC="$ac_cv_prog_YACC" if test -n "$YACC"; then - { echo "$as_me:$LINENO: result: $YACC" >&5 -echo "${ECHO_T}$YACC" >&6; } + echo "$ac_t""$YACC" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi - - test -n "$YACC" && break +test -n "$YACC" && break done test -n "$YACC" || YACC="$MISSING bison -y" @@ -5650,44 +3580,36 @@ for ac_prog in bison do - # Extract the first word of "$ac_prog", so it can be a program name with args. +# Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_BISON+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:3587: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_BISON'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$BISON"; then ac_cv_prog_BISON="$BISON" # Let the user override the test. else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_BISON="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_BISON="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" fi fi -BISON=$ac_cv_prog_BISON +BISON="$ac_cv_prog_BISON" if test -n "$BISON"; then - { echo "$as_me:$LINENO: result: $BISON" >&5 -echo "${ECHO_T}$BISON" >&6; } + echo "$ac_t""$BISON" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi - - test -n "$BISON" && break +test -n "$BISON" && break done test -n "$BISON" || BISON="$MISSING bison" @@ -5697,44 +3619,36 @@ for ac_prog in gm4 gnum4 m4 do - # Extract the first word of "$ac_prog", so it can be a program name with args. +# Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_M4+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:3626: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_M4'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$M4"; then ac_cv_prog_M4="$M4" # Let the user override the test. else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_M4="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_M4="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" fi fi -M4=$ac_cv_prog_M4 +M4="$ac_cv_prog_M4" if test -n "$M4"; then - { echo "$as_me:$LINENO: result: $M4" >&5 -echo "${ECHO_T}$M4" >&6; } + echo "$ac_t""$M4" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi - - test -n "$M4" && break +test -n "$M4" && break done test -n "$M4" || M4="$MISSING m4" @@ -5744,44 +3658,36 @@ for ac_prog in flex lex do - # Extract the first word of "$ac_prog", so it can be a program name with args. +# Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_LEX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:3665: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$LEX"; then ac_cv_prog_LEX="$LEX" # Let the user override the test. else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_LEX="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_LEX="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" fi fi -LEX=$ac_cv_prog_LEX +LEX="$ac_cv_prog_LEX" if test -n "$LEX"; then - { echo "$as_me:$LINENO: result: $LEX" >&5 -echo "${ECHO_T}$LEX" >&6; } + echo "$ac_t""$LEX" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi - - test -n "$LEX" && break +test -n "$LEX" && break done test -n "$LEX" || LEX="$MISSING flex" @@ -5792,44 +3698,36 @@ for ac_prog in flex do - # Extract the first word of "$ac_prog", so it can be a program name with args. +# Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_FLEX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:3705: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_FLEX'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$FLEX"; then ac_cv_prog_FLEX="$FLEX" # Let the user override the test. else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_FLEX="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_FLEX="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" fi fi -FLEX=$ac_cv_prog_FLEX +FLEX="$ac_cv_prog_FLEX" if test -n "$FLEX"; then - { echo "$as_me:$LINENO: result: $FLEX" >&5 -echo "${ECHO_T}$FLEX" >&6; } + echo "$ac_t""$FLEX" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi - - test -n "$FLEX" && break +test -n "$FLEX" && break done test -n "$FLEX" || FLEX="$MISSING flex" @@ -5839,44 +3737,36 @@ for ac_prog in makeinfo do - # Extract the first word of "$ac_prog", so it can be a program name with args. +# Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_MAKEINFO+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:3744: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_MAKEINFO'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$MAKEINFO"; then ac_cv_prog_MAKEINFO="$MAKEINFO" # Let the user override the test. else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_MAKEINFO="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_MAKEINFO="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" fi fi -MAKEINFO=$ac_cv_prog_MAKEINFO +MAKEINFO="$ac_cv_prog_MAKEINFO" if test -n "$MAKEINFO"; then - { echo "$as_me:$LINENO: result: $MAKEINFO" >&5 -echo "${ECHO_T}$MAKEINFO" >&6; } + echo "$ac_t""$MAKEINFO" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi - - test -n "$MAKEINFO" && break +test -n "$MAKEINFO" && break done test -n "$MAKEINFO" || MAKEINFO="$MISSING makeinfo" @@ -5900,44 +3790,36 @@ for ac_prog in expect do - # Extract the first word of "$ac_prog", so it can be a program name with args. +# Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_EXPECT+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:3797: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_EXPECT'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$EXPECT"; then ac_cv_prog_EXPECT="$EXPECT" # Let the user override the test. else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_EXPECT="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_EXPECT="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" fi fi -EXPECT=$ac_cv_prog_EXPECT +EXPECT="$ac_cv_prog_EXPECT" if test -n "$EXPECT"; then - { echo "$as_me:$LINENO: result: $EXPECT" >&5 -echo "${ECHO_T}$EXPECT" >&6; } + echo "$ac_t""$EXPECT" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi - - test -n "$EXPECT" && break +test -n "$EXPECT" && break done test -n "$EXPECT" || EXPECT="expect" @@ -5949,44 +3831,36 @@ for ac_prog in runtest do - # Extract the first word of "$ac_prog", so it can be a program name with args. +# Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_RUNTEST+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:3838: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_RUNTEST'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$RUNTEST"; then ac_cv_prog_RUNTEST="$RUNTEST" # Let the user override the test. else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_RUNTEST="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_RUNTEST="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" fi fi -RUNTEST=$ac_cv_prog_RUNTEST +RUNTEST="$ac_cv_prog_RUNTEST" if test -n "$RUNTEST"; then - { echo "$as_me:$LINENO: result: $RUNTEST" >&5 -echo "${ECHO_T}$RUNTEST" >&6; } + echo "$ac_t""$RUNTEST" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi - - test -n "$RUNTEST" && break +test -n "$RUNTEST" && break done test -n "$RUNTEST" || RUNTEST="runtest" @@ -6007,80 +3881,64 @@ if test -n "$ncn_tool_prefix"; then # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_AR+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:3886: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$AR"; then ac_cv_prog_AR="$AR" # Let the user override the test. else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_AR="${ncn_tool_prefix}${ncn_progname}" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_AR="${ncn_tool_prefix}${ncn_progname}" + break + fi + done + IFS="$ac_save_ifs" fi fi -AR=$ac_cv_prog_AR +AR="$ac_cv_prog_AR" if test -n "$AR"; then - { echo "$as_me:$LINENO: result: $AR" >&5 -echo "${ECHO_T}$AR" >&6; } + echo "$ac_t""$AR" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi - fi if test -z "$ac_cv_prog_AR" && test $build = $host ; then # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_AR+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:3917: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$AR"; then ac_cv_prog_AR="$AR" # Let the user override the test. else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_AR="${ncn_progname}" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_AR="${ncn_progname}" + break + fi + done + IFS="$ac_save_ifs" fi fi -AR=$ac_cv_prog_AR +AR="$ac_cv_prog_AR" if test -n "$AR"; then - { echo "$as_me:$LINENO: result: $AR" >&5 -echo "${ECHO_T}$AR" >&6; } + echo "$ac_t""$AR" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi - - + fi test -n "$ac_cv_prog_AR" && break done @@ -6098,80 +3956,64 @@ if test -n "$ncn_tool_prefix"; then # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_AS+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:3961: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$AS"; then ac_cv_prog_AS="$AS" # Let the user override the test. else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_AS="${ncn_tool_prefix}${ncn_progname}" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_AS="${ncn_tool_prefix}${ncn_progname}" + break + fi + done + IFS="$ac_save_ifs" fi fi -AS=$ac_cv_prog_AS +AS="$ac_cv_prog_AS" if test -n "$AS"; then - { echo "$as_me:$LINENO: result: $AS" >&5 -echo "${ECHO_T}$AS" >&6; } + echo "$ac_t""$AS" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi - fi if test -z "$ac_cv_prog_AS" && test $build = $host ; then # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_AS+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:3992: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$AS"; then ac_cv_prog_AS="$AS" # Let the user override the test. else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_AS="${ncn_progname}" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_AS="${ncn_progname}" + break + fi + done + IFS="$ac_save_ifs" fi fi -AS=$ac_cv_prog_AS +AS="$ac_cv_prog_AS" if test -n "$AS"; then - { echo "$as_me:$LINENO: result: $AS" >&5 -echo "${ECHO_T}$AS" >&6; } + echo "$ac_t""$AS" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi - - + fi test -n "$ac_cv_prog_AS" && break done @@ -6189,80 +4031,64 @@ if test -n "$ncn_tool_prefix"; then # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_DLLTOOL+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:4036: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$DLLTOOL"; then ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_DLLTOOL="${ncn_tool_prefix}${ncn_progname}" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_DLLTOOL="${ncn_tool_prefix}${ncn_progname}" + break + fi + done + IFS="$ac_save_ifs" fi fi -DLLTOOL=$ac_cv_prog_DLLTOOL +DLLTOOL="$ac_cv_prog_DLLTOOL" if test -n "$DLLTOOL"; then - { echo "$as_me:$LINENO: result: $DLLTOOL" >&5 -echo "${ECHO_T}$DLLTOOL" >&6; } + echo "$ac_t""$DLLTOOL" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi - fi if test -z "$ac_cv_prog_DLLTOOL" && test $build = $host ; then # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_DLLTOOL+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:4067: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$DLLTOOL"; then ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_DLLTOOL="${ncn_progname}" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_DLLTOOL="${ncn_progname}" + break + fi + done + IFS="$ac_save_ifs" fi fi -DLLTOOL=$ac_cv_prog_DLLTOOL +DLLTOOL="$ac_cv_prog_DLLTOOL" if test -n "$DLLTOOL"; then - { echo "$as_me:$LINENO: result: $DLLTOOL" >&5 -echo "${ECHO_T}$DLLTOOL" >&6; } + echo "$ac_t""$DLLTOOL" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi - - + fi test -n "$ac_cv_prog_DLLTOOL" && break done @@ -6280,80 +4106,64 @@ if test -n "$ncn_tool_prefix"; then # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_LD+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:4111: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$LD"; then ac_cv_prog_LD="$LD" # Let the user override the test. else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_LD="${ncn_tool_prefix}${ncn_progname}" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_LD="${ncn_tool_prefix}${ncn_progname}" + break + fi + done + IFS="$ac_save_ifs" fi fi -LD=$ac_cv_prog_LD +LD="$ac_cv_prog_LD" if test -n "$LD"; then - { echo "$as_me:$LINENO: result: $LD" >&5 -echo "${ECHO_T}$LD" >&6; } + echo "$ac_t""$LD" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi - fi if test -z "$ac_cv_prog_LD" && test $build = $host ; then # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_LD+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:4142: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$LD"; then ac_cv_prog_LD="$LD" # Let the user override the test. else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_LD="${ncn_progname}" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_LD="${ncn_progname}" + break + fi + done + IFS="$ac_save_ifs" fi fi -LD=$ac_cv_prog_LD +LD="$ac_cv_prog_LD" if test -n "$LD"; then - { echo "$as_me:$LINENO: result: $LD" >&5 -echo "${ECHO_T}$LD" >&6; } + echo "$ac_t""$LD" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi - - + fi test -n "$ac_cv_prog_LD" && break done @@ -6371,80 +4181,64 @@ if test -n "$ncn_tool_prefix"; then # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_LIPO+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:4186: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_LIPO'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$LIPO"; then ac_cv_prog_LIPO="$LIPO" # Let the user override the test. else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_LIPO="${ncn_tool_prefix}${ncn_progname}" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_LIPO="${ncn_tool_prefix}${ncn_progname}" + break + fi + done + IFS="$ac_save_ifs" fi fi -LIPO=$ac_cv_prog_LIPO +LIPO="$ac_cv_prog_LIPO" if test -n "$LIPO"; then - { echo "$as_me:$LINENO: result: $LIPO" >&5 -echo "${ECHO_T}$LIPO" >&6; } + echo "$ac_t""$LIPO" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi - fi if test -z "$ac_cv_prog_LIPO" && test $build = $host ; then # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_LIPO+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:4217: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_LIPO'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$LIPO"; then ac_cv_prog_LIPO="$LIPO" # Let the user override the test. else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_LIPO="${ncn_progname}" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_LIPO="${ncn_progname}" + break + fi + done + IFS="$ac_save_ifs" fi fi -LIPO=$ac_cv_prog_LIPO +LIPO="$ac_cv_prog_LIPO" if test -n "$LIPO"; then - { echo "$as_me:$LINENO: result: $LIPO" >&5 -echo "${ECHO_T}$LIPO" >&6; } + echo "$ac_t""$LIPO" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi - - + fi test -n "$ac_cv_prog_LIPO" && break done @@ -6462,80 +4256,64 @@ if test -n "$ncn_tool_prefix"; then # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_NM+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:4261: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_NM'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$NM"; then ac_cv_prog_NM="$NM" # Let the user override the test. else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_NM="${ncn_tool_prefix}${ncn_progname}" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_NM="${ncn_tool_prefix}${ncn_progname}" + break + fi + done + IFS="$ac_save_ifs" fi fi -NM=$ac_cv_prog_NM +NM="$ac_cv_prog_NM" if test -n "$NM"; then - { echo "$as_me:$LINENO: result: $NM" >&5 -echo "${ECHO_T}$NM" >&6; } + echo "$ac_t""$NM" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi - fi if test -z "$ac_cv_prog_NM" && test $build = $host ; then # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_NM+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:4292: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_NM'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$NM"; then ac_cv_prog_NM="$NM" # Let the user override the test. else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_NM="${ncn_progname}" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_NM="${ncn_progname}" + break + fi + done + IFS="$ac_save_ifs" fi fi -NM=$ac_cv_prog_NM +NM="$ac_cv_prog_NM" if test -n "$NM"; then - { echo "$as_me:$LINENO: result: $NM" >&5 -echo "${ECHO_T}$NM" >&6; } + echo "$ac_t""$NM" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi - - + fi test -n "$ac_cv_prog_NM" && break done @@ -6553,80 +4331,64 @@ if test -n "$ncn_tool_prefix"; then # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_RANLIB+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:4336: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_RANLIB="${ncn_tool_prefix}${ncn_progname}" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_RANLIB="${ncn_tool_prefix}${ncn_progname}" + break + fi + done + IFS="$ac_save_ifs" fi fi -RANLIB=$ac_cv_prog_RANLIB +RANLIB="$ac_cv_prog_RANLIB" if test -n "$RANLIB"; then - { echo "$as_me:$LINENO: result: $RANLIB" >&5 -echo "${ECHO_T}$RANLIB" >&6; } + echo "$ac_t""$RANLIB" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi - fi if test -z "$ac_cv_prog_RANLIB" && test $build = $host ; then # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_RANLIB+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:4367: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_RANLIB="${ncn_progname}" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_RANLIB="${ncn_progname}" + break + fi + done + IFS="$ac_save_ifs" fi fi -RANLIB=$ac_cv_prog_RANLIB +RANLIB="$ac_cv_prog_RANLIB" if test -n "$RANLIB"; then - { echo "$as_me:$LINENO: result: $RANLIB" >&5 -echo "${ECHO_T}$RANLIB" >&6; } + echo "$ac_t""$RANLIB" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi - - + fi test -n "$ac_cv_prog_RANLIB" && break done @@ -6639,80 +4401,64 @@ if test -n "$ncn_tool_prefix"; then # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_STRIP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:4406: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$STRIP"; then ac_cv_prog_STRIP="$STRIP" # Let the user override the test. else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_STRIP="${ncn_tool_prefix}${ncn_progname}" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_STRIP="${ncn_tool_prefix}${ncn_progname}" + break + fi + done + IFS="$ac_save_ifs" fi fi -STRIP=$ac_cv_prog_STRIP +STRIP="$ac_cv_prog_STRIP" if test -n "$STRIP"; then - { echo "$as_me:$LINENO: result: $STRIP" >&5 -echo "${ECHO_T}$STRIP" >&6; } + echo "$ac_t""$STRIP" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi - fi if test -z "$ac_cv_prog_STRIP" && test $build = $host ; then # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_STRIP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:4437: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$STRIP"; then ac_cv_prog_STRIP="$STRIP" # Let the user override the test. else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_STRIP="${ncn_progname}" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_STRIP="${ncn_progname}" + break + fi + done + IFS="$ac_save_ifs" fi fi -STRIP=$ac_cv_prog_STRIP +STRIP="$ac_cv_prog_STRIP" if test -n "$STRIP"; then - { echo "$as_me:$LINENO: result: $STRIP" >&5 -echo "${ECHO_T}$STRIP" >&6; } + echo "$ac_t""$STRIP" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi - - + fi test -n "$ac_cv_prog_STRIP" && break done @@ -6725,80 +4471,64 @@ if test -n "$ncn_tool_prefix"; then # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_WINDRES+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:4476: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$WINDRES"; then ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test. else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_WINDRES="${ncn_tool_prefix}${ncn_progname}" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_WINDRES="${ncn_tool_prefix}${ncn_progname}" + break + fi + done + IFS="$ac_save_ifs" fi fi -WINDRES=$ac_cv_prog_WINDRES +WINDRES="$ac_cv_prog_WINDRES" if test -n "$WINDRES"; then - { echo "$as_me:$LINENO: result: $WINDRES" >&5 -echo "${ECHO_T}$WINDRES" >&6; } + echo "$ac_t""$WINDRES" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi - fi if test -z "$ac_cv_prog_WINDRES" && test $build = $host ; then # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_WINDRES+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:4507: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$WINDRES"; then ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test. else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_WINDRES="${ncn_progname}" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_WINDRES="${ncn_progname}" + break + fi + done + IFS="$ac_save_ifs" fi fi -WINDRES=$ac_cv_prog_WINDRES +WINDRES="$ac_cv_prog_WINDRES" if test -n "$WINDRES"; then - { echo "$as_me:$LINENO: result: $WINDRES" >&5 -echo "${ECHO_T}$WINDRES" >&6; } + echo "$ac_t""$WINDRES" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi - - + fi test -n "$ac_cv_prog_WINDRES" && break done @@ -6816,80 +4546,64 @@ if test -n "$ncn_tool_prefix"; then # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_OBJCOPY+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:4551: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_OBJCOPY'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$OBJCOPY"; then ac_cv_prog_OBJCOPY="$OBJCOPY" # Let the user override the test. else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_OBJCOPY="${ncn_tool_prefix}${ncn_progname}" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_OBJCOPY="${ncn_tool_prefix}${ncn_progname}" + break + fi + done + IFS="$ac_save_ifs" fi fi -OBJCOPY=$ac_cv_prog_OBJCOPY +OBJCOPY="$ac_cv_prog_OBJCOPY" if test -n "$OBJCOPY"; then - { echo "$as_me:$LINENO: result: $OBJCOPY" >&5 -echo "${ECHO_T}$OBJCOPY" >&6; } + echo "$ac_t""$OBJCOPY" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi - fi if test -z "$ac_cv_prog_OBJCOPY" && test $build = $host ; then # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_OBJCOPY+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:4582: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_OBJCOPY'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$OBJCOPY"; then ac_cv_prog_OBJCOPY="$OBJCOPY" # Let the user override the test. else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_OBJCOPY="${ncn_progname}" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_OBJCOPY="${ncn_progname}" + break + fi + done + IFS="$ac_save_ifs" fi fi -OBJCOPY=$ac_cv_prog_OBJCOPY +OBJCOPY="$ac_cv_prog_OBJCOPY" if test -n "$OBJCOPY"; then - { echo "$as_me:$LINENO: result: $OBJCOPY" >&5 -echo "${ECHO_T}$OBJCOPY" >&6; } + echo "$ac_t""$OBJCOPY" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi - - + fi test -n "$ac_cv_prog_OBJCOPY" && break done @@ -6907,80 +4621,64 @@ if test -n "$ncn_tool_prefix"; then # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_OBJDUMP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:4626: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$OBJDUMP"; then ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_OBJDUMP="${ncn_tool_prefix}${ncn_progname}" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_OBJDUMP="${ncn_tool_prefix}${ncn_progname}" + break + fi + done + IFS="$ac_save_ifs" fi fi -OBJDUMP=$ac_cv_prog_OBJDUMP +OBJDUMP="$ac_cv_prog_OBJDUMP" if test -n "$OBJDUMP"; then - { echo "$as_me:$LINENO: result: $OBJDUMP" >&5 -echo "${ECHO_T}$OBJDUMP" >&6; } + echo "$ac_t""$OBJDUMP" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi - fi if test -z "$ac_cv_prog_OBJDUMP" && test $build = $host ; then # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_OBJDUMP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:4657: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$OBJDUMP"; then ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_OBJDUMP="${ncn_progname}" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_OBJDUMP="${ncn_progname}" + break + fi + done + IFS="$ac_save_ifs" fi fi -OBJDUMP=$ac_cv_prog_OBJDUMP +OBJDUMP="$ac_cv_prog_OBJDUMP" if test -n "$OBJDUMP"; then - { echo "$as_me:$LINENO: result: $OBJDUMP" >&5 -echo "${ECHO_T}$OBJDUMP" >&6; } + echo "$ac_t""$OBJDUMP" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi - - + fi test -n "$ac_cv_prog_OBJDUMP" && break done @@ -7001,15 +4699,14 @@ # Target tools. - -# Check whether --with-build-time-tools was given. +# Check whether --with-build-time-tools or --without-build-time-tools was given. if test "${with_build_time_tools+set}" = set; then - withval=$with_build_time_tools; case x"$withval" in + withval="$with_build_time_tools" + case x"$withval" in x/*) ;; *) with_build_time_tools= - { echo "$as_me:$LINENO: WARNING: argument to --with-build-time-tools must be an absolute path" >&5 -echo "$as_me: WARNING: argument to --with-build-time-tools must be an absolute path" >&2;} + echo "configure: warning: argument to --with-build-time-tools must be an absolute path" 1>&2 ;; esac else @@ -7019,16 +4716,14 @@ if test -n "$with_build_time_tools"; then for ncn_progname in cc gcc; do - { echo "$as_me:$LINENO: checking for ${ncn_progname} in $with_build_time_tools" >&5 -echo $ECHO_N "checking for ${ncn_progname} in $with_build_time_tools... $ECHO_C" >&6; } + echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6 +echo "configure:4721: checking for ${ncn_progname} in $with_build_time_tools" >&5 if test -x $with_build_time_tools/${ncn_progname}; then ac_cv_prog_CC_FOR_TARGET=$with_build_time_tools/${ncn_progname} - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$ac_t""yes" 1>&6 break else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi done fi @@ -7038,85 +4733,69 @@ if test -n "$ncn_target_tool_prefix"; then # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CC_FOR_TARGET+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:4738: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_CC_FOR_TARGET'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$CC_FOR_TARGET"; then ac_cv_prog_CC_FOR_TARGET="$CC_FOR_TARGET" # Let the user override the test. else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_CC_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" + break + fi + done + IFS="$ac_save_ifs" fi fi -CC_FOR_TARGET=$ac_cv_prog_CC_FOR_TARGET +CC_FOR_TARGET="$ac_cv_prog_CC_FOR_TARGET" if test -n "$CC_FOR_TARGET"; then - { echo "$as_me:$LINENO: result: $CC_FOR_TARGET" >&5 -echo "${ECHO_T}$CC_FOR_TARGET" >&6; } + echo "$ac_t""$CC_FOR_TARGET" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi - fi if test -z "$ac_cv_prog_CC_FOR_TARGET" && test $build = $target ; then # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CC_FOR_TARGET+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:4769: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_CC_FOR_TARGET'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$CC_FOR_TARGET"; then ac_cv_prog_CC_FOR_TARGET="$CC_FOR_TARGET" # Let the user override the test. else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC_FOR_TARGET="${ncn_progname}" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_CC_FOR_TARGET="${ncn_progname}" + break + fi + done + IFS="$ac_save_ifs" fi fi -CC_FOR_TARGET=$ac_cv_prog_CC_FOR_TARGET +CC_FOR_TARGET="$ac_cv_prog_CC_FOR_TARGET" if test -n "$CC_FOR_TARGET"; then - { echo "$as_me:$LINENO: result: $CC_FOR_TARGET" >&5 -echo "${ECHO_T}$CC_FOR_TARGET" >&6; } + echo "$ac_t""$CC_FOR_TARGET" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi - - + fi test -n "$ac_cv_prog_CC_FOR_TARGET" && break done fi - + if test -z "$ac_cv_prog_CC_FOR_TARGET" ; then set dummy cc gcc if test $build = $target ; then @@ -7130,16 +4809,14 @@ if test -n "$with_build_time_tools"; then for ncn_progname in c++ g++ cxx gxx; do - { echo "$as_me:$LINENO: checking for ${ncn_progname} in $with_build_time_tools" >&5 -echo $ECHO_N "checking for ${ncn_progname} in $with_build_time_tools... $ECHO_C" >&6; } + echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6 +echo "configure:4814: checking for ${ncn_progname} in $with_build_time_tools" >&5 if test -x $with_build_time_tools/${ncn_progname}; then ac_cv_prog_CXX_FOR_TARGET=$with_build_time_tools/${ncn_progname} - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$ac_t""yes" 1>&6 break else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi done fi @@ -7149,85 +4826,69 @@ if test -n "$ncn_target_tool_prefix"; then # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CXX_FOR_TARGET+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:4831: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_CXX_FOR_TARGET'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$CXX_FOR_TARGET"; then ac_cv_prog_CXX_FOR_TARGET="$CXX_FOR_TARGET" # Let the user override the test. else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CXX_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_CXX_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" + break + fi + done + IFS="$ac_save_ifs" fi fi -CXX_FOR_TARGET=$ac_cv_prog_CXX_FOR_TARGET +CXX_FOR_TARGET="$ac_cv_prog_CXX_FOR_TARGET" if test -n "$CXX_FOR_TARGET"; then - { echo "$as_me:$LINENO: result: $CXX_FOR_TARGET" >&5 -echo "${ECHO_T}$CXX_FOR_TARGET" >&6; } + echo "$ac_t""$CXX_FOR_TARGET" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi - fi if test -z "$ac_cv_prog_CXX_FOR_TARGET" && test $build = $target ; then # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CXX_FOR_TARGET+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:4862: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_CXX_FOR_TARGET'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$CXX_FOR_TARGET"; then ac_cv_prog_CXX_FOR_TARGET="$CXX_FOR_TARGET" # Let the user override the test. else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CXX_FOR_TARGET="${ncn_progname}" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_CXX_FOR_TARGET="${ncn_progname}" + break + fi + done + IFS="$ac_save_ifs" fi fi -CXX_FOR_TARGET=$ac_cv_prog_CXX_FOR_TARGET +CXX_FOR_TARGET="$ac_cv_prog_CXX_FOR_TARGET" if test -n "$CXX_FOR_TARGET"; then - { echo "$as_me:$LINENO: result: $CXX_FOR_TARGET" >&5 -echo "${ECHO_T}$CXX_FOR_TARGET" >&6; } + echo "$ac_t""$CXX_FOR_TARGET" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi - - + fi test -n "$ac_cv_prog_CXX_FOR_TARGET" && break done fi - + if test -z "$ac_cv_prog_CXX_FOR_TARGET" ; then set dummy c++ g++ cxx gxx if test $build = $target ; then @@ -7241,16 +4902,14 @@ if test -n "$with_build_time_tools"; then for ncn_progname in gcc; do - { echo "$as_me:$LINENO: checking for ${ncn_progname} in $with_build_time_tools" >&5 -echo $ECHO_N "checking for ${ncn_progname} in $with_build_time_tools... $ECHO_C" >&6; } + echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6 +echo "configure:4907: checking for ${ncn_progname} in $with_build_time_tools" >&5 if test -x $with_build_time_tools/${ncn_progname}; then ac_cv_prog_GCC_FOR_TARGET=$with_build_time_tools/${ncn_progname} - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$ac_t""yes" 1>&6 break else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi done fi @@ -7260,85 +4919,69 @@ if test -n "$ncn_target_tool_prefix"; then # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_GCC_FOR_TARGET+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:4924: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_GCC_FOR_TARGET'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$GCC_FOR_TARGET"; then ac_cv_prog_GCC_FOR_TARGET="$GCC_FOR_TARGET" # Let the user override the test. else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_GCC_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_GCC_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" + break + fi + done + IFS="$ac_save_ifs" fi fi -GCC_FOR_TARGET=$ac_cv_prog_GCC_FOR_TARGET +GCC_FOR_TARGET="$ac_cv_prog_GCC_FOR_TARGET" if test -n "$GCC_FOR_TARGET"; then - { echo "$as_me:$LINENO: result: $GCC_FOR_TARGET" >&5 -echo "${ECHO_T}$GCC_FOR_TARGET" >&6; } + echo "$ac_t""$GCC_FOR_TARGET" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi - fi if test -z "$ac_cv_prog_GCC_FOR_TARGET" && test $build = $target ; then # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_GCC_FOR_TARGET+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:4955: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_GCC_FOR_TARGET'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$GCC_FOR_TARGET"; then ac_cv_prog_GCC_FOR_TARGET="$GCC_FOR_TARGET" # Let the user override the test. else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_GCC_FOR_TARGET="${ncn_progname}" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_GCC_FOR_TARGET="${ncn_progname}" + break + fi + done + IFS="$ac_save_ifs" fi fi -GCC_FOR_TARGET=$ac_cv_prog_GCC_FOR_TARGET +GCC_FOR_TARGET="$ac_cv_prog_GCC_FOR_TARGET" if test -n "$GCC_FOR_TARGET"; then - { echo "$as_me:$LINENO: result: $GCC_FOR_TARGET" >&5 -echo "${ECHO_T}$GCC_FOR_TARGET" >&6; } + echo "$ac_t""$GCC_FOR_TARGET" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi - - + fi test -n "$ac_cv_prog_GCC_FOR_TARGET" && break done fi - + if test -z "$ac_cv_prog_GCC_FOR_TARGET" ; then GCC_FOR_TARGET="${CC_FOR_TARGET}" else @@ -7347,16 +4990,14 @@ if test -n "$with_build_time_tools"; then for ncn_progname in gcj; do - { echo "$as_me:$LINENO: checking for ${ncn_progname} in $with_build_time_tools" >&5 -echo $ECHO_N "checking for ${ncn_progname} in $with_build_time_tools... $ECHO_C" >&6; } + echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6 +echo "configure:4995: checking for ${ncn_progname} in $with_build_time_tools" >&5 if test -x $with_build_time_tools/${ncn_progname}; then ac_cv_prog_GCJ_FOR_TARGET=$with_build_time_tools/${ncn_progname} - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$ac_t""yes" 1>&6 break else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi done fi @@ -7366,85 +5007,69 @@ if test -n "$ncn_target_tool_prefix"; then # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_GCJ_FOR_TARGET+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:5012: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_GCJ_FOR_TARGET'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$GCJ_FOR_TARGET"; then ac_cv_prog_GCJ_FOR_TARGET="$GCJ_FOR_TARGET" # Let the user override the test. else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_GCJ_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_GCJ_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" + break + fi + done + IFS="$ac_save_ifs" fi fi -GCJ_FOR_TARGET=$ac_cv_prog_GCJ_FOR_TARGET +GCJ_FOR_TARGET="$ac_cv_prog_GCJ_FOR_TARGET" if test -n "$GCJ_FOR_TARGET"; then - { echo "$as_me:$LINENO: result: $GCJ_FOR_TARGET" >&5 -echo "${ECHO_T}$GCJ_FOR_TARGET" >&6; } + echo "$ac_t""$GCJ_FOR_TARGET" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi - fi if test -z "$ac_cv_prog_GCJ_FOR_TARGET" && test $build = $target ; then # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_GCJ_FOR_TARGET+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:5043: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_GCJ_FOR_TARGET'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$GCJ_FOR_TARGET"; then ac_cv_prog_GCJ_FOR_TARGET="$GCJ_FOR_TARGET" # Let the user override the test. else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_GCJ_FOR_TARGET="${ncn_progname}" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_GCJ_FOR_TARGET="${ncn_progname}" + break + fi + done + IFS="$ac_save_ifs" fi fi -GCJ_FOR_TARGET=$ac_cv_prog_GCJ_FOR_TARGET +GCJ_FOR_TARGET="$ac_cv_prog_GCJ_FOR_TARGET" if test -n "$GCJ_FOR_TARGET"; then - { echo "$as_me:$LINENO: result: $GCJ_FOR_TARGET" >&5 -echo "${ECHO_T}$GCJ_FOR_TARGET" >&6; } + echo "$ac_t""$GCJ_FOR_TARGET" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi - - + fi test -n "$ac_cv_prog_GCJ_FOR_TARGET" && break done fi - + if test -z "$ac_cv_prog_GCJ_FOR_TARGET" ; then set dummy gcj if test $build = $target ; then @@ -7458,16 +5083,14 @@ if test -n "$with_build_time_tools"; then for ncn_progname in gfortran; do - { echo "$as_me:$LINENO: checking for ${ncn_progname} in $with_build_time_tools" >&5 -echo $ECHO_N "checking for ${ncn_progname} in $with_build_time_tools... $ECHO_C" >&6; } + echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6 +echo "configure:5088: checking for ${ncn_progname} in $with_build_time_tools" >&5 if test -x $with_build_time_tools/${ncn_progname}; then ac_cv_prog_GFORTRAN_FOR_TARGET=$with_build_time_tools/${ncn_progname} - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$ac_t""yes" 1>&6 break else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi done fi @@ -7477,85 +5100,69 @@ if test -n "$ncn_target_tool_prefix"; then # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_GFORTRAN_FOR_TARGET+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:5105: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_GFORTRAN_FOR_TARGET'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$GFORTRAN_FOR_TARGET"; then ac_cv_prog_GFORTRAN_FOR_TARGET="$GFORTRAN_FOR_TARGET" # Let the user override the test. else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_GFORTRAN_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_GFORTRAN_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" + break + fi + done + IFS="$ac_save_ifs" fi fi -GFORTRAN_FOR_TARGET=$ac_cv_prog_GFORTRAN_FOR_TARGET +GFORTRAN_FOR_TARGET="$ac_cv_prog_GFORTRAN_FOR_TARGET" if test -n "$GFORTRAN_FOR_TARGET"; then - { echo "$as_me:$LINENO: result: $GFORTRAN_FOR_TARGET" >&5 -echo "${ECHO_T}$GFORTRAN_FOR_TARGET" >&6; } + echo "$ac_t""$GFORTRAN_FOR_TARGET" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi - fi if test -z "$ac_cv_prog_GFORTRAN_FOR_TARGET" && test $build = $target ; then # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_GFORTRAN_FOR_TARGET+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:5136: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_GFORTRAN_FOR_TARGET'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$GFORTRAN_FOR_TARGET"; then ac_cv_prog_GFORTRAN_FOR_TARGET="$GFORTRAN_FOR_TARGET" # Let the user override the test. else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_GFORTRAN_FOR_TARGET="${ncn_progname}" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_GFORTRAN_FOR_TARGET="${ncn_progname}" + break + fi + done + IFS="$ac_save_ifs" fi fi -GFORTRAN_FOR_TARGET=$ac_cv_prog_GFORTRAN_FOR_TARGET +GFORTRAN_FOR_TARGET="$ac_cv_prog_GFORTRAN_FOR_TARGET" if test -n "$GFORTRAN_FOR_TARGET"; then - { echo "$as_me:$LINENO: result: $GFORTRAN_FOR_TARGET" >&5 -echo "${ECHO_T}$GFORTRAN_FOR_TARGET" >&6; } + echo "$ac_t""$GFORTRAN_FOR_TARGET" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi - - + fi test -n "$ac_cv_prog_GFORTRAN_FOR_TARGET" && break done fi - + if test -z "$ac_cv_prog_GFORTRAN_FOR_TARGET" ; then set dummy gfortran if test $build = $target ; then @@ -7577,7 +5184,7 @@ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then PATH_SEPARATOR=';' else - PATH_SEPARATOR=: + PATH_SEPARATOR=: fi rm -f conf$$.sh fi @@ -7633,16 +5240,14 @@ if test -z "$ac_cv_path_AR_FOR_TARGET" ; then if test -n "$with_build_time_tools"; then - { echo "$as_me:$LINENO: checking for ar in $with_build_time_tools" >&5 -echo $ECHO_N "checking for ar in $with_build_time_tools... $ECHO_C" >&6; } + echo $ac_n "checking for ar in $with_build_time_tools""... $ac_c" 1>&6 +echo "configure:5245: checking for ar in $with_build_time_tools" >&5 if test -x $with_build_time_tools/ar; then AR_FOR_TARGET=`cd $with_build_time_tools && pwd`/ar ac_cv_path_AR_FOR_TARGET=$AR_FOR_TARGET - { echo "$as_me:$LINENO: result: $ac_cv_path_AR_FOR_TARGET" >&5 -echo "${ECHO_T}$ac_cv_path_AR_FOR_TARGET" >&6; } + echo "$ac_t""$ac_cv_path_AR_FOR_TARGET" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi elif test $build != $host && test $have_gcc_for_target = yes; then AR_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=ar` @@ -7653,58 +5258,51 @@ if test -z "$ac_cv_path_AR_FOR_TARGET" ; then # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_AR_FOR_TARGET+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:5263: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_path_AR_FOR_TARGET'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else - case $AR_FOR_TARGET in - [\\/]* | ?:[\\/]*) + case "$AR_FOR_TARGET" in + /*) ac_cv_path_AR_FOR_TARGET="$AR_FOR_TARGET" # Let the user override the test with a path. ;; + ?:/*) + ac_cv_path_AR_FOR_TARGET="$AR_FOR_TARGET" # Let the user override the test with a dos path. + ;; *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $gcc_cv_tool_dirs -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_AR_FOR_TARGET="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$gcc_cv_tool_dirs" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_path_AR_FOR_TARGET="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" ;; esac fi -AR_FOR_TARGET=$ac_cv_path_AR_FOR_TARGET +AR_FOR_TARGET="$ac_cv_path_AR_FOR_TARGET" if test -n "$AR_FOR_TARGET"; then - { echo "$as_me:$LINENO: result: $AR_FOR_TARGET" >&5 -echo "${ECHO_T}$AR_FOR_TARGET" >&6; } + echo "$ac_t""$AR_FOR_TARGET" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi - fi if test -z "$ac_cv_path_AR_FOR_TARGET" ; then if test -n "$with_build_time_tools"; then for ncn_progname in ar; do - { echo "$as_me:$LINENO: checking for ${ncn_progname} in $with_build_time_tools" >&5 -echo $ECHO_N "checking for ${ncn_progname} in $with_build_time_tools... $ECHO_C" >&6; } + echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6 +echo "configure:5300: checking for ${ncn_progname} in $with_build_time_tools" >&5 if test -x $with_build_time_tools/${ncn_progname}; then ac_cv_prog_AR_FOR_TARGET=$with_build_time_tools/${ncn_progname} - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$ac_t""yes" 1>&6 break else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi done fi @@ -7714,85 +5312,69 @@ if test -n "$ncn_target_tool_prefix"; then # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_AR_FOR_TARGET+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:5317: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_AR_FOR_TARGET'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$AR_FOR_TARGET"; then ac_cv_prog_AR_FOR_TARGET="$AR_FOR_TARGET" # Let the user override the test. else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_AR_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_AR_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" + break + fi + done + IFS="$ac_save_ifs" fi fi -AR_FOR_TARGET=$ac_cv_prog_AR_FOR_TARGET +AR_FOR_TARGET="$ac_cv_prog_AR_FOR_TARGET" if test -n "$AR_FOR_TARGET"; then - { echo "$as_me:$LINENO: result: $AR_FOR_TARGET" >&5 -echo "${ECHO_T}$AR_FOR_TARGET" >&6; } + echo "$ac_t""$AR_FOR_TARGET" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi - fi if test -z "$ac_cv_prog_AR_FOR_TARGET" && test $build = $target ; then # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_AR_FOR_TARGET+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:5348: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_AR_FOR_TARGET'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$AR_FOR_TARGET"; then ac_cv_prog_AR_FOR_TARGET="$AR_FOR_TARGET" # Let the user override the test. else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_AR_FOR_TARGET="${ncn_progname}" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_AR_FOR_TARGET="${ncn_progname}" + break + fi + done + IFS="$ac_save_ifs" fi fi -AR_FOR_TARGET=$ac_cv_prog_AR_FOR_TARGET +AR_FOR_TARGET="$ac_cv_prog_AR_FOR_TARGET" if test -n "$AR_FOR_TARGET"; then - { echo "$as_me:$LINENO: result: $AR_FOR_TARGET" >&5 -echo "${ECHO_T}$AR_FOR_TARGET" >&6; } + echo "$ac_t""$AR_FOR_TARGET" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi - - + fi test -n "$ac_cv_prog_AR_FOR_TARGET" && break done fi - + if test -z "$ac_cv_prog_AR_FOR_TARGET" ; then set dummy ar if test $build = $target ; then @@ -7813,16 +5395,14 @@ if test -z "$ac_cv_path_AS_FOR_TARGET" ; then if test -n "$with_build_time_tools"; then - { echo "$as_me:$LINENO: checking for as in $with_build_time_tools" >&5 -echo $ECHO_N "checking for as in $with_build_time_tools... $ECHO_C" >&6; } + echo $ac_n "checking for as in $with_build_time_tools""... $ac_c" 1>&6 +echo "configure:5400: checking for as in $with_build_time_tools" >&5 if test -x $with_build_time_tools/as; then AS_FOR_TARGET=`cd $with_build_time_tools && pwd`/as ac_cv_path_AS_FOR_TARGET=$AS_FOR_TARGET - { echo "$as_me:$LINENO: result: $ac_cv_path_AS_FOR_TARGET" >&5 -echo "${ECHO_T}$ac_cv_path_AS_FOR_TARGET" >&6; } + echo "$ac_t""$ac_cv_path_AS_FOR_TARGET" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi elif test $build != $host && test $have_gcc_for_target = yes; then AS_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=as` @@ -7833,58 +5413,51 @@ if test -z "$ac_cv_path_AS_FOR_TARGET" ; then # Extract the first word of "as", so it can be a program name with args. set dummy as; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_AS_FOR_TARGET+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:5418: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_path_AS_FOR_TARGET'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else - case $AS_FOR_TARGET in - [\\/]* | ?:[\\/]*) + case "$AS_FOR_TARGET" in + /*) ac_cv_path_AS_FOR_TARGET="$AS_FOR_TARGET" # Let the user override the test with a path. ;; + ?:/*) + ac_cv_path_AS_FOR_TARGET="$AS_FOR_TARGET" # Let the user override the test with a dos path. + ;; *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $gcc_cv_tool_dirs -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_AS_FOR_TARGET="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$gcc_cv_tool_dirs" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_path_AS_FOR_TARGET="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" ;; esac fi -AS_FOR_TARGET=$ac_cv_path_AS_FOR_TARGET +AS_FOR_TARGET="$ac_cv_path_AS_FOR_TARGET" if test -n "$AS_FOR_TARGET"; then - { echo "$as_me:$LINENO: result: $AS_FOR_TARGET" >&5 -echo "${ECHO_T}$AS_FOR_TARGET" >&6; } + echo "$ac_t""$AS_FOR_TARGET" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi - fi if test -z "$ac_cv_path_AS_FOR_TARGET" ; then if test -n "$with_build_time_tools"; then for ncn_progname in as; do - { echo "$as_me:$LINENO: checking for ${ncn_progname} in $with_build_time_tools" >&5 -echo $ECHO_N "checking for ${ncn_progname} in $with_build_time_tools... $ECHO_C" >&6; } + echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6 +echo "configure:5455: checking for ${ncn_progname} in $with_build_time_tools" >&5 if test -x $with_build_time_tools/${ncn_progname}; then ac_cv_prog_AS_FOR_TARGET=$with_build_time_tools/${ncn_progname} - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$ac_t""yes" 1>&6 break else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi done fi @@ -7894,85 +5467,69 @@ if test -n "$ncn_target_tool_prefix"; then # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_AS_FOR_TARGET+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:5472: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_AS_FOR_TARGET'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$AS_FOR_TARGET"; then ac_cv_prog_AS_FOR_TARGET="$AS_FOR_TARGET" # Let the user override the test. else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_AS_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_AS_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" + break + fi + done + IFS="$ac_save_ifs" fi fi -AS_FOR_TARGET=$ac_cv_prog_AS_FOR_TARGET +AS_FOR_TARGET="$ac_cv_prog_AS_FOR_TARGET" if test -n "$AS_FOR_TARGET"; then - { echo "$as_me:$LINENO: result: $AS_FOR_TARGET" >&5 -echo "${ECHO_T}$AS_FOR_TARGET" >&6; } + echo "$ac_t""$AS_FOR_TARGET" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi - fi if test -z "$ac_cv_prog_AS_FOR_TARGET" && test $build = $target ; then # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_AS_FOR_TARGET+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:5503: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_AS_FOR_TARGET'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$AS_FOR_TARGET"; then ac_cv_prog_AS_FOR_TARGET="$AS_FOR_TARGET" # Let the user override the test. else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_AS_FOR_TARGET="${ncn_progname}" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_AS_FOR_TARGET="${ncn_progname}" + break + fi + done + IFS="$ac_save_ifs" fi fi -AS_FOR_TARGET=$ac_cv_prog_AS_FOR_TARGET +AS_FOR_TARGET="$ac_cv_prog_AS_FOR_TARGET" if test -n "$AS_FOR_TARGET"; then - { echo "$as_me:$LINENO: result: $AS_FOR_TARGET" >&5 -echo "${ECHO_T}$AS_FOR_TARGET" >&6; } + echo "$ac_t""$AS_FOR_TARGET" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi - - + fi test -n "$ac_cv_prog_AS_FOR_TARGET" && break done fi - + if test -z "$ac_cv_prog_AS_FOR_TARGET" ; then set dummy as if test $build = $target ; then @@ -7993,16 +5550,14 @@ if test -z "$ac_cv_path_DLLTOOL_FOR_TARGET" ; then if test -n "$with_build_time_tools"; then - { echo "$as_me:$LINENO: checking for dlltool in $with_build_time_tools" >&5 -echo $ECHO_N "checking for dlltool in $with_build_time_tools... $ECHO_C" >&6; } + echo $ac_n "checking for dlltool in $with_build_time_tools""... $ac_c" 1>&6 +echo "configure:5555: checking for dlltool in $with_build_time_tools" >&5 if test -x $with_build_time_tools/dlltool; then DLLTOOL_FOR_TARGET=`cd $with_build_time_tools && pwd`/dlltool ac_cv_path_DLLTOOL_FOR_TARGET=$DLLTOOL_FOR_TARGET - { echo "$as_me:$LINENO: result: $ac_cv_path_DLLTOOL_FOR_TARGET" >&5 -echo "${ECHO_T}$ac_cv_path_DLLTOOL_FOR_TARGET" >&6; } + echo "$ac_t""$ac_cv_path_DLLTOOL_FOR_TARGET" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi elif test $build != $host && test $have_gcc_for_target = yes; then DLLTOOL_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=dlltool` @@ -8013,58 +5568,51 @@ if test -z "$ac_cv_path_DLLTOOL_FOR_TARGET" ; then # Extract the first word of "dlltool", so it can be a program name with args. set dummy dlltool; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_DLLTOOL_FOR_TARGET+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:5573: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_path_DLLTOOL_FOR_TARGET'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else - case $DLLTOOL_FOR_TARGET in - [\\/]* | ?:[\\/]*) + case "$DLLTOOL_FOR_TARGET" in + /*) ac_cv_path_DLLTOOL_FOR_TARGET="$DLLTOOL_FOR_TARGET" # Let the user override the test with a path. ;; + ?:/*) + ac_cv_path_DLLTOOL_FOR_TARGET="$DLLTOOL_FOR_TARGET" # Let the user override the test with a dos path. + ;; *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $gcc_cv_tool_dirs -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_DLLTOOL_FOR_TARGET="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$gcc_cv_tool_dirs" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_path_DLLTOOL_FOR_TARGET="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" ;; esac fi -DLLTOOL_FOR_TARGET=$ac_cv_path_DLLTOOL_FOR_TARGET +DLLTOOL_FOR_TARGET="$ac_cv_path_DLLTOOL_FOR_TARGET" if test -n "$DLLTOOL_FOR_TARGET"; then - { echo "$as_me:$LINENO: result: $DLLTOOL_FOR_TARGET" >&5 -echo "${ECHO_T}$DLLTOOL_FOR_TARGET" >&6; } + echo "$ac_t""$DLLTOOL_FOR_TARGET" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi - fi if test -z "$ac_cv_path_DLLTOOL_FOR_TARGET" ; then if test -n "$with_build_time_tools"; then for ncn_progname in dlltool; do - { echo "$as_me:$LINENO: checking for ${ncn_progname} in $with_build_time_tools" >&5 -echo $ECHO_N "checking for ${ncn_progname} in $with_build_time_tools... $ECHO_C" >&6; } + echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6 +echo "configure:5610: checking for ${ncn_progname} in $with_build_time_tools" >&5 if test -x $with_build_time_tools/${ncn_progname}; then ac_cv_prog_DLLTOOL_FOR_TARGET=$with_build_time_tools/${ncn_progname} - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$ac_t""yes" 1>&6 break else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi done fi @@ -8074,85 +5622,69 @@ if test -n "$ncn_target_tool_prefix"; then # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_DLLTOOL_FOR_TARGET+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:5627: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL_FOR_TARGET'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$DLLTOOL_FOR_TARGET"; then ac_cv_prog_DLLTOOL_FOR_TARGET="$DLLTOOL_FOR_TARGET" # Let the user override the test. else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_DLLTOOL_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_DLLTOOL_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" + break + fi + done + IFS="$ac_save_ifs" fi fi -DLLTOOL_FOR_TARGET=$ac_cv_prog_DLLTOOL_FOR_TARGET +DLLTOOL_FOR_TARGET="$ac_cv_prog_DLLTOOL_FOR_TARGET" if test -n "$DLLTOOL_FOR_TARGET"; then - { echo "$as_me:$LINENO: result: $DLLTOOL_FOR_TARGET" >&5 -echo "${ECHO_T}$DLLTOOL_FOR_TARGET" >&6; } + echo "$ac_t""$DLLTOOL_FOR_TARGET" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi - fi if test -z "$ac_cv_prog_DLLTOOL_FOR_TARGET" && test $build = $target ; then # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_DLLTOOL_FOR_TARGET+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:5658: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL_FOR_TARGET'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$DLLTOOL_FOR_TARGET"; then ac_cv_prog_DLLTOOL_FOR_TARGET="$DLLTOOL_FOR_TARGET" # Let the user override the test. else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_DLLTOOL_FOR_TARGET="${ncn_progname}" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_DLLTOOL_FOR_TARGET="${ncn_progname}" + break + fi + done + IFS="$ac_save_ifs" fi fi -DLLTOOL_FOR_TARGET=$ac_cv_prog_DLLTOOL_FOR_TARGET +DLLTOOL_FOR_TARGET="$ac_cv_prog_DLLTOOL_FOR_TARGET" if test -n "$DLLTOOL_FOR_TARGET"; then - { echo "$as_me:$LINENO: result: $DLLTOOL_FOR_TARGET" >&5 -echo "${ECHO_T}$DLLTOOL_FOR_TARGET" >&6; } + echo "$ac_t""$DLLTOOL_FOR_TARGET" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi - - + fi test -n "$ac_cv_prog_DLLTOOL_FOR_TARGET" && break done fi - + if test -z "$ac_cv_prog_DLLTOOL_FOR_TARGET" ; then set dummy dlltool if test $build = $target ; then @@ -8173,16 +5705,14 @@ if test -z "$ac_cv_path_LD_FOR_TARGET" ; then if test -n "$with_build_time_tools"; then - { echo "$as_me:$LINENO: checking for ld in $with_build_time_tools" >&5 -echo $ECHO_N "checking for ld in $with_build_time_tools... $ECHO_C" >&6; } + echo $ac_n "checking for ld in $with_build_time_tools""... $ac_c" 1>&6 +echo "configure:5710: checking for ld in $with_build_time_tools" >&5 if test -x $with_build_time_tools/ld; then LD_FOR_TARGET=`cd $with_build_time_tools && pwd`/ld ac_cv_path_LD_FOR_TARGET=$LD_FOR_TARGET - { echo "$as_me:$LINENO: result: $ac_cv_path_LD_FOR_TARGET" >&5 -echo "${ECHO_T}$ac_cv_path_LD_FOR_TARGET" >&6; } + echo "$ac_t""$ac_cv_path_LD_FOR_TARGET" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi elif test $build != $host && test $have_gcc_for_target = yes; then LD_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=ld` @@ -8193,58 +5723,51 @@ if test -z "$ac_cv_path_LD_FOR_TARGET" ; then # Extract the first word of "ld", so it can be a program name with args. set dummy ld; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_LD_FOR_TARGET+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:5728: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_path_LD_FOR_TARGET'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else - case $LD_FOR_TARGET in - [\\/]* | ?:[\\/]*) + case "$LD_FOR_TARGET" in + /*) ac_cv_path_LD_FOR_TARGET="$LD_FOR_TARGET" # Let the user override the test with a path. ;; + ?:/*) + ac_cv_path_LD_FOR_TARGET="$LD_FOR_TARGET" # Let the user override the test with a dos path. + ;; *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $gcc_cv_tool_dirs -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_LD_FOR_TARGET="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$gcc_cv_tool_dirs" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_path_LD_FOR_TARGET="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" ;; esac fi -LD_FOR_TARGET=$ac_cv_path_LD_FOR_TARGET +LD_FOR_TARGET="$ac_cv_path_LD_FOR_TARGET" if test -n "$LD_FOR_TARGET"; then - { echo "$as_me:$LINENO: result: $LD_FOR_TARGET" >&5 -echo "${ECHO_T}$LD_FOR_TARGET" >&6; } + echo "$ac_t""$LD_FOR_TARGET" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi - fi if test -z "$ac_cv_path_LD_FOR_TARGET" ; then if test -n "$with_build_time_tools"; then for ncn_progname in ld; do - { echo "$as_me:$LINENO: checking for ${ncn_progname} in $with_build_time_tools" >&5 -echo $ECHO_N "checking for ${ncn_progname} in $with_build_time_tools... $ECHO_C" >&6; } + echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6 +echo "configure:5765: checking for ${ncn_progname} in $with_build_time_tools" >&5 if test -x $with_build_time_tools/${ncn_progname}; then ac_cv_prog_LD_FOR_TARGET=$with_build_time_tools/${ncn_progname} - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$ac_t""yes" 1>&6 break else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi done fi @@ -8254,85 +5777,69 @@ if test -n "$ncn_target_tool_prefix"; then # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_LD_FOR_TARGET+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:5782: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_LD_FOR_TARGET'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$LD_FOR_TARGET"; then ac_cv_prog_LD_FOR_TARGET="$LD_FOR_TARGET" # Let the user override the test. else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_LD_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_LD_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" + break + fi + done + IFS="$ac_save_ifs" fi fi -LD_FOR_TARGET=$ac_cv_prog_LD_FOR_TARGET +LD_FOR_TARGET="$ac_cv_prog_LD_FOR_TARGET" if test -n "$LD_FOR_TARGET"; then - { echo "$as_me:$LINENO: result: $LD_FOR_TARGET" >&5 -echo "${ECHO_T}$LD_FOR_TARGET" >&6; } + echo "$ac_t""$LD_FOR_TARGET" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi - fi if test -z "$ac_cv_prog_LD_FOR_TARGET" && test $build = $target ; then # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_LD_FOR_TARGET+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:5813: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_LD_FOR_TARGET'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$LD_FOR_TARGET"; then ac_cv_prog_LD_FOR_TARGET="$LD_FOR_TARGET" # Let the user override the test. else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_LD_FOR_TARGET="${ncn_progname}" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_LD_FOR_TARGET="${ncn_progname}" + break + fi + done + IFS="$ac_save_ifs" fi fi -LD_FOR_TARGET=$ac_cv_prog_LD_FOR_TARGET +LD_FOR_TARGET="$ac_cv_prog_LD_FOR_TARGET" if test -n "$LD_FOR_TARGET"; then - { echo "$as_me:$LINENO: result: $LD_FOR_TARGET" >&5 -echo "${ECHO_T}$LD_FOR_TARGET" >&6; } + echo "$ac_t""$LD_FOR_TARGET" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi - - + fi test -n "$ac_cv_prog_LD_FOR_TARGET" && break done fi - + if test -z "$ac_cv_prog_LD_FOR_TARGET" ; then set dummy ld if test $build = $target ; then @@ -8353,16 +5860,14 @@ if test -z "$ac_cv_path_LIPO_FOR_TARGET" ; then if test -n "$with_build_time_tools"; then - { echo "$as_me:$LINENO: checking for lipo in $with_build_time_tools" >&5 -echo $ECHO_N "checking for lipo in $with_build_time_tools... $ECHO_C" >&6; } + echo $ac_n "checking for lipo in $with_build_time_tools""... $ac_c" 1>&6 +echo "configure:5865: checking for lipo in $with_build_time_tools" >&5 if test -x $with_build_time_tools/lipo; then LIPO_FOR_TARGET=`cd $with_build_time_tools && pwd`/lipo ac_cv_path_LIPO_FOR_TARGET=$LIPO_FOR_TARGET - { echo "$as_me:$LINENO: result: $ac_cv_path_LIPO_FOR_TARGET" >&5 -echo "${ECHO_T}$ac_cv_path_LIPO_FOR_TARGET" >&6; } + echo "$ac_t""$ac_cv_path_LIPO_FOR_TARGET" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi elif test $build != $host && test $have_gcc_for_target = yes; then LIPO_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=lipo` @@ -8373,58 +5878,51 @@ if test -z "$ac_cv_path_LIPO_FOR_TARGET" ; then # Extract the first word of "lipo", so it can be a program name with args. set dummy lipo; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_LIPO_FOR_TARGET+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:5883: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_path_LIPO_FOR_TARGET'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else - case $LIPO_FOR_TARGET in - [\\/]* | ?:[\\/]*) + case "$LIPO_FOR_TARGET" in + /*) ac_cv_path_LIPO_FOR_TARGET="$LIPO_FOR_TARGET" # Let the user override the test with a path. ;; + ?:/*) + ac_cv_path_LIPO_FOR_TARGET="$LIPO_FOR_TARGET" # Let the user override the test with a dos path. + ;; *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $gcc_cv_tool_dirs -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_LIPO_FOR_TARGET="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$gcc_cv_tool_dirs" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_path_LIPO_FOR_TARGET="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" ;; esac fi -LIPO_FOR_TARGET=$ac_cv_path_LIPO_FOR_TARGET +LIPO_FOR_TARGET="$ac_cv_path_LIPO_FOR_TARGET" if test -n "$LIPO_FOR_TARGET"; then - { echo "$as_me:$LINENO: result: $LIPO_FOR_TARGET" >&5 -echo "${ECHO_T}$LIPO_FOR_TARGET" >&6; } + echo "$ac_t""$LIPO_FOR_TARGET" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi - fi if test -z "$ac_cv_path_LIPO_FOR_TARGET" ; then if test -n "$with_build_time_tools"; then for ncn_progname in lipo; do - { echo "$as_me:$LINENO: checking for ${ncn_progname} in $with_build_time_tools" >&5 -echo $ECHO_N "checking for ${ncn_progname} in $with_build_time_tools... $ECHO_C" >&6; } + echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6 +echo "configure:5920: checking for ${ncn_progname} in $with_build_time_tools" >&5 if test -x $with_build_time_tools/${ncn_progname}; then ac_cv_prog_LIPO_FOR_TARGET=$with_build_time_tools/${ncn_progname} - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$ac_t""yes" 1>&6 break else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi done fi @@ -8434,85 +5932,69 @@ if test -n "$ncn_target_tool_prefix"; then # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_LIPO_FOR_TARGET+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:5937: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_LIPO_FOR_TARGET'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$LIPO_FOR_TARGET"; then ac_cv_prog_LIPO_FOR_TARGET="$LIPO_FOR_TARGET" # Let the user override the test. else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_LIPO_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_LIPO_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" + break + fi + done + IFS="$ac_save_ifs" fi fi -LIPO_FOR_TARGET=$ac_cv_prog_LIPO_FOR_TARGET +LIPO_FOR_TARGET="$ac_cv_prog_LIPO_FOR_TARGET" if test -n "$LIPO_FOR_TARGET"; then - { echo "$as_me:$LINENO: result: $LIPO_FOR_TARGET" >&5 -echo "${ECHO_T}$LIPO_FOR_TARGET" >&6; } + echo "$ac_t""$LIPO_FOR_TARGET" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi - fi if test -z "$ac_cv_prog_LIPO_FOR_TARGET" && test $build = $target ; then # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_LIPO_FOR_TARGET+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:5968: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_LIPO_FOR_TARGET'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$LIPO_FOR_TARGET"; then ac_cv_prog_LIPO_FOR_TARGET="$LIPO_FOR_TARGET" # Let the user override the test. else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_LIPO_FOR_TARGET="${ncn_progname}" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_LIPO_FOR_TARGET="${ncn_progname}" + break + fi + done + IFS="$ac_save_ifs" fi fi -LIPO_FOR_TARGET=$ac_cv_prog_LIPO_FOR_TARGET +LIPO_FOR_TARGET="$ac_cv_prog_LIPO_FOR_TARGET" if test -n "$LIPO_FOR_TARGET"; then - { echo "$as_me:$LINENO: result: $LIPO_FOR_TARGET" >&5 -echo "${ECHO_T}$LIPO_FOR_TARGET" >&6; } + echo "$ac_t""$LIPO_FOR_TARGET" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi - - + fi test -n "$ac_cv_prog_LIPO_FOR_TARGET" && break done fi - + if test -z "$ac_cv_prog_LIPO_FOR_TARGET" ; then set dummy lipo if test $build = $target ; then @@ -8533,16 +6015,14 @@ if test -z "$ac_cv_path_NM_FOR_TARGET" ; then if test -n "$with_build_time_tools"; then - { echo "$as_me:$LINENO: checking for nm in $with_build_time_tools" >&5 -echo $ECHO_N "checking for nm in $with_build_time_tools... $ECHO_C" >&6; } + echo $ac_n "checking for nm in $with_build_time_tools""... $ac_c" 1>&6 +echo "configure:6020: checking for nm in $with_build_time_tools" >&5 if test -x $with_build_time_tools/nm; then NM_FOR_TARGET=`cd $with_build_time_tools && pwd`/nm ac_cv_path_NM_FOR_TARGET=$NM_FOR_TARGET - { echo "$as_me:$LINENO: result: $ac_cv_path_NM_FOR_TARGET" >&5 -echo "${ECHO_T}$ac_cv_path_NM_FOR_TARGET" >&6; } + echo "$ac_t""$ac_cv_path_NM_FOR_TARGET" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi elif test $build != $host && test $have_gcc_for_target = yes; then NM_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=nm` @@ -8553,58 +6033,51 @@ if test -z "$ac_cv_path_NM_FOR_TARGET" ; then # Extract the first word of "nm", so it can be a program name with args. set dummy nm; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_NM_FOR_TARGET+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:6038: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_path_NM_FOR_TARGET'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else - case $NM_FOR_TARGET in - [\\/]* | ?:[\\/]*) + case "$NM_FOR_TARGET" in + /*) ac_cv_path_NM_FOR_TARGET="$NM_FOR_TARGET" # Let the user override the test with a path. ;; + ?:/*) + ac_cv_path_NM_FOR_TARGET="$NM_FOR_TARGET" # Let the user override the test with a dos path. + ;; *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $gcc_cv_tool_dirs -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_NM_FOR_TARGET="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$gcc_cv_tool_dirs" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_path_NM_FOR_TARGET="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" ;; esac fi -NM_FOR_TARGET=$ac_cv_path_NM_FOR_TARGET +NM_FOR_TARGET="$ac_cv_path_NM_FOR_TARGET" if test -n "$NM_FOR_TARGET"; then - { echo "$as_me:$LINENO: result: $NM_FOR_TARGET" >&5 -echo "${ECHO_T}$NM_FOR_TARGET" >&6; } + echo "$ac_t""$NM_FOR_TARGET" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi - fi if test -z "$ac_cv_path_NM_FOR_TARGET" ; then if test -n "$with_build_time_tools"; then for ncn_progname in nm; do - { echo "$as_me:$LINENO: checking for ${ncn_progname} in $with_build_time_tools" >&5 -echo $ECHO_N "checking for ${ncn_progname} in $with_build_time_tools... $ECHO_C" >&6; } + echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6 +echo "configure:6075: checking for ${ncn_progname} in $with_build_time_tools" >&5 if test -x $with_build_time_tools/${ncn_progname}; then ac_cv_prog_NM_FOR_TARGET=$with_build_time_tools/${ncn_progname} - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$ac_t""yes" 1>&6 break else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi done fi @@ -8614,85 +6087,69 @@ if test -n "$ncn_target_tool_prefix"; then # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_NM_FOR_TARGET+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:6092: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_NM_FOR_TARGET'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$NM_FOR_TARGET"; then ac_cv_prog_NM_FOR_TARGET="$NM_FOR_TARGET" # Let the user override the test. else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_NM_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_NM_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" + break + fi + done + IFS="$ac_save_ifs" fi fi -NM_FOR_TARGET=$ac_cv_prog_NM_FOR_TARGET +NM_FOR_TARGET="$ac_cv_prog_NM_FOR_TARGET" if test -n "$NM_FOR_TARGET"; then - { echo "$as_me:$LINENO: result: $NM_FOR_TARGET" >&5 -echo "${ECHO_T}$NM_FOR_TARGET" >&6; } + echo "$ac_t""$NM_FOR_TARGET" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi - fi if test -z "$ac_cv_prog_NM_FOR_TARGET" && test $build = $target ; then # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_NM_FOR_TARGET+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:6123: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_NM_FOR_TARGET'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$NM_FOR_TARGET"; then ac_cv_prog_NM_FOR_TARGET="$NM_FOR_TARGET" # Let the user override the test. else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_NM_FOR_TARGET="${ncn_progname}" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_NM_FOR_TARGET="${ncn_progname}" + break + fi + done + IFS="$ac_save_ifs" fi fi -NM_FOR_TARGET=$ac_cv_prog_NM_FOR_TARGET +NM_FOR_TARGET="$ac_cv_prog_NM_FOR_TARGET" if test -n "$NM_FOR_TARGET"; then - { echo "$as_me:$LINENO: result: $NM_FOR_TARGET" >&5 -echo "${ECHO_T}$NM_FOR_TARGET" >&6; } + echo "$ac_t""$NM_FOR_TARGET" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi - - + fi test -n "$ac_cv_prog_NM_FOR_TARGET" && break done fi - + if test -z "$ac_cv_prog_NM_FOR_TARGET" ; then set dummy nm if test $build = $target ; then @@ -8713,16 +6170,14 @@ if test -z "$ac_cv_path_OBJDUMP_FOR_TARGET" ; then if test -n "$with_build_time_tools"; then - { echo "$as_me:$LINENO: checking for objdump in $with_build_time_tools" >&5 -echo $ECHO_N "checking for objdump in $with_build_time_tools... $ECHO_C" >&6; } + echo $ac_n "checking for objdump in $with_build_time_tools""... $ac_c" 1>&6 +echo "configure:6175: checking for objdump in $with_build_time_tools" >&5 if test -x $with_build_time_tools/objdump; then OBJDUMP_FOR_TARGET=`cd $with_build_time_tools && pwd`/objdump ac_cv_path_OBJDUMP_FOR_TARGET=$OBJDUMP_FOR_TARGET - { echo "$as_me:$LINENO: result: $ac_cv_path_OBJDUMP_FOR_TARGET" >&5 -echo "${ECHO_T}$ac_cv_path_OBJDUMP_FOR_TARGET" >&6; } + echo "$ac_t""$ac_cv_path_OBJDUMP_FOR_TARGET" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi elif test $build != $host && test $have_gcc_for_target = yes; then OBJDUMP_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=objdump` @@ -8733,58 +6188,51 @@ if test -z "$ac_cv_path_OBJDUMP_FOR_TARGET" ; then # Extract the first word of "objdump", so it can be a program name with args. set dummy objdump; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_OBJDUMP_FOR_TARGET+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:6193: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_path_OBJDUMP_FOR_TARGET'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else - case $OBJDUMP_FOR_TARGET in - [\\/]* | ?:[\\/]*) + case "$OBJDUMP_FOR_TARGET" in + /*) ac_cv_path_OBJDUMP_FOR_TARGET="$OBJDUMP_FOR_TARGET" # Let the user override the test with a path. ;; + ?:/*) + ac_cv_path_OBJDUMP_FOR_TARGET="$OBJDUMP_FOR_TARGET" # Let the user override the test with a dos path. + ;; *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $gcc_cv_tool_dirs -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_OBJDUMP_FOR_TARGET="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$gcc_cv_tool_dirs" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_path_OBJDUMP_FOR_TARGET="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" ;; esac fi -OBJDUMP_FOR_TARGET=$ac_cv_path_OBJDUMP_FOR_TARGET +OBJDUMP_FOR_TARGET="$ac_cv_path_OBJDUMP_FOR_TARGET" if test -n "$OBJDUMP_FOR_TARGET"; then - { echo "$as_me:$LINENO: result: $OBJDUMP_FOR_TARGET" >&5 -echo "${ECHO_T}$OBJDUMP_FOR_TARGET" >&6; } + echo "$ac_t""$OBJDUMP_FOR_TARGET" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi - fi if test -z "$ac_cv_path_OBJDUMP_FOR_TARGET" ; then if test -n "$with_build_time_tools"; then for ncn_progname in objdump; do - { echo "$as_me:$LINENO: checking for ${ncn_progname} in $with_build_time_tools" >&5 -echo $ECHO_N "checking for ${ncn_progname} in $with_build_time_tools... $ECHO_C" >&6; } + echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6 +echo "configure:6230: checking for ${ncn_progname} in $with_build_time_tools" >&5 if test -x $with_build_time_tools/${ncn_progname}; then ac_cv_prog_OBJDUMP_FOR_TARGET=$with_build_time_tools/${ncn_progname} - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$ac_t""yes" 1>&6 break else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi done fi @@ -8794,85 +6242,69 @@ if test -n "$ncn_target_tool_prefix"; then # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_OBJDUMP_FOR_TARGET+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:6247: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP_FOR_TARGET'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$OBJDUMP_FOR_TARGET"; then ac_cv_prog_OBJDUMP_FOR_TARGET="$OBJDUMP_FOR_TARGET" # Let the user override the test. else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_OBJDUMP_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_OBJDUMP_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" + break + fi + done + IFS="$ac_save_ifs" fi fi -OBJDUMP_FOR_TARGET=$ac_cv_prog_OBJDUMP_FOR_TARGET +OBJDUMP_FOR_TARGET="$ac_cv_prog_OBJDUMP_FOR_TARGET" if test -n "$OBJDUMP_FOR_TARGET"; then - { echo "$as_me:$LINENO: result: $OBJDUMP_FOR_TARGET" >&5 -echo "${ECHO_T}$OBJDUMP_FOR_TARGET" >&6; } + echo "$ac_t""$OBJDUMP_FOR_TARGET" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi - fi if test -z "$ac_cv_prog_OBJDUMP_FOR_TARGET" && test $build = $target ; then # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_OBJDUMP_FOR_TARGET+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:6278: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP_FOR_TARGET'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$OBJDUMP_FOR_TARGET"; then ac_cv_prog_OBJDUMP_FOR_TARGET="$OBJDUMP_FOR_TARGET" # Let the user override the test. else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_OBJDUMP_FOR_TARGET="${ncn_progname}" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_OBJDUMP_FOR_TARGET="${ncn_progname}" + break + fi + done + IFS="$ac_save_ifs" fi fi -OBJDUMP_FOR_TARGET=$ac_cv_prog_OBJDUMP_FOR_TARGET +OBJDUMP_FOR_TARGET="$ac_cv_prog_OBJDUMP_FOR_TARGET" if test -n "$OBJDUMP_FOR_TARGET"; then - { echo "$as_me:$LINENO: result: $OBJDUMP_FOR_TARGET" >&5 -echo "${ECHO_T}$OBJDUMP_FOR_TARGET" >&6; } + echo "$ac_t""$OBJDUMP_FOR_TARGET" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi - - + fi test -n "$ac_cv_prog_OBJDUMP_FOR_TARGET" && break done fi - + if test -z "$ac_cv_prog_OBJDUMP_FOR_TARGET" ; then set dummy objdump if test $build = $target ; then @@ -8893,16 +6325,14 @@ if test -z "$ac_cv_path_RANLIB_FOR_TARGET" ; then if test -n "$with_build_time_tools"; then - { echo "$as_me:$LINENO: checking for ranlib in $with_build_time_tools" >&5 -echo $ECHO_N "checking for ranlib in $with_build_time_tools... $ECHO_C" >&6; } + echo $ac_n "checking for ranlib in $with_build_time_tools""... $ac_c" 1>&6 +echo "configure:6330: checking for ranlib in $with_build_time_tools" >&5 if test -x $with_build_time_tools/ranlib; then RANLIB_FOR_TARGET=`cd $with_build_time_tools && pwd`/ranlib ac_cv_path_RANLIB_FOR_TARGET=$RANLIB_FOR_TARGET - { echo "$as_me:$LINENO: result: $ac_cv_path_RANLIB_FOR_TARGET" >&5 -echo "${ECHO_T}$ac_cv_path_RANLIB_FOR_TARGET" >&6; } + echo "$ac_t""$ac_cv_path_RANLIB_FOR_TARGET" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi elif test $build != $host && test $have_gcc_for_target = yes; then RANLIB_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=ranlib` @@ -8913,58 +6343,51 @@ if test -z "$ac_cv_path_RANLIB_FOR_TARGET" ; then # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_RANLIB_FOR_TARGET+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:6348: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_path_RANLIB_FOR_TARGET'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else - case $RANLIB_FOR_TARGET in - [\\/]* | ?:[\\/]*) + case "$RANLIB_FOR_TARGET" in + /*) ac_cv_path_RANLIB_FOR_TARGET="$RANLIB_FOR_TARGET" # Let the user override the test with a path. ;; + ?:/*) + ac_cv_path_RANLIB_FOR_TARGET="$RANLIB_FOR_TARGET" # Let the user override the test with a dos path. + ;; *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $gcc_cv_tool_dirs -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_RANLIB_FOR_TARGET="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$gcc_cv_tool_dirs" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_path_RANLIB_FOR_TARGET="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" ;; esac fi -RANLIB_FOR_TARGET=$ac_cv_path_RANLIB_FOR_TARGET +RANLIB_FOR_TARGET="$ac_cv_path_RANLIB_FOR_TARGET" if test -n "$RANLIB_FOR_TARGET"; then - { echo "$as_me:$LINENO: result: $RANLIB_FOR_TARGET" >&5 -echo "${ECHO_T}$RANLIB_FOR_TARGET" >&6; } + echo "$ac_t""$RANLIB_FOR_TARGET" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi - fi if test -z "$ac_cv_path_RANLIB_FOR_TARGET" ; then if test -n "$with_build_time_tools"; then for ncn_progname in ranlib; do - { echo "$as_me:$LINENO: checking for ${ncn_progname} in $with_build_time_tools" >&5 -echo $ECHO_N "checking for ${ncn_progname} in $with_build_time_tools... $ECHO_C" >&6; } + echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6 +echo "configure:6385: checking for ${ncn_progname} in $with_build_time_tools" >&5 if test -x $with_build_time_tools/${ncn_progname}; then ac_cv_prog_RANLIB_FOR_TARGET=$with_build_time_tools/${ncn_progname} - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$ac_t""yes" 1>&6 break else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi done fi @@ -8974,85 +6397,69 @@ if test -n "$ncn_target_tool_prefix"; then # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_RANLIB_FOR_TARGET+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:6402: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_RANLIB_FOR_TARGET'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$RANLIB_FOR_TARGET"; then ac_cv_prog_RANLIB_FOR_TARGET="$RANLIB_FOR_TARGET" # Let the user override the test. else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_RANLIB_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_RANLIB_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" + break + fi + done + IFS="$ac_save_ifs" fi fi -RANLIB_FOR_TARGET=$ac_cv_prog_RANLIB_FOR_TARGET +RANLIB_FOR_TARGET="$ac_cv_prog_RANLIB_FOR_TARGET" if test -n "$RANLIB_FOR_TARGET"; then - { echo "$as_me:$LINENO: result: $RANLIB_FOR_TARGET" >&5 -echo "${ECHO_T}$RANLIB_FOR_TARGET" >&6; } + echo "$ac_t""$RANLIB_FOR_TARGET" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi - fi if test -z "$ac_cv_prog_RANLIB_FOR_TARGET" && test $build = $target ; then # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_RANLIB_FOR_TARGET+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:6433: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_RANLIB_FOR_TARGET'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$RANLIB_FOR_TARGET"; then ac_cv_prog_RANLIB_FOR_TARGET="$RANLIB_FOR_TARGET" # Let the user override the test. else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_RANLIB_FOR_TARGET="${ncn_progname}" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_RANLIB_FOR_TARGET="${ncn_progname}" + break + fi + done + IFS="$ac_save_ifs" fi fi -RANLIB_FOR_TARGET=$ac_cv_prog_RANLIB_FOR_TARGET +RANLIB_FOR_TARGET="$ac_cv_prog_RANLIB_FOR_TARGET" if test -n "$RANLIB_FOR_TARGET"; then - { echo "$as_me:$LINENO: result: $RANLIB_FOR_TARGET" >&5 -echo "${ECHO_T}$RANLIB_FOR_TARGET" >&6; } + echo "$ac_t""$RANLIB_FOR_TARGET" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi - - + fi test -n "$ac_cv_prog_RANLIB_FOR_TARGET" && break done fi - + if test -z "$ac_cv_prog_RANLIB_FOR_TARGET" ; then set dummy ranlib if test $build = $target ; then @@ -9073,16 +6480,14 @@ if test -z "$ac_cv_path_STRIP_FOR_TARGET" ; then if test -n "$with_build_time_tools"; then - { echo "$as_me:$LINENO: checking for strip in $with_build_time_tools" >&5 -echo $ECHO_N "checking for strip in $with_build_time_tools... $ECHO_C" >&6; } + echo $ac_n "checking for strip in $with_build_time_tools""... $ac_c" 1>&6 +echo "configure:6485: checking for strip in $with_build_time_tools" >&5 if test -x $with_build_time_tools/strip; then STRIP_FOR_TARGET=`cd $with_build_time_tools && pwd`/strip ac_cv_path_STRIP_FOR_TARGET=$STRIP_FOR_TARGET - { echo "$as_me:$LINENO: result: $ac_cv_path_STRIP_FOR_TARGET" >&5 -echo "${ECHO_T}$ac_cv_path_STRIP_FOR_TARGET" >&6; } + echo "$ac_t""$ac_cv_path_STRIP_FOR_TARGET" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi elif test $build != $host && test $have_gcc_for_target = yes; then STRIP_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=strip` @@ -9093,58 +6498,51 @@ if test -z "$ac_cv_path_STRIP_FOR_TARGET" ; then # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_STRIP_FOR_TARGET+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:6503: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_path_STRIP_FOR_TARGET'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else - case $STRIP_FOR_TARGET in - [\\/]* | ?:[\\/]*) + case "$STRIP_FOR_TARGET" in + /*) ac_cv_path_STRIP_FOR_TARGET="$STRIP_FOR_TARGET" # Let the user override the test with a path. ;; + ?:/*) + ac_cv_path_STRIP_FOR_TARGET="$STRIP_FOR_TARGET" # Let the user override the test with a dos path. + ;; *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $gcc_cv_tool_dirs -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_STRIP_FOR_TARGET="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$gcc_cv_tool_dirs" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_path_STRIP_FOR_TARGET="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" ;; esac fi -STRIP_FOR_TARGET=$ac_cv_path_STRIP_FOR_TARGET +STRIP_FOR_TARGET="$ac_cv_path_STRIP_FOR_TARGET" if test -n "$STRIP_FOR_TARGET"; then - { echo "$as_me:$LINENO: result: $STRIP_FOR_TARGET" >&5 -echo "${ECHO_T}$STRIP_FOR_TARGET" >&6; } + echo "$ac_t""$STRIP_FOR_TARGET" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi - fi if test -z "$ac_cv_path_STRIP_FOR_TARGET" ; then if test -n "$with_build_time_tools"; then for ncn_progname in strip; do - { echo "$as_me:$LINENO: checking for ${ncn_progname} in $with_build_time_tools" >&5 -echo $ECHO_N "checking for ${ncn_progname} in $with_build_time_tools... $ECHO_C" >&6; } + echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6 +echo "configure:6540: checking for ${ncn_progname} in $with_build_time_tools" >&5 if test -x $with_build_time_tools/${ncn_progname}; then ac_cv_prog_STRIP_FOR_TARGET=$with_build_time_tools/${ncn_progname} - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$ac_t""yes" 1>&6 break else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi done fi @@ -9154,85 +6552,69 @@ if test -n "$ncn_target_tool_prefix"; then # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_STRIP_FOR_TARGET+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:6557: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_STRIP_FOR_TARGET'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$STRIP_FOR_TARGET"; then ac_cv_prog_STRIP_FOR_TARGET="$STRIP_FOR_TARGET" # Let the user override the test. else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_STRIP_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_STRIP_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" + break + fi + done + IFS="$ac_save_ifs" fi fi -STRIP_FOR_TARGET=$ac_cv_prog_STRIP_FOR_TARGET +STRIP_FOR_TARGET="$ac_cv_prog_STRIP_FOR_TARGET" if test -n "$STRIP_FOR_TARGET"; then - { echo "$as_me:$LINENO: result: $STRIP_FOR_TARGET" >&5 -echo "${ECHO_T}$STRIP_FOR_TARGET" >&6; } + echo "$ac_t""$STRIP_FOR_TARGET" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi - fi if test -z "$ac_cv_prog_STRIP_FOR_TARGET" && test $build = $target ; then # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_STRIP_FOR_TARGET+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:6588: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_STRIP_FOR_TARGET'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$STRIP_FOR_TARGET"; then ac_cv_prog_STRIP_FOR_TARGET="$STRIP_FOR_TARGET" # Let the user override the test. else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_STRIP_FOR_TARGET="${ncn_progname}" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_STRIP_FOR_TARGET="${ncn_progname}" + break + fi + done + IFS="$ac_save_ifs" fi fi -STRIP_FOR_TARGET=$ac_cv_prog_STRIP_FOR_TARGET +STRIP_FOR_TARGET="$ac_cv_prog_STRIP_FOR_TARGET" if test -n "$STRIP_FOR_TARGET"; then - { echo "$as_me:$LINENO: result: $STRIP_FOR_TARGET" >&5 -echo "${ECHO_T}$STRIP_FOR_TARGET" >&6; } + echo "$ac_t""$STRIP_FOR_TARGET" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi - - + fi test -n "$ac_cv_prog_STRIP_FOR_TARGET" && break done fi - + if test -z "$ac_cv_prog_STRIP_FOR_TARGET" ; then set dummy strip if test $build = $target ; then @@ -9253,16 +6635,14 @@ if test -z "$ac_cv_path_WINDRES_FOR_TARGET" ; then if test -n "$with_build_time_tools"; then - { echo "$as_me:$LINENO: checking for windres in $with_build_time_tools" >&5 -echo $ECHO_N "checking for windres in $with_build_time_tools... $ECHO_C" >&6; } + echo $ac_n "checking for windres in $with_build_time_tools""... $ac_c" 1>&6 +echo "configure:6640: checking for windres in $with_build_time_tools" >&5 if test -x $with_build_time_tools/windres; then WINDRES_FOR_TARGET=`cd $with_build_time_tools && pwd`/windres ac_cv_path_WINDRES_FOR_TARGET=$WINDRES_FOR_TARGET - { echo "$as_me:$LINENO: result: $ac_cv_path_WINDRES_FOR_TARGET" >&5 -echo "${ECHO_T}$ac_cv_path_WINDRES_FOR_TARGET" >&6; } + echo "$ac_t""$ac_cv_path_WINDRES_FOR_TARGET" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi elif test $build != $host && test $have_gcc_for_target = yes; then WINDRES_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=windres` @@ -9273,58 +6653,51 @@ if test -z "$ac_cv_path_WINDRES_FOR_TARGET" ; then # Extract the first word of "windres", so it can be a program name with args. set dummy windres; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_WINDRES_FOR_TARGET+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:6658: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_path_WINDRES_FOR_TARGET'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else - case $WINDRES_FOR_TARGET in - [\\/]* | ?:[\\/]*) + case "$WINDRES_FOR_TARGET" in + /*) ac_cv_path_WINDRES_FOR_TARGET="$WINDRES_FOR_TARGET" # Let the user override the test with a path. ;; + ?:/*) + ac_cv_path_WINDRES_FOR_TARGET="$WINDRES_FOR_TARGET" # Let the user override the test with a dos path. + ;; *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $gcc_cv_tool_dirs -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_WINDRES_FOR_TARGET="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$gcc_cv_tool_dirs" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_path_WINDRES_FOR_TARGET="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" ;; esac fi -WINDRES_FOR_TARGET=$ac_cv_path_WINDRES_FOR_TARGET +WINDRES_FOR_TARGET="$ac_cv_path_WINDRES_FOR_TARGET" if test -n "$WINDRES_FOR_TARGET"; then - { echo "$as_me:$LINENO: result: $WINDRES_FOR_TARGET" >&5 -echo "${ECHO_T}$WINDRES_FOR_TARGET" >&6; } + echo "$ac_t""$WINDRES_FOR_TARGET" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi - fi if test -z "$ac_cv_path_WINDRES_FOR_TARGET" ; then if test -n "$with_build_time_tools"; then for ncn_progname in windres; do - { echo "$as_me:$LINENO: checking for ${ncn_progname} in $with_build_time_tools" >&5 -echo $ECHO_N "checking for ${ncn_progname} in $with_build_time_tools... $ECHO_C" >&6; } + echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6 +echo "configure:6695: checking for ${ncn_progname} in $with_build_time_tools" >&5 if test -x $with_build_time_tools/${ncn_progname}; then ac_cv_prog_WINDRES_FOR_TARGET=$with_build_time_tools/${ncn_progname} - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$ac_t""yes" 1>&6 break else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi done fi @@ -9334,85 +6707,69 @@ if test -n "$ncn_target_tool_prefix"; then # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_WINDRES_FOR_TARGET+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:6712: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_WINDRES_FOR_TARGET'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$WINDRES_FOR_TARGET"; then ac_cv_prog_WINDRES_FOR_TARGET="$WINDRES_FOR_TARGET" # Let the user override the test. else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_WINDRES_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_WINDRES_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" + break + fi + done + IFS="$ac_save_ifs" fi fi -WINDRES_FOR_TARGET=$ac_cv_prog_WINDRES_FOR_TARGET +WINDRES_FOR_TARGET="$ac_cv_prog_WINDRES_FOR_TARGET" if test -n "$WINDRES_FOR_TARGET"; then - { echo "$as_me:$LINENO: result: $WINDRES_FOR_TARGET" >&5 -echo "${ECHO_T}$WINDRES_FOR_TARGET" >&6; } + echo "$ac_t""$WINDRES_FOR_TARGET" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi - fi if test -z "$ac_cv_prog_WINDRES_FOR_TARGET" && test $build = $target ; then # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_WINDRES_FOR_TARGET+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:6743: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_WINDRES_FOR_TARGET'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$WINDRES_FOR_TARGET"; then ac_cv_prog_WINDRES_FOR_TARGET="$WINDRES_FOR_TARGET" # Let the user override the test. else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_WINDRES_FOR_TARGET="${ncn_progname}" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_WINDRES_FOR_TARGET="${ncn_progname}" + break + fi + done + IFS="$ac_save_ifs" fi fi -WINDRES_FOR_TARGET=$ac_cv_prog_WINDRES_FOR_TARGET +WINDRES_FOR_TARGET="$ac_cv_prog_WINDRES_FOR_TARGET" if test -n "$WINDRES_FOR_TARGET"; then - { echo "$as_me:$LINENO: result: $WINDRES_FOR_TARGET" >&5 -echo "${ECHO_T}$WINDRES_FOR_TARGET" >&6; } + echo "$ac_t""$WINDRES_FOR_TARGET" 1>&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$ac_t""no" 1>&6 fi - - + fi test -n "$ac_cv_prog_WINDRES_FOR_TARGET" && break done fi - + if test -z "$ac_cv_prog_WINDRES_FOR_TARGET" ; then set dummy windres if test $build = $target ; then @@ -9431,17 +6788,15 @@ RAW_CXX_FOR_TARGET="$CXX_FOR_TARGET" -{ echo "$as_me:$LINENO: checking where to find the target ar" >&5 -echo $ECHO_N "checking where to find the target ar... $ECHO_C" >&6; } +echo $ac_n "checking where to find the target ar""... $ac_c" 1>&6 +echo "configure:6793: checking where to find the target ar" >&5 if test "x${build}" != "x${host}" ; then if expr "x$AR_FOR_TARGET" : "x/" > /dev/null; then # We already found the complete path - { echo "$as_me:$LINENO: result: pre-installed in \`dirname $AR_FOR_TARGET\`" >&5 -echo "${ECHO_T}pre-installed in \`dirname $AR_FOR_TARGET\`" >&6; } + echo "$ac_t""pre-installed in `dirname $AR_FOR_TARGET`" 1>&6 else # Canadian cross, just use what we found - { echo "$as_me:$LINENO: result: pre-installed" >&5 -echo "${ECHO_T}pre-installed" >&6; } + echo "$ac_t""pre-installed" 1>&6 fi else ok=yes @@ -9449,38 +6804,32 @@ *" binutils "*) ;; *) ok=no ;; esac - + if test $ok = yes; then # An in-tree tool is available and we can use it AR_FOR_TARGET='$$r/$(HOST_SUBDIR)/binutils/ar' - { echo "$as_me:$LINENO: result: just compiled" >&5 -echo "${ECHO_T}just compiled" >&6; } + echo "$ac_t""just compiled" 1>&6 elif expr "x$AR_FOR_TARGET" : "x/" > /dev/null; then # We already found the complete path - { echo "$as_me:$LINENO: result: pre-installed in \`dirname $AR_FOR_TARGET\`" >&5 -echo "${ECHO_T}pre-installed in \`dirname $AR_FOR_TARGET\`" >&6; } + echo "$ac_t""pre-installed in `dirname $AR_FOR_TARGET`" 1>&6 elif test "x$target" = "x$host"; then # We can use an host tool AR_FOR_TARGET='$(AR)' - { echo "$as_me:$LINENO: result: host tool" >&5 -echo "${ECHO_T}host tool" >&6; } + echo "$ac_t""host tool" 1>&6 else # We need a cross tool - { echo "$as_me:$LINENO: result: pre-installed" >&5 -echo "${ECHO_T}pre-installed" >&6; } + echo "$ac_t""pre-installed" 1>&6 fi fi -{ echo "$as_me:$LINENO: checking where to find the target as" >&5 -echo $ECHO_N "checking where to find the target as... $ECHO_C" >&6; } +echo $ac_n "checking where to find the target as""... $ac_c" 1>&6 +echo "configure:6826: checking where to find the target as" >&5 if test "x${build}" != "x${host}" ; then if expr "x$AS_FOR_TARGET" : "x/" > /dev/null; then # We already found the complete path - { echo "$as_me:$LINENO: result: pre-installed in \`dirname $AS_FOR_TARGET\`" >&5 -echo "${ECHO_T}pre-installed in \`dirname $AS_FOR_TARGET\`" >&6; } + echo "$ac_t""pre-installed in `dirname $AS_FOR_TARGET`" 1>&6 else # Canadian cross, just use what we found - { echo "$as_me:$LINENO: result: pre-installed" >&5 -echo "${ECHO_T}pre-installed" >&6; } + echo "$ac_t""pre-installed" 1>&6 fi else ok=yes @@ -9488,38 +6837,32 @@ *" gas "*) ;; *) ok=no ;; esac - + if test $ok = yes; then # An in-tree tool is available and we can use it AS_FOR_TARGET='$$r/$(HOST_SUBDIR)/gas/as-new' - { echo "$as_me:$LINENO: result: just compiled" >&5 -echo "${ECHO_T}just compiled" >&6; } + echo "$ac_t""just compiled" 1>&6 elif expr "x$AS_FOR_TARGET" : "x/" > /dev/null; then # We already found the complete path - { echo "$as_me:$LINENO: result: pre-installed in \`dirname $AS_FOR_TARGET\`" >&5 -echo "${ECHO_T}pre-installed in \`dirname $AS_FOR_TARGET\`" >&6; } + echo "$ac_t""pre-installed in `dirname $AS_FOR_TARGET`" 1>&6 elif test "x$target" = "x$host"; then # We can use an host tool AS_FOR_TARGET='$(AS)' - { echo "$as_me:$LINENO: result: host tool" >&5 -echo "${ECHO_T}host tool" >&6; } + echo "$ac_t""host tool" 1>&6 else # We need a cross tool - { echo "$as_me:$LINENO: result: pre-installed" >&5 -echo "${ECHO_T}pre-installed" >&6; } + echo "$ac_t""pre-installed" 1>&6 fi fi -{ echo "$as_me:$LINENO: checking where to find the target cc" >&5 -echo $ECHO_N "checking where to find the target cc... $ECHO_C" >&6; } +echo $ac_n "checking where to find the target cc""... $ac_c" 1>&6 +echo "configure:6859: checking where to find the target cc" >&5 if test "x${build}" != "x${host}" ; then if expr "x$CC_FOR_TARGET" : "x/" > /dev/null; then # We already found the complete path - { echo "$as_me:$LINENO: result: pre-installed in \`dirname $CC_FOR_TARGET\`" >&5 -echo "${ECHO_T}pre-installed in \`dirname $CC_FOR_TARGET\`" >&6; } + echo "$ac_t""pre-installed in `dirname $CC_FOR_TARGET`" 1>&6 else # Canadian cross, just use what we found - { echo "$as_me:$LINENO: result: pre-installed" >&5 -echo "${ECHO_T}pre-installed" >&6; } + echo "$ac_t""pre-installed" 1>&6 fi else ok=yes @@ -9527,38 +6870,32 @@ *" gcc "*) ;; *) ok=no ;; esac - + if test $ok = yes; then # An in-tree tool is available and we can use it CC_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/xgcc -B$$r/$(HOST_SUBDIR)/gcc/' - { echo "$as_me:$LINENO: result: just compiled" >&5 -echo "${ECHO_T}just compiled" >&6; } + echo "$ac_t""just compiled" 1>&6 elif expr "x$CC_FOR_TARGET" : "x/" > /dev/null; then # We already found the complete path - { echo "$as_me:$LINENO: result: pre-installed in \`dirname $CC_FOR_TARGET\`" >&5 -echo "${ECHO_T}pre-installed in \`dirname $CC_FOR_TARGET\`" >&6; } + echo "$ac_t""pre-installed in `dirname $CC_FOR_TARGET`" 1>&6 elif test "x$target" = "x$host"; then # We can use an host tool CC_FOR_TARGET='$(CC)' - { echo "$as_me:$LINENO: result: host tool" >&5 -echo "${ECHO_T}host tool" >&6; } + echo "$ac_t""host tool" 1>&6 else # We need a cross tool - { echo "$as_me:$LINENO: result: pre-installed" >&5 -echo "${ECHO_T}pre-installed" >&6; } + echo "$ac_t""pre-installed" 1>&6 fi fi -{ echo "$as_me:$LINENO: checking where to find the target c++" >&5 -echo $ECHO_N "checking where to find the target c++... $ECHO_C" >&6; } +echo $ac_n "checking where to find the target c++""... $ac_c" 1>&6 +echo "configure:6892: checking where to find the target c++" >&5 if test "x${build}" != "x${host}" ; then if expr "x$CXX_FOR_TARGET" : "x/" > /dev/null; then # We already found the complete path - { echo "$as_me:$LINENO: result: pre-installed in \`dirname $CXX_FOR_TARGET\`" >&5 -echo "${ECHO_T}pre-installed in \`dirname $CXX_FOR_TARGET\`" >&6; } + echo "$ac_t""pre-installed in `dirname $CXX_FOR_TARGET`" 1>&6 else # Canadian cross, just use what we found - { echo "$as_me:$LINENO: result: pre-installed" >&5 -echo "${ECHO_T}pre-installed" >&6; } + echo "$ac_t""pre-installed" 1>&6 fi else ok=yes @@ -9573,34 +6910,28 @@ if test $ok = yes; then # An in-tree tool is available and we can use it CXX_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/g++ -B$$r/$(HOST_SUBDIR)/gcc/ -nostdinc++ `test ! -f $$r/$(TARGET_SUBDIR)/libstdc++-v3/scripts/testsuite_flags || $(SHELL) $$r/$(TARGET_SUBDIR)/libstdc++-v3/scripts/testsuite_flags --build-includes` -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs' - { echo "$as_me:$LINENO: result: just compiled" >&5 -echo "${ECHO_T}just compiled" >&6; } + echo "$ac_t""just compiled" 1>&6 elif expr "x$CXX_FOR_TARGET" : "x/" > /dev/null; then # We already found the complete path - { echo "$as_me:$LINENO: result: pre-installed in \`dirname $CXX_FOR_TARGET\`" >&5 -echo "${ECHO_T}pre-installed in \`dirname $CXX_FOR_TARGET\`" >&6; } + echo "$ac_t""pre-installed in `dirname $CXX_FOR_TARGET`" 1>&6 elif test "x$target" = "x$host"; then # We can use an host tool CXX_FOR_TARGET='$(CXX)' - { echo "$as_me:$LINENO: result: host tool" >&5 -echo "${ECHO_T}host tool" >&6; } + echo "$ac_t""host tool" 1>&6 else # We need a cross tool - { echo "$as_me:$LINENO: result: pre-installed" >&5 -echo "${ECHO_T}pre-installed" >&6; } + echo "$ac_t""pre-installed" 1>&6 fi fi -{ echo "$as_me:$LINENO: checking where to find the target c++ for libstdc++" >&5 -echo $ECHO_N "checking where to find the target c++ for libstdc++... $ECHO_C" >&6; } +echo $ac_n "checking where to find the target c++ for libstdc++""... $ac_c" 1>&6 +echo "configure:6928: checking where to find the target c++ for libstdc++" >&5 if test "x${build}" != "x${host}" ; then if expr "x$RAW_CXX_FOR_TARGET" : "x/" > /dev/null; then # We already found the complete path - { echo "$as_me:$LINENO: result: pre-installed in \`dirname $RAW_CXX_FOR_TARGET\`" >&5 -echo "${ECHO_T}pre-installed in \`dirname $RAW_CXX_FOR_TARGET\`" >&6; } + echo "$ac_t""pre-installed in `dirname $RAW_CXX_FOR_TARGET`" 1>&6 else # Canadian cross, just use what we found - { echo "$as_me:$LINENO: result: pre-installed" >&5 -echo "${ECHO_T}pre-installed" >&6; } + echo "$ac_t""pre-installed" 1>&6 fi else ok=yes @@ -9615,34 +6946,28 @@ if test $ok = yes; then # An in-tree tool is available and we can use it RAW_CXX_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/xgcc -shared-libgcc -B$$r/$(HOST_SUBDIR)/gcc -nostdinc++ -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs' - { echo "$as_me:$LINENO: result: just compiled" >&5 -echo "${ECHO_T}just compiled" >&6; } + echo "$ac_t""just compiled" 1>&6 elif expr "x$RAW_CXX_FOR_TARGET" : "x/" > /dev/null; then # We already found the complete path - { echo "$as_me:$LINENO: result: pre-installed in \`dirname $RAW_CXX_FOR_TARGET\`" >&5 -echo "${ECHO_T}pre-installed in \`dirname $RAW_CXX_FOR_TARGET\`" >&6; } + echo "$ac_t""pre-installed in `dirname $RAW_CXX_FOR_TARGET`" 1>&6 elif test "x$target" = "x$host"; then # We can use an host tool RAW_CXX_FOR_TARGET='$(CXX)' - { echo "$as_me:$LINENO: result: host tool" >&5 -echo "${ECHO_T}host tool" >&6; } + echo "$ac_t""host tool" 1>&6 else # We need a cross tool - { echo "$as_me:$LINENO: result: pre-installed" >&5 -echo "${ECHO_T}pre-installed" >&6; } + echo "$ac_t""pre-installed" 1>&6 fi fi -{ echo "$as_me:$LINENO: checking where to find the target dlltool" >&5 -echo $ECHO_N "checking where to find the target dlltool... $ECHO_C" >&6; } +echo $ac_n "checking where to find the target dlltool""... $ac_c" 1>&6 +echo "configure:6964: checking where to find the target dlltool" >&5 if test "x${build}" != "x${host}" ; then if expr "x$DLLTOOL_FOR_TARGET" : "x/" > /dev/null; then # We already found the complete path - { echo "$as_me:$LINENO: result: pre-installed in \`dirname $DLLTOOL_FOR_TARGET\`" >&5 -echo "${ECHO_T}pre-installed in \`dirname $DLLTOOL_FOR_TARGET\`" >&6; } + echo "$ac_t""pre-installed in `dirname $DLLTOOL_FOR_TARGET`" 1>&6 else # Canadian cross, just use what we found - { echo "$as_me:$LINENO: result: pre-installed" >&5 -echo "${ECHO_T}pre-installed" >&6; } + echo "$ac_t""pre-installed" 1>&6 fi else ok=yes @@ -9650,38 +6975,32 @@ *" binutils "*) ;; *) ok=no ;; esac - + if test $ok = yes; then # An in-tree tool is available and we can use it DLLTOOL_FOR_TARGET='$$r/$(HOST_SUBDIR)/binutils/dlltool' - { echo "$as_me:$LINENO: result: just compiled" >&5 -echo "${ECHO_T}just compiled" >&6; } + echo "$ac_t""just compiled" 1>&6 elif expr "x$DLLTOOL_FOR_TARGET" : "x/" > /dev/null; then # We already found the complete path - { echo "$as_me:$LINENO: result: pre-installed in \`dirname $DLLTOOL_FOR_TARGET\`" >&5 -echo "${ECHO_T}pre-installed in \`dirname $DLLTOOL_FOR_TARGET\`" >&6; } + echo "$ac_t""pre-installed in `dirname $DLLTOOL_FOR_TARGET`" 1>&6 elif test "x$target" = "x$host"; then # We can use an host tool DLLTOOL_FOR_TARGET='$(DLLTOOL)' - { echo "$as_me:$LINENO: result: host tool" >&5 -echo "${ECHO_T}host tool" >&6; } + echo "$ac_t""host tool" 1>&6 else # We need a cross tool - { echo "$as_me:$LINENO: result: pre-installed" >&5 -echo "${ECHO_T}pre-installed" >&6; } + echo "$ac_t""pre-installed" 1>&6 fi fi -{ echo "$as_me:$LINENO: checking where to find the target gcc" >&5 -echo $ECHO_N "checking where to find the target gcc... $ECHO_C" >&6; } +echo $ac_n "checking where to find the target gcc""... $ac_c" 1>&6 +echo "configure:6997: checking where to find the target gcc" >&5 if test "x${build}" != "x${host}" ; then if expr "x$GCC_FOR_TARGET" : "x/" > /dev/null; then # We already found the complete path - { echo "$as_me:$LINENO: result: pre-installed in \`dirname $GCC_FOR_TARGET\`" >&5 -echo "${ECHO_T}pre-installed in \`dirname $GCC_FOR_TARGET\`" >&6; } + echo "$ac_t""pre-installed in `dirname $GCC_FOR_TARGET`" 1>&6 else # Canadian cross, just use what we found - { echo "$as_me:$LINENO: result: pre-installed" >&5 -echo "${ECHO_T}pre-installed" >&6; } + echo "$ac_t""pre-installed" 1>&6 fi else ok=yes @@ -9689,38 +7008,32 @@ *" gcc "*) ;; *) ok=no ;; esac - + if test $ok = yes; then # An in-tree tool is available and we can use it GCC_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/xgcc -B$$r/$(HOST_SUBDIR)/gcc/' - { echo "$as_me:$LINENO: result: just compiled" >&5 -echo "${ECHO_T}just compiled" >&6; } + echo "$ac_t""just compiled" 1>&6 elif expr "x$GCC_FOR_TARGET" : "x/" > /dev/null; then # We already found the complete path - { echo "$as_me:$LINENO: result: pre-installed in \`dirname $GCC_FOR_TARGET\`" >&5 -echo "${ECHO_T}pre-installed in \`dirname $GCC_FOR_TARGET\`" >&6; } + echo "$ac_t""pre-installed in `dirname $GCC_FOR_TARGET`" 1>&6 elif test "x$target" = "x$host"; then # We can use an host tool GCC_FOR_TARGET='$()' - { echo "$as_me:$LINENO: result: host tool" >&5 -echo "${ECHO_T}host tool" >&6; } + echo "$ac_t""host tool" 1>&6 else # We need a cross tool - { echo "$as_me:$LINENO: result: pre-installed" >&5 -echo "${ECHO_T}pre-installed" >&6; } + echo "$ac_t""pre-installed" 1>&6 fi fi -{ echo "$as_me:$LINENO: checking where to find the target gcj" >&5 -echo $ECHO_N "checking where to find the target gcj... $ECHO_C" >&6; } +echo $ac_n "checking where to find the target gcj""... $ac_c" 1>&6 +echo "configure:7030: checking where to find the target gcj" >&5 if test "x${build}" != "x${host}" ; then if expr "x$GCJ_FOR_TARGET" : "x/" > /dev/null; then # We already found the complete path - { echo "$as_me:$LINENO: result: pre-installed in \`dirname $GCJ_FOR_TARGET\`" >&5 -echo "${ECHO_T}pre-installed in \`dirname $GCJ_FOR_TARGET\`" >&6; } + echo "$ac_t""pre-installed in `dirname $GCJ_FOR_TARGET`" 1>&6 else # Canadian cross, just use what we found - { echo "$as_me:$LINENO: result: pre-installed" >&5 -echo "${ECHO_T}pre-installed" >&6; } + echo "$ac_t""pre-installed" 1>&6 fi else ok=yes @@ -9735,34 +7048,28 @@ if test $ok = yes; then # An in-tree tool is available and we can use it GCJ_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/gcj -B$$r/$(HOST_SUBDIR)/gcc/' - { echo "$as_me:$LINENO: result: just compiled" >&5 -echo "${ECHO_T}just compiled" >&6; } + echo "$ac_t""just compiled" 1>&6 elif expr "x$GCJ_FOR_TARGET" : "x/" > /dev/null; then # We already found the complete path - { echo "$as_me:$LINENO: result: pre-installed in \`dirname $GCJ_FOR_TARGET\`" >&5 -echo "${ECHO_T}pre-installed in \`dirname $GCJ_FOR_TARGET\`" >&6; } + echo "$ac_t""pre-installed in `dirname $GCJ_FOR_TARGET`" 1>&6 elif test "x$target" = "x$host"; then # We can use an host tool GCJ_FOR_TARGET='$(GCJ)' - { echo "$as_me:$LINENO: result: host tool" >&5 -echo "${ECHO_T}host tool" >&6; } + echo "$ac_t""host tool" 1>&6 else # We need a cross tool - { echo "$as_me:$LINENO: result: pre-installed" >&5 -echo "${ECHO_T}pre-installed" >&6; } + echo "$ac_t""pre-installed" 1>&6 fi fi -{ echo "$as_me:$LINENO: checking where to find the target gfortran" >&5 -echo $ECHO_N "checking where to find the target gfortran... $ECHO_C" >&6; } +echo $ac_n "checking where to find the target gfortran""... $ac_c" 1>&6 +echo "configure:7066: checking where to find the target gfortran" >&5 if test "x${build}" != "x${host}" ; then if expr "x$GFORTRAN_FOR_TARGET" : "x/" > /dev/null; then # We already found the complete path - { echo "$as_me:$LINENO: result: pre-installed in \`dirname $GFORTRAN_FOR_TARGET\`" >&5 -echo "${ECHO_T}pre-installed in \`dirname $GFORTRAN_FOR_TARGET\`" >&6; } + echo "$ac_t""pre-installed in `dirname $GFORTRAN_FOR_TARGET`" 1>&6 else # Canadian cross, just use what we found - { echo "$as_me:$LINENO: result: pre-installed" >&5 -echo "${ECHO_T}pre-installed" >&6; } + echo "$ac_t""pre-installed" 1>&6 fi else ok=yes @@ -9777,34 +7084,28 @@ if test $ok = yes; then # An in-tree tool is available and we can use it GFORTRAN_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/gfortran -B$$r/$(HOST_SUBDIR)/gcc/' - { echo "$as_me:$LINENO: result: just compiled" >&5 -echo "${ECHO_T}just compiled" >&6; } + echo "$ac_t""just compiled" 1>&6 elif expr "x$GFORTRAN_FOR_TARGET" : "x/" > /dev/null; then # We already found the complete path - { echo "$as_me:$LINENO: result: pre-installed in \`dirname $GFORTRAN_FOR_TARGET\`" >&5 -echo "${ECHO_T}pre-installed in \`dirname $GFORTRAN_FOR_TARGET\`" >&6; } + echo "$ac_t""pre-installed in `dirname $GFORTRAN_FOR_TARGET`" 1>&6 elif test "x$target" = "x$host"; then # We can use an host tool GFORTRAN_FOR_TARGET='$(GFORTRAN)' - { echo "$as_me:$LINENO: result: host tool" >&5 -echo "${ECHO_T}host tool" >&6; } + echo "$ac_t""host tool" 1>&6 else # We need a cross tool - { echo "$as_me:$LINENO: result: pre-installed" >&5 -echo "${ECHO_T}pre-installed" >&6; } + echo "$ac_t""pre-installed" 1>&6 fi fi -{ echo "$as_me:$LINENO: checking where to find the target ld" >&5 -echo $ECHO_N "checking where to find the target ld... $ECHO_C" >&6; } +echo $ac_n "checking where to find the target ld""... $ac_c" 1>&6 +echo "configure:7102: checking where to find the target ld" >&5 if test "x${build}" != "x${host}" ; then if expr "x$LD_FOR_TARGET" : "x/" > /dev/null; then # We already found the complete path - { echo "$as_me:$LINENO: result: pre-installed in \`dirname $LD_FOR_TARGET\`" >&5 -echo "${ECHO_T}pre-installed in \`dirname $LD_FOR_TARGET\`" >&6; } + echo "$ac_t""pre-installed in `dirname $LD_FOR_TARGET`" 1>&6 else # Canadian cross, just use what we found - { echo "$as_me:$LINENO: result: pre-installed" >&5 -echo "${ECHO_T}pre-installed" >&6; } + echo "$ac_t""pre-installed" 1>&6 fi else ok=yes @@ -9812,66 +7113,55 @@ *" ld "*) ;; *) ok=no ;; esac - + if test $ok = yes; then # An in-tree tool is available and we can use it LD_FOR_TARGET='$$r/$(HOST_SUBDIR)/ld/ld-new' - { echo "$as_me:$LINENO: result: just compiled" >&5 -echo "${ECHO_T}just compiled" >&6; } + echo "$ac_t""just compiled" 1>&6 elif expr "x$LD_FOR_TARGET" : "x/" > /dev/null; then # We already found the complete path - { echo "$as_me:$LINENO: result: pre-installed in \`dirname $LD_FOR_TARGET\`" >&5 -echo "${ECHO_T}pre-installed in \`dirname $LD_FOR_TARGET\`" >&6; } + echo "$ac_t""pre-installed in `dirname $LD_FOR_TARGET`" 1>&6 elif test "x$target" = "x$host"; then # We can use an host tool LD_FOR_TARGET='$(LD)' - { echo "$as_me:$LINENO: result: host tool" >&5 -echo "${ECHO_T}host tool" >&6; } + echo "$ac_t""host tool" 1>&6 else # We need a cross tool - { echo "$as_me:$LINENO: result: pre-installed" >&5 -echo "${ECHO_T}pre-installed" >&6; } + echo "$ac_t""pre-installed" 1>&6 fi fi -{ echo "$as_me:$LINENO: checking where to find the target lipo" >&5 -echo $ECHO_N "checking where to find the target lipo... $ECHO_C" >&6; } +echo $ac_n "checking where to find the target lipo""... $ac_c" 1>&6 +echo "configure:7135: checking where to find the target lipo" >&5 if test "x${build}" != "x${host}" ; then if expr "x$LIPO_FOR_TARGET" : "x/" > /dev/null; then # We already found the complete path - { echo "$as_me:$LINENO: result: pre-installed in \`dirname $LIPO_FOR_TARGET\`" >&5 -echo "${ECHO_T}pre-installed in \`dirname $LIPO_FOR_TARGET\`" >&6; } + echo "$ac_t""pre-installed in `dirname $LIPO_FOR_TARGET`" 1>&6 else # Canadian cross, just use what we found - { echo "$as_me:$LINENO: result: pre-installed" >&5 -echo "${ECHO_T}pre-installed" >&6; } + echo "$ac_t""pre-installed" 1>&6 fi else if expr "x$LIPO_FOR_TARGET" : "x/" > /dev/null; then # We already found the complete path - { echo "$as_me:$LINENO: result: pre-installed in \`dirname $LIPO_FOR_TARGET\`" >&5 -echo "${ECHO_T}pre-installed in \`dirname $LIPO_FOR_TARGET\`" >&6; } + echo "$ac_t""pre-installed in `dirname $LIPO_FOR_TARGET`" 1>&6 elif test "x$target" = "x$host"; then # We can use an host tool LIPO_FOR_TARGET='$(LIPO)' - { echo "$as_me:$LINENO: result: host tool" >&5 -echo "${ECHO_T}host tool" >&6; } + echo "$ac_t""host tool" 1>&6 else # We need a cross tool - { echo "$as_me:$LINENO: result: pre-installed" >&5 -echo "${ECHO_T}pre-installed" >&6; } + echo "$ac_t""pre-installed" 1>&6 fi fi -{ echo "$as_me:$LINENO: checking where to find the target nm" >&5 -echo $ECHO_N "checking where to find the target nm... $ECHO_C" >&6; } +echo $ac_n "checking where to find the target nm""... $ac_c" 1>&6 +echo "configure:7158: checking where to find the target nm" >&5 if test "x${build}" != "x${host}" ; then if expr "x$NM_FOR_TARGET" : "x/" > /dev/null; then # We already found the complete path - { echo "$as_me:$LINENO: result: pre-installed in \`dirname $NM_FOR_TARGET\`" >&5 -echo "${ECHO_T}pre-installed in \`dirname $NM_FOR_TARGET\`" >&6; } + echo "$ac_t""pre-installed in `dirname $NM_FOR_TARGET`" 1>&6 else # Canadian cross, just use what we found - { echo "$as_me:$LINENO: result: pre-installed" >&5 -echo "${ECHO_T}pre-installed" >&6; } + echo "$ac_t""pre-installed" 1>&6 fi else ok=yes @@ -9879,38 +7169,32 @@ *" binutils "*) ;; *) ok=no ;; esac - + if test $ok = yes; then # An in-tree tool is available and we can use it NM_FOR_TARGET='$$r/$(HOST_SUBDIR)/binutils/nm-new' - { echo "$as_me:$LINENO: result: just compiled" >&5 -echo "${ECHO_T}just compiled" >&6; } + echo "$ac_t""just compiled" 1>&6 elif expr "x$NM_FOR_TARGET" : "x/" > /dev/null; then # We already found the complete path - { echo "$as_me:$LINENO: result: pre-installed in \`dirname $NM_FOR_TARGET\`" >&5 -echo "${ECHO_T}pre-installed in \`dirname $NM_FOR_TARGET\`" >&6; } + echo "$ac_t""pre-installed in `dirname $NM_FOR_TARGET`" 1>&6 elif test "x$target" = "x$host"; then # We can use an host tool NM_FOR_TARGET='$(NM)' - { echo "$as_me:$LINENO: result: host tool" >&5 -echo "${ECHO_T}host tool" >&6; } + echo "$ac_t""host tool" 1>&6 else # We need a cross tool - { echo "$as_me:$LINENO: result: pre-installed" >&5 -echo "${ECHO_T}pre-installed" >&6; } + echo "$ac_t""pre-installed" 1>&6 fi fi -{ echo "$as_me:$LINENO: checking where to find the target objdump" >&5 -echo $ECHO_N "checking where to find the target objdump... $ECHO_C" >&6; } +echo $ac_n "checking where to find the target objdump""... $ac_c" 1>&6 +echo "configure:7191: checking where to find the target objdump" >&5 if test "x${build}" != "x${host}" ; then if expr "x$OBJDUMP_FOR_TARGET" : "x/" > /dev/null; then # We already found the complete path - { echo "$as_me:$LINENO: result: pre-installed in \`dirname $OBJDUMP_FOR_TARGET\`" >&5 -echo "${ECHO_T}pre-installed in \`dirname $OBJDUMP_FOR_TARGET\`" >&6; } + echo "$ac_t""pre-installed in `dirname $OBJDUMP_FOR_TARGET`" 1>&6 else # Canadian cross, just use what we found - { echo "$as_me:$LINENO: result: pre-installed" >&5 -echo "${ECHO_T}pre-installed" >&6; } + echo "$ac_t""pre-installed" 1>&6 fi else ok=yes @@ -9918,38 +7202,32 @@ *" binutils "*) ;; *) ok=no ;; esac - + if test $ok = yes; then # An in-tree tool is available and we can use it OBJDUMP_FOR_TARGET='$$r/$(HOST_SUBDIR)/binutils/objdump' - { echo "$as_me:$LINENO: result: just compiled" >&5 -echo "${ECHO_T}just compiled" >&6; } + echo "$ac_t""just compiled" 1>&6 elif expr "x$OBJDUMP_FOR_TARGET" : "x/" > /dev/null; then # We already found the complete path - { echo "$as_me:$LINENO: result: pre-installed in \`dirname $OBJDUMP_FOR_TARGET\`" >&5 -echo "${ECHO_T}pre-installed in \`dirname $OBJDUMP_FOR_TARGET\`" >&6; } + echo "$ac_t""pre-installed in `dirname $OBJDUMP_FOR_TARGET`" 1>&6 elif test "x$target" = "x$host"; then # We can use an host tool OBJDUMP_FOR_TARGET='$(OBJDUMP)' - { echo "$as_me:$LINENO: result: host tool" >&5 -echo "${ECHO_T}host tool" >&6; } + echo "$ac_t""host tool" 1>&6 else # We need a cross tool - { echo "$as_me:$LINENO: result: pre-installed" >&5 -echo "${ECHO_T}pre-installed" >&6; } + echo "$ac_t""pre-installed" 1>&6 fi fi -{ echo "$as_me:$LINENO: checking where to find the target ranlib" >&5 -echo $ECHO_N "checking where to find the target ranlib... $ECHO_C" >&6; } +echo $ac_n "checking where to find the target ranlib""... $ac_c" 1>&6 +echo "configure:7224: checking where to find the target ranlib" >&5 if test "x${build}" != "x${host}" ; then if expr "x$RANLIB_FOR_TARGET" : "x/" > /dev/null; then # We already found the complete path - { echo "$as_me:$LINENO: result: pre-installed in \`dirname $RANLIB_FOR_TARGET\`" >&5 -echo "${ECHO_T}pre-installed in \`dirname $RANLIB_FOR_TARGET\`" >&6; } + echo "$ac_t""pre-installed in `dirname $RANLIB_FOR_TARGET`" 1>&6 else # Canadian cross, just use what we found - { echo "$as_me:$LINENO: result: pre-installed" >&5 -echo "${ECHO_T}pre-installed" >&6; } + echo "$ac_t""pre-installed" 1>&6 fi else ok=yes @@ -9957,38 +7235,32 @@ *" binutils "*) ;; *) ok=no ;; esac - + if test $ok = yes; then # An in-tree tool is available and we can use it RANLIB_FOR_TARGET='$$r/$(HOST_SUBDIR)/binutils/ranlib' - { echo "$as_me:$LINENO: result: just compiled" >&5 -echo "${ECHO_T}just compiled" >&6; } + echo "$ac_t""just compiled" 1>&6 elif expr "x$RANLIB_FOR_TARGET" : "x/" > /dev/null; then # We already found the complete path - { echo "$as_me:$LINENO: result: pre-installed in \`dirname $RANLIB_FOR_TARGET\`" >&5 -echo "${ECHO_T}pre-installed in \`dirname $RANLIB_FOR_TARGET\`" >&6; } + echo "$ac_t""pre-installed in `dirname $RANLIB_FOR_TARGET`" 1>&6 elif test "x$target" = "x$host"; then # We can use an host tool RANLIB_FOR_TARGET='$(RANLIB)' - { echo "$as_me:$LINENO: result: host tool" >&5 -echo "${ECHO_T}host tool" >&6; } + echo "$ac_t""host tool" 1>&6 else # We need a cross tool - { echo "$as_me:$LINENO: result: pre-installed" >&5 -echo "${ECHO_T}pre-installed" >&6; } + echo "$ac_t""pre-installed" 1>&6 fi fi -{ echo "$as_me:$LINENO: checking where to find the target strip" >&5 -echo $ECHO_N "checking where to find the target strip... $ECHO_C" >&6; } +echo $ac_n "checking where to find the target strip""... $ac_c" 1>&6 +echo "configure:7257: checking where to find the target strip" >&5 if test "x${build}" != "x${host}" ; then if expr "x$STRIP_FOR_TARGET" : "x/" > /dev/null; then # We already found the complete path - { echo "$as_me:$LINENO: result: pre-installed in \`dirname $STRIP_FOR_TARGET\`" >&5 -echo "${ECHO_T}pre-installed in \`dirname $STRIP_FOR_TARGET\`" >&6; } + echo "$ac_t""pre-installed in `dirname $STRIP_FOR_TARGET`" 1>&6 else # Canadian cross, just use what we found - { echo "$as_me:$LINENO: result: pre-installed" >&5 -echo "${ECHO_T}pre-installed" >&6; } + echo "$ac_t""pre-installed" 1>&6 fi else ok=yes @@ -9996,38 +7268,32 @@ *" binutils "*) ;; *) ok=no ;; esac - + if test $ok = yes; then # An in-tree tool is available and we can use it STRIP_FOR_TARGET='$$r/$(HOST_SUBDIR)/binutils/strip' - { echo "$as_me:$LINENO: result: just compiled" >&5 -echo "${ECHO_T}just compiled" >&6; } + echo "$ac_t""just compiled" 1>&6 elif expr "x$STRIP_FOR_TARGET" : "x/" > /dev/null; then # We already found the complete path - { echo "$as_me:$LINENO: result: pre-installed in \`dirname $STRIP_FOR_TARGET\`" >&5 -echo "${ECHO_T}pre-installed in \`dirname $STRIP_FOR_TARGET\`" >&6; } + echo "$ac_t""pre-installed in `dirname $STRIP_FOR_TARGET`" 1>&6 elif test "x$target" = "x$host"; then # We can use an host tool STRIP_FOR_TARGET='$(STRIP)' - { echo "$as_me:$LINENO: result: host tool" >&5 -echo "${ECHO_T}host tool" >&6; } + echo "$ac_t""host tool" 1>&6 else # We need a cross tool - { echo "$as_me:$LINENO: result: pre-installed" >&5 -echo "${ECHO_T}pre-installed" >&6; } + echo "$ac_t""pre-installed" 1>&6 fi fi -{ echo "$as_me:$LINENO: checking where to find the target windres" >&5 -echo $ECHO_N "checking where to find the target windres... $ECHO_C" >&6; } +echo $ac_n "checking where to find the target windres""... $ac_c" 1>&6 +echo "configure:7290: checking where to find the target windres" >&5 if test "x${build}" != "x${host}" ; then if expr "x$WINDRES_FOR_TARGET" : "x/" > /dev/null; then # We already found the complete path - { echo "$as_me:$LINENO: result: pre-installed in \`dirname $WINDRES_FOR_TARGET\`" >&5 -echo "${ECHO_T}pre-installed in \`dirname $WINDRES_FOR_TARGET\`" >&6; } + echo "$ac_t""pre-installed in `dirname $WINDRES_FOR_TARGET`" 1>&6 else # Canadian cross, just use what we found - { echo "$as_me:$LINENO: result: pre-installed" >&5 -echo "${ECHO_T}pre-installed" >&6; } + echo "$ac_t""pre-installed" 1>&6 fi else ok=yes @@ -10035,25 +7301,21 @@ *" binutils "*) ;; *) ok=no ;; esac - + if test $ok = yes; then # An in-tree tool is available and we can use it WINDRES_FOR_TARGET='$$r/$(HOST_SUBDIR)/binutils/windres' - { echo "$as_me:$LINENO: result: just compiled" >&5 -echo "${ECHO_T}just compiled" >&6; } + echo "$ac_t""just compiled" 1>&6 elif expr "x$WINDRES_FOR_TARGET" : "x/" > /dev/null; then # We already found the complete path - { echo "$as_me:$LINENO: result: pre-installed in \`dirname $WINDRES_FOR_TARGET\`" >&5 -echo "${ECHO_T}pre-installed in \`dirname $WINDRES_FOR_TARGET\`" >&6; } + echo "$ac_t""pre-installed in `dirname $WINDRES_FOR_TARGET`" 1>&6 elif test "x$target" = "x$host"; then # We can use an host tool WINDRES_FOR_TARGET='$(WINDRES)' - { echo "$as_me:$LINENO: result: host tool" >&5 -echo "${ECHO_T}host tool" >&6; } + echo "$ac_t""host tool" 1>&6 else # We need a cross tool - { echo "$as_me:$LINENO: result: pre-installed" >&5 -echo "${ECHO_T}pre-installed" >&6; } + echo "$ac_t""pre-installed" 1>&6 fi fi @@ -10084,17 +7346,17 @@ -{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 -echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; } -# Check whether --enable-maintainer-mode was given. +echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 +echo "configure:7351: checking whether to enable maintainer-specific portions of Makefiles" >&5 +# Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then - enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval + enableval="$enable_maintainer_mode" + USE_MAINTAINER_MODE=$enableval else USE_MAINTAINER_MODE=no fi -{ echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 -echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; } +echo "$ac_t""$USE_MAINTAINER_MODE" 1>&6 if test "$USE_MAINTAINER_MODE" = yes; then @@ -10103,7 +7365,7 @@ else MAINTAINER_MODE_TRUE='#' MAINTAINER_MODE_FALSE= -fi +fi MAINT=$MAINTAINER_MODE_TRUE # --------------------- @@ -10135,57 +7397,32 @@ # Pass -fkeep-inline-functions for stage 1 if the GCC version supports it. CFLAGS="$CFLAGS -fkeep-inline-functions" - { echo "$as_me:$LINENO: checking whether -fkeep-inline-functions is supported" >&5 -echo $ECHO_N "checking whether -fkeep-inline-functions is supported... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ + echo $ac_n "checking whether -fkeep-inline-functions is supported""... $ac_c" 1>&6 +echo "configure:7402: checking whether -fkeep-inline-functions is supported" >&5 + cat > conftest.$ac_ext <&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; }; stage1_cflags="$stage1_cflags -fkeep-inline-functions" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } +; return 0; } +EOF +if { (eval echo configure:7417: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + echo "$ac_t""yes" 1>&6; stage1_cflags="$stage1_cflags -fkeep-inline-functions" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + echo "$ac_t""no" 1>&6 fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest* CFLAGS="$saved_CFLAGS" fi @@ -10195,9 +7432,10 @@ # Enable --enable-checking in stage1 of the compiler. -# Check whether --enable-stage1-checking was given. +# Check whether --enable-stage1-checking or --disable-stage1-checking was given. if test "${enable_stage1_checking+set}" = set; then - enableval=$enable_stage1_checking; stage1_checking=--enable-checking=${enable_stage1_checking} + enableval="$enable_stage1_checking" + stage1_checking=--enable-checking=${enable_stage1_checking} else if test "x$enable_checking" = xno; then # LLVM LOCAL begin - don't enable checking when we meant to disable it @@ -10211,9 +7449,10 @@ # Enable -Werror in bootstrap stage2 and later. -# Check whether --enable-werror was given. +# Check whether --enable-werror or --disable-werror was given. if test "${enable_werror+set}" = set; then - enableval=$enable_werror; + enableval="$enable_werror" + : else if test -d gcc && test x"`cat $srcdir/gcc/DEV-PHASE`" = xexperimental; then enable_werror=yes @@ -10229,28 +7468,28 @@ # Flags needed to enable html installing and building - -# Check whether --with-datarootdir was given. +# Check whether --with-datarootdir or --without-datarootdir was given. if test "${with_datarootdir+set}" = set; then - withval=$with_datarootdir; datarootdir="\${prefix}/${withval}" + withval="$with_datarootdir" + datarootdir="\${prefix}/${withval}" else datarootdir="\${prefix}/share" fi - -# Check whether --with-docdir was given. +# Check whether --with-docdir or --without-docdir was given. if test "${with_docdir+set}" = set; then - withval=$with_docdir; docdir="\${prefix}/${withval}" + withval="$with_docdir" + docdir="\${prefix}/${withval}" else docdir="\${datarootdir}/doc" fi - -# Check whether --with-htmldir was given. +# Check whether --with-htmldir or --without-htmldir was given. if test "${with_htmldir+set}" = set; then - withval=$with_htmldir; htmldir="\${prefix}/${withval}" + withval="$with_htmldir" + htmldir="\${prefix}/${withval}" else htmldir="\${docdir}" fi @@ -10260,1169 +7499,365 @@ -ac_config_files="$ac_config_files Makefile" - -cat >confcache <<\_ACEOF +trap '' 1 2 15 +cat > confcache <<\EOF # 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. +# scripts and configure runs. 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. +# By default, configure uses ./config.cache as the cache file, +# creating it if it does not exist already. You can give configure +# the --cache-file=FILE option to use a different cache file; that is +# what configure does when it calls configure scripts in +# subdirectories, so they share the cache. +# Giving --cache-file=/dev/null disables caching, for debugging configure. +# 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 - +EOF # The following way of writing the cache mishandles newlines in values, # but we know of no workaround that is simple, portable, and efficient. -# So, we kill variables containing newlines. +# 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. -( - for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do - eval ac_val=\$$ac_var - case $ac_val in #( - *${as_nl}*) - case $ac_var in #( - *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 -echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; - esac - case $ac_var in #( - _ | IFS | as_nl) ;; #( - *) $as_unset $ac_var ;; - esac ;; - esac - done - - (set) 2>&1 | - case $as_nl`(ac_space=' '; set) 2>&1` in #( - *${as_nl}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 "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" - ;; - esac | - sort -) | - sed ' - /^ac_cv_env_/b end - t clear - :clear - s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ - t end - 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 "$as_me:$LINENO: updating cache $cache_file" >&5 -echo "$as_me: updating cache $cache_file" >&6;} - cat confcache >$cache_file +(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 \ + -e "s/'/'\\\\''/g" \ + -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p" + ;; + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. + sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p' + ;; + esac >> confcache +if cmp -s $cache_file confcache; then + : +else + if test -w $cache_file; then + echo "updating cache $cache_file" + cat confcache > $cache_file else - { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 -echo "$as_me: not updating unwritable cache $cache_file" >&6;} + echo "not updating unwritable cache $cache_file" fi fi rm -f confcache +trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 + test "x$prefix" = xNONE && prefix=$ac_default_prefix # Let make expand exec_prefix. test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' +# Any assignment to VPATH causes Sun make to only execute +# the first set of double-colon rules, so remove it if not needed. +# If there is a colon in the path, we need to keep it. +if test "x$srcdir" = x.; then + ac_vpsub='/^[ ]*VPATH[ ]*=[^:]*$/d' +fi + +trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15 + # 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 branch to the quote section. Otherwise, -# look for a macro that doesn't take arguments. -ac_script=' -t clear -:clear -s/^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\)/-D\1=\2/g -t quote -s/^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)/-D\1=\2/g -t quote -b any -:quote -s/[ `~#$^&*(){}\\|;'\''"<>?]/\\&/g -s/\[/\\&/g -s/\]/\\&/g -s/\$/$$/g -H -:any -${ - g - s/^\n// - s/\n/ /g - p -} -' -DEFS=`sed -n "$ac_script" confdefs.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_script='s/\$U\././;s/\.o$//;s/\.obj$//' - ac_i=`echo "$ac_i" | sed "$ac_script"` - # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR - # will be set to the directory where LIBOBJS objects are built. - ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" - ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' -done -LIBOBJS=$ac_libobjs - -LTLIBOBJS=$ac_ltlibobjs - +cat > conftest.defs <<\EOF +s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g +s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g +s%\[%\\&%g +s%\]%\\&%g +s%\$%$$%g +EOF +DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '` +rm -f conftest.defs +# Without the "./", some shells look in PATH for config.status. : ${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. + +echo creating $CONFIG_STATUS +rm -f $CONFIG_STATUS +cat > $CONFIG_STATUS </dev/null | sed 1q`: +# +# $0 $ac_configure_args +# # 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 more Bourne compatible -DUALCASE=1; export DUALCASE # for MKS sh -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+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; -esac - -fi - - - - -# PATH needs CR -# 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 - -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi - - -# IFS -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent editors from complaining about space-tab. -# (If _AS_PATH_WALK were called with IFS unset, it would disable word -# splitting by setting IFS to empty value.) -as_nl=' -' -IFS=" "" $as_nl" - -# Find who we are. Look in the path if we contain no directory separator. -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 -IFS=$as_save_IFS - - ;; -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_myself: error: cannot find myself; rerun with an absolute file name" >&2 - { (exit 1); exit 1; } -fi - -# Work around bugs in pre-3.0 UWIN ksh. -for as_var in ENV MAIL MAILPATH -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -done -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 -z "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else - ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - fi -done +# configure, is in ./config.log if it exists. -# Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; 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'` - -# CDPATH. -$as_unset CDPATH - - - - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { - - # 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 after each line using $LINENO; the second 'sed' - # does the real work. The second script uses 'N' to pair each - # line-number line with the line containing $LINENO, 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 - # scripts with optimization help from Paolo Bonzini. Blame Lee - # E. McMahon (1931-1989) for sed's syntax. :-) - sed -n ' - p - /[$]LINENO/= - ' <$as_myself | - sed ' - s/[$]LINENO.*/&-/ - t lineno - b - :lineno - N - :loop - s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ - t loop - s/-\n.*// - ' >$as_me.lineno && - chmod +x "$as_me.lineno" || - { 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 sensitive to this). - . "./$as_me.lineno" - # Exit status is that of the last command. - exit -} - - -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi - -ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in --n*) - case `echo 'x\c'` in - *c*) ECHO_T=' ';; # ECHO_T is single tab character. - *) ECHO_C='\c';; - esac;; -*) - ECHO_N='-n';; -esac - -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi - -rm -f conf$$ conf$$.exe conf$$.file -if test -d conf$$.dir; then - rm -f conf$$.dir/conf$$.file -else - rm -f conf$$.dir - mkdir conf$$.dir -fi -echo >conf$$.file -if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' -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$$.dir/conf$$.file conf$$.file -rmdir conf$$.dir 2>/dev/null - -if mkdir -p . 2>/dev/null; then - as_mkdir_p=: -else - test -d ./-p && rmdir ./-p - as_mkdir_p=false -fi - -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x - -# Sed expression to map a string onto a valid CPP name. -as_tr_cpp="eval 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="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - - -exec 6>&1 - -# Save the log message, to keep $[0] and so on meaningful, and to -# report actual input values of CONFIG_FILES etc. instead of their -# values after options handling. -ac_log=" -This file was extended by $as_me, which was -generated by GNU Autoconf 2.61. Invocation command line was - - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS - CONFIG_LINKS = $CONFIG_LINKS - CONFIG_COMMANDS = $CONFIG_COMMANDS - $ $0 $@ - -on `(hostname || uname -n) 2>/dev/null | sed 1q` -" - -_ACEOF - -cat >>$CONFIG_STATUS <<_ACEOF -# Files that config.status was made for. -config_files="$ac_config_files" - -_ACEOF - -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 and configuration settings, 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="\\ -config.status -configured by $0, generated by GNU Autoconf 2.61, - with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" - -Copyright (C) 2006 Free Software Foundation, Inc. -This config.status script is free software; the Free Software Foundation -gives unlimited permission to copy, distribute and modify it." - -ac_pwd='$ac_pwd' -srcdir='$srcdir' -INSTALL='$INSTALL' -_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 +ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]" +for ac_option 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 - ;; - esac - - case $ac_option in - # Handling of the options. + case "\$ac_option" in -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - ac_cs_recheck=: ;; - --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) - echo "$ac_cs_version"; exit ;; - --debug | --debu | --deb | --de | --d | -d ) - debug=: ;; - --file | --fil | --fi | --f ) - $ac_shift - CONFIG_FILES="$CONFIG_FILES $ac_optarg" - ac_need_defaults=false;; - --he | --h | --help | --hel | -h ) - echo "$ac_cs_usage"; exit ;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil | --si | --s) - ac_cs_silent=: ;; - - # This is an error. - -*) { 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" - ac_need_defaults=false ;; - - 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 CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 - CONFIG_SHELL=$SHELL - export CONFIG_SHELL - exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion -fi - -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF -exec 5>>config.log -{ - echo - sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX -## Running $as_me. ## -_ASBOX - echo "$ac_log" -} >&5 - -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF - -# Handling of arguments. -for ac_config_target in $ac_config_targets -do - case $ac_config_target in - "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; - - *) { { 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; }; };; + echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" + exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; + -version | --version | --versio | --versi | --vers | --ver | --ve | --v) + echo "$CONFIG_STATUS generated by autoconf version 2.13" + exit 0 ;; + -help | --help | --hel | --he | --h) + echo "\$ac_cs_usage"; exit 0 ;; + *) echo "\$ac_cs_usage"; exit 1 ;; esac done +ac_given_srcdir=$srcdir +ac_given_INSTALL="$INSTALL" -# 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 against having it here, and in addition, -# creating and moving files from /tmp can sometimes cause problems. -# Hook for its removal unless debugging. -# Note that there is a small window in which the directory will not be cleaned: -# after its creation but before its name has been assigned to `$tmp'. -$debug || -{ - tmp= - trap 'exit_status=$? - { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$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 "./confXXXXXX") 2>/dev/null` && - test -n "$tmp" && test -d "$tmp" -} || -{ - tmp=./conf$$-$RANDOM - (umask 077 && mkdir "$tmp") -} || -{ - echo "$me: cannot create a temporary directory in ." >&2 - { (exit 1); exit 1; } -} - -# -# Set up the sed scripts for CONFIG_FILES section. -# +trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 +EOF +cat >> $CONFIG_STATUS <conf$$subs.sed <<_ACEOF -SHELL!$SHELL$ac_delim -PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim -PACKAGE_NAME!$PACKAGE_NAME$ac_delim -PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim -PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim -PACKAGE_STRING!$PACKAGE_STRING$ac_delim -PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim -exec_prefix!$exec_prefix$ac_delim -prefix!$prefix$ac_delim -program_transform_name!$program_transform_name$ac_delim -bindir!$bindir$ac_delim -sbindir!$sbindir$ac_delim -libexecdir!$libexecdir$ac_delim -datarootdir!$datarootdir$ac_delim -datadir!$datadir$ac_delim -sysconfdir!$sysconfdir$ac_delim -sharedstatedir!$sharedstatedir$ac_delim -localstatedir!$localstatedir$ac_delim -includedir!$includedir$ac_delim -oldincludedir!$oldincludedir$ac_delim -docdir!$docdir$ac_delim -infodir!$infodir$ac_delim -htmldir!$htmldir$ac_delim -dvidir!$dvidir$ac_delim -pdfdir!$pdfdir$ac_delim -psdir!$psdir$ac_delim -libdir!$libdir$ac_delim -localedir!$localedir$ac_delim -mandir!$mandir$ac_delim -DEFS!$DEFS$ac_delim -ECHO_C!$ECHO_C$ac_delim -ECHO_N!$ECHO_N$ac_delim -ECHO_T!$ECHO_T$ac_delim -LIBS!$LIBS$ac_delim -build_alias!$build_alias$ac_delim -host_alias!$host_alias$ac_delim -target_alias!$target_alias$ac_delim -build!$build$ac_delim -build_cpu!$build_cpu$ac_delim -build_vendor!$build_vendor$ac_delim -build_os!$build_os$ac_delim -host!$host$ac_delim -host_cpu!$host_cpu$ac_delim -host_vendor!$host_vendor$ac_delim -host_os!$host_os$ac_delim -target!$target$ac_delim -target_cpu!$target_cpu$ac_delim -target_vendor!$target_vendor$ac_delim -target_os!$target_os$ac_delim -INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim -INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim -INSTALL_DATA!$INSTALL_DATA$ac_delim -LN!$LN$ac_delim -LN_S!$LN_S$ac_delim -TOPLEVEL_CONFIGURE_ARGUMENTS!$TOPLEVEL_CONFIGURE_ARGUMENTS$ac_delim -build_libsubdir!$build_libsubdir$ac_delim -build_subdir!$build_subdir$ac_delim -host_subdir!$host_subdir$ac_delim -target_subdir!$target_subdir$ac_delim -CC!$CC$ac_delim -CFLAGS!$CFLAGS$ac_delim -LDFLAGS!$LDFLAGS$ac_delim -CPPFLAGS!$CPPFLAGS$ac_delim -ac_ct_CC!$ac_ct_CC$ac_delim -EXEEXT!$EXEEXT$ac_delim -OBJEXT!$OBJEXT$ac_delim -GNATBIND!$GNATBIND$ac_delim -do_compare!$do_compare$ac_delim -gmplibs!$gmplibs$ac_delim -gmpinc!$gmpinc$ac_delim -stage1_languages!$stage1_languages$ac_delim -SYSROOT_CFLAGS_FOR_TARGET!$SYSROOT_CFLAGS_FOR_TARGET$ac_delim -RPATH_ENVVAR!$RPATH_ENVVAR$ac_delim -tooldir!$tooldir$ac_delim -build_tooldir!$build_tooldir$ac_delim -CONFIGURE_GDB_TK!$CONFIGURE_GDB_TK$ac_delim -GDB_TK!$GDB_TK$ac_delim -INSTALL_GDB_TK!$INSTALL_GDB_TK$ac_delim -build_configargs!$build_configargs$ac_delim -build_configdirs!$build_configdirs$ac_delim -host_configargs!$host_configargs$ac_delim -configdirs!$configdirs$ac_delim -_ACEOF +# Protect against being on the right side of a sed subst in config.status. +sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g; + s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF +$ac_vpsub +$extrasub +s%@SHELL@%$SHELL%g +s%@CFLAGS@%$CFLAGS%g +s%@CPPFLAGS@%$CPPFLAGS%g +s%@CXXFLAGS@%$CXXFLAGS%g +s%@FFLAGS@%$FFLAGS%g +s%@DEFS@%$DEFS%g +s%@LDFLAGS@%$LDFLAGS%g +s%@LIBS@%$LIBS%g +s%@exec_prefix@%$exec_prefix%g +s%@prefix@%$prefix%g +s%@program_transform_name@%$program_transform_name%g +s%@bindir@%$bindir%g +s%@sbindir@%$sbindir%g +s%@libexecdir@%$libexecdir%g +s%@datadir@%$datadir%g +s%@sysconfdir@%$sysconfdir%g +s%@sharedstatedir@%$sharedstatedir%g +s%@localstatedir@%$localstatedir%g +s%@libdir@%$libdir%g +s%@includedir@%$includedir%g +s%@oldincludedir@%$oldincludedir%g +s%@infodir@%$infodir%g +s%@mandir@%$mandir%g +s%@host@%$host%g +s%@host_alias@%$host_alias%g +s%@host_cpu@%$host_cpu%g +s%@host_vendor@%$host_vendor%g +s%@host_os@%$host_os%g +s%@target@%$target%g +s%@target_alias@%$target_alias%g +s%@target_cpu@%$target_cpu%g +s%@target_vendor@%$target_vendor%g +s%@target_os@%$target_os%g +s%@build@%$build%g +s%@build_alias@%$build_alias%g +s%@build_cpu@%$build_cpu%g +s%@build_vendor@%$build_vendor%g +s%@build_os@%$build_os%g +s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g +s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g +s%@INSTALL_DATA@%$INSTALL_DATA%g +s%@LN@%$LN%g +s%@LN_S@%$LN_S%g +s%@TOPLEVEL_CONFIGURE_ARGUMENTS@%$TOPLEVEL_CONFIGURE_ARGUMENTS%g +s%@build_libsubdir@%$build_libsubdir%g +s%@build_subdir@%$build_subdir%g +s%@host_subdir@%$host_subdir%g +s%@target_subdir@%$target_subdir%g +s%@CC@%$CC%g +s%@GNATBIND@%$GNATBIND%g +s%@do_compare@%$do_compare%g +s%@gmplibs@%$gmplibs%g +s%@gmpinc@%$gmpinc%g +s%@stage1_languages@%$stage1_languages%g +s%@SYSROOT_CFLAGS_FOR_TARGET@%$SYSROOT_CFLAGS_FOR_TARGET%g +/@serialization_dependencies@/r $serialization_dependencies +s%@serialization_dependencies@%%g +/@host_makefile_frag@/r $host_makefile_frag +s%@host_makefile_frag@%%g +/@target_makefile_frag@/r $target_makefile_frag +s%@target_makefile_frag@%%g +/@alphaieee_frag@/r $alphaieee_frag +s%@alphaieee_frag@%%g +/@ospace_frag@/r $ospace_frag +s%@ospace_frag@%%g +s%@RPATH_ENVVAR@%$RPATH_ENVVAR%g +s%@tooldir@%$tooldir%g +s%@build_tooldir@%$build_tooldir%g +s%@CONFIGURE_GDB_TK@%$CONFIGURE_GDB_TK%g +s%@GDB_TK@%$GDB_TK%g +s%@INSTALL_GDB_TK@%$INSTALL_GDB_TK%g +s%@build_configargs@%$build_configargs%g +s%@build_configdirs@%$build_configdirs%g +s%@host_configargs@%$host_configargs%g +s%@configdirs@%$configdirs%g +s%@target_configargs@%$target_configargs%g +s%@CC_FOR_BUILD@%$CC_FOR_BUILD%g +s%@config_shell@%$config_shell%g +s%@YACC@%$YACC%g +s%@BISON@%$BISON%g +s%@M4@%$M4%g +s%@LEX@%$LEX%g +s%@FLEX@%$FLEX%g +s%@MAKEINFO@%$MAKEINFO%g +s%@EXPECT@%$EXPECT%g +s%@RUNTEST@%$RUNTEST%g +s%@AR@%$AR%g +s%@AS@%$AS%g +s%@DLLTOOL@%$DLLTOOL%g +s%@LD@%$LD%g +s%@LIPO@%$LIPO%g +s%@NM@%$NM%g +s%@RANLIB@%$RANLIB%g +s%@STRIP@%$STRIP%g +s%@WINDRES@%$WINDRES%g +s%@OBJCOPY@%$OBJCOPY%g +s%@OBJDUMP@%$OBJDUMP%g +s%@CXX@%$CXX%g +s%@CFLAGS_FOR_BUILD@%$CFLAGS_FOR_BUILD%g +s%@CC_FOR_TARGET@%$CC_FOR_TARGET%g +s%@CXX_FOR_TARGET@%$CXX_FOR_TARGET%g +s%@GCC_FOR_TARGET@%$GCC_FOR_TARGET%g +s%@GCJ_FOR_TARGET@%$GCJ_FOR_TARGET%g +s%@GFORTRAN_FOR_TARGET@%$GFORTRAN_FOR_TARGET%g +s%@AR_FOR_TARGET@%$AR_FOR_TARGET%g +s%@AS_FOR_TARGET@%$AS_FOR_TARGET%g +s%@DLLTOOL_FOR_TARGET@%$DLLTOOL_FOR_TARGET%g +s%@LD_FOR_TARGET@%$LD_FOR_TARGET%g +s%@LIPO_FOR_TARGET@%$LIPO_FOR_TARGET%g +s%@NM_FOR_TARGET@%$NM_FOR_TARGET%g +s%@OBJDUMP_FOR_TARGET@%$OBJDUMP_FOR_TARGET%g +s%@RANLIB_FOR_TARGET@%$RANLIB_FOR_TARGET%g +s%@STRIP_FOR_TARGET@%$STRIP_FOR_TARGET%g +s%@WINDRES_FOR_TARGET@%$WINDRES_FOR_TARGET%g +s%@FLAGS_FOR_TARGET@%$FLAGS_FOR_TARGET%g +s%@RAW_CXX_FOR_TARGET@%$RAW_CXX_FOR_TARGET%g +s%@COMPILER_AS_FOR_TARGET@%$COMPILER_AS_FOR_TARGET%g +s%@COMPILER_LD_FOR_TARGET@%$COMPILER_LD_FOR_TARGET%g +s%@COMPILER_NM_FOR_TARGET@%$COMPILER_NM_FOR_TARGET%g +s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%g +s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g +s%@MAINT@%$MAINT%g +s%@stage1_cflags@%$stage1_cflags%g +s%@stage1_checking@%$stage1_checking%g +s%@stage2_werror_flag@%$stage2_werror_flag%g +s%@datarootdir@%$datarootdir%g +s%@docdir@%$docdir%g +s%@htmldir@%$htmldir%g - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 82; then - break - elif $ac_last_try; then - { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } - else - ac_delim="$ac_delim!$ac_delim _$ac_delim!! " - fi -done +CEOF +EOF -ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` -if test -n "$ac_eof"; then - ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` - ac_eof=`expr $ac_eof + 1` -fi - -cat >>$CONFIG_STATUS <<_ACEOF -cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b -/^[ ]*@serialization_dependencies@[ ]*$/{ -r $serialization_dependencies -d -} -/^[ ]*@host_makefile_frag@[ ]*$/{ -r $host_makefile_frag -d -} -/^[ ]*@target_makefile_frag@[ ]*$/{ -r $target_makefile_frag -d -} -/^[ ]*@alphaieee_frag@[ ]*$/{ -r $alphaieee_frag -d -} -/^[ ]*@ospace_frag@[ ]*$/{ -r $ospace_frag -d -} -_ACEOF -sed ' -s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g -s/^/s,@/; s/!/@,|#_!!_#|/ -:n -t n -s/'"$ac_delim"'$/,g/; t -s/$/\\/; p -N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n -' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF -CEOF$ac_eof -_ACEOF - - -ac_delim='%!_!# ' -for ac_last_try in false false false false false :; do - cat >conf$$subs.sed <<_ACEOF -target_configargs!$target_configargs$ac_delim -CC_FOR_BUILD!$CC_FOR_BUILD$ac_delim -config_shell!$config_shell$ac_delim -YACC!$YACC$ac_delim -BISON!$BISON$ac_delim -M4!$M4$ac_delim -LEX!$LEX$ac_delim -FLEX!$FLEX$ac_delim -MAKEINFO!$MAKEINFO$ac_delim -EXPECT!$EXPECT$ac_delim -RUNTEST!$RUNTEST$ac_delim -AR!$AR$ac_delim -AS!$AS$ac_delim -DLLTOOL!$DLLTOOL$ac_delim -LD!$LD$ac_delim -LIPO!$LIPO$ac_delim -NM!$NM$ac_delim -RANLIB!$RANLIB$ac_delim -STRIP!$STRIP$ac_delim -WINDRES!$WINDRES$ac_delim -OBJCOPY!$OBJCOPY$ac_delim -OBJDUMP!$OBJDUMP$ac_delim -CXX!$CXX$ac_delim -CFLAGS_FOR_BUILD!$CFLAGS_FOR_BUILD$ac_delim -CXXFLAGS!$CXXFLAGS$ac_delim -CC_FOR_TARGET!$CC_FOR_TARGET$ac_delim -CXX_FOR_TARGET!$CXX_FOR_TARGET$ac_delim -GCC_FOR_TARGET!$GCC_FOR_TARGET$ac_delim -GCJ_FOR_TARGET!$GCJ_FOR_TARGET$ac_delim -GFORTRAN_FOR_TARGET!$GFORTRAN_FOR_TARGET$ac_delim -AR_FOR_TARGET!$AR_FOR_TARGET$ac_delim -AS_FOR_TARGET!$AS_FOR_TARGET$ac_delim -DLLTOOL_FOR_TARGET!$DLLTOOL_FOR_TARGET$ac_delim -LD_FOR_TARGET!$LD_FOR_TARGET$ac_delim -LIPO_FOR_TARGET!$LIPO_FOR_TARGET$ac_delim -NM_FOR_TARGET!$NM_FOR_TARGET$ac_delim -OBJDUMP_FOR_TARGET!$OBJDUMP_FOR_TARGET$ac_delim -RANLIB_FOR_TARGET!$RANLIB_FOR_TARGET$ac_delim -STRIP_FOR_TARGET!$STRIP_FOR_TARGET$ac_delim -WINDRES_FOR_TARGET!$WINDRES_FOR_TARGET$ac_delim -FLAGS_FOR_TARGET!$FLAGS_FOR_TARGET$ac_delim -RAW_CXX_FOR_TARGET!$RAW_CXX_FOR_TARGET$ac_delim -COMPILER_AS_FOR_TARGET!$COMPILER_AS_FOR_TARGET$ac_delim -COMPILER_LD_FOR_TARGET!$COMPILER_LD_FOR_TARGET$ac_delim -COMPILER_NM_FOR_TARGET!$COMPILER_NM_FOR_TARGET$ac_delim -MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim -MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim -MAINT!$MAINT$ac_delim -stage1_cflags!$stage1_cflags$ac_delim -stage1_checking!$stage1_checking$ac_delim -stage2_werror_flag!$stage2_werror_flag$ac_delim -LIBOBJS!$LIBOBJS$ac_delim -LTLIBOBJS!$LTLIBOBJS$ac_delim -_ACEOF +cat >> $CONFIG_STATUS <<\EOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 53; then - break - elif $ac_last_try; then - { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } +# 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_cmds=90 # Maximum number of lines to put in a sed script. +ac_file=1 # Number of current file. +ac_beg=1 # First line for current file. +ac_end=$ac_max_sed_cmds # 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" conftest.subs > conftest.s$ac_file + else + sed "${ac_end}q" conftest.subs > conftest.s$ac_file + fi + if test ! -s conftest.s$ac_file; then + ac_more_lines=false + rm -f conftest.s$ac_file else - ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + if test -z "$ac_sed_cmds"; then + ac_sed_cmds="sed -f conftest.s$ac_file" + else + ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file" + fi + ac_file=`expr $ac_file + 1` + ac_beg=$ac_end + ac_end=`expr $ac_end + $ac_max_sed_cmds` fi done - -ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` -if test -n "$ac_eof"; then - ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` - ac_eof=`expr $ac_eof + 1` -fi - -cat >>$CONFIG_STATUS <<_ACEOF -cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end -_ACEOF -sed ' -s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g -s/^/s,@/; s/!/@,|#_!!_#|/ -:n -t n -s/'"$ac_delim"'$/,g/; t -s/$/\\/; p -N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n -' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF -:end -s/|#_!!_#|//g -CEOF$ac_eof -_ACEOF - - -# 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/^[^=]*=[ ]*$// -}' +if test -z "$ac_sed_cmds"; then + ac_sed_cmds=cat fi +EOF -cat >>$CONFIG_STATUS <<\_ACEOF -fi # test -n "$CONFIG_FILES" - - -for ac_tag in :F $CONFIG_FILES -do - case $ac_tag in - :[FHLC]) ac_mode=$ac_tag; continue;; - esac - case $ac_mode$ac_tag in - :[FHL]*:*);; - :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5 -echo "$as_me: error: Invalid tag $ac_tag." >&2;} - { (exit 1); exit 1; }; };; - :[FH]-) ac_tag=-:-;; - :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; - esac - ac_save_IFS=$IFS - IFS=: - set x $ac_tag - IFS=$ac_save_IFS - shift - ac_file=$1 - shift - - case $ac_mode in - :L) ac_source=$1;; - :[FH]) - ac_file_inputs= - for ac_f - do - case $ac_f in - -) ac_f="$tmp/stdin";; - *) # Look for the file first in the build tree, then in the source tree - # (if the path is not absolute). The absolute path cannot be DOS-style, - # because $ac_f cannot contain `:'. - test -f "$ac_f" || - case $ac_f in - [\\/$]*) false;; - *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; - esac || - { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 -echo "$as_me: error: cannot find input file: $ac_f" >&2;} - { (exit 1); exit 1; }; };; - esac - ac_file_inputs="$ac_file_inputs $ac_f" - done - - # 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. */ - configure_input="Generated from "`IFS=: - echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure." - if test x"$ac_file" != x-; then - configure_input="$ac_file. $configure_input" - { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} - fi - - case $ac_tag in - *:-:* | *:-) cat >"$tmp/stdin";; - esac - ;; - esac - - ac_dir=`$as_dirname -- "$ac_file" || -$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'` - { as_dir="$ac_dir" - case $as_dir in #( - -*) as_dir=./$as_dir;; - esac - test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { - as_dirs= - while :; do - case $as_dir in #( - *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" - as_dir=`$as_dirname -- "$as_dir" || -$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'` - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -echo "$as_me: error: cannot create directory $as_dir" >&2;} - { (exit 1); exit 1; }; }; } - ac_builddir=. - -case "$ac_dir" in -.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -*) - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` - case $ac_top_builddir_sub in - "") ac_top_builddir_sub=. ac_top_build_prefix= ;; - *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; - esac ;; -esac -ac_abs_top_builddir=$ac_pwd -ac_abs_builddir=$ac_pwd$ac_dir_suffix -# for backward compatibility: -ac_top_builddir=$ac_top_build_prefix - -case $srcdir in - .) # We are building in place. - ac_srcdir=. - ac_top_srcdir=$ac_top_builddir_sub - ac_abs_top_srcdir=$ac_pwd ;; - [\\/]* | ?:[\\/]* ) # Absolute name. - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir - ac_abs_top_srcdir=$srcdir ;; - *) # Relative name. - ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_build_prefix$srcdir - ac_abs_top_srcdir=$ac_pwd/$srcdir ;; -esac -ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - - - case $ac_mode in - :F) - # - # CONFIG_FILE - # - - case $INSTALL in - [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; - *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; - esac -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF -# If the template does not know about datarootdir, expand it. -# FIXME: This hack should be removed a few years after 2.60. -ac_datarootdir_hack=; ac_datarootdir_seen= - -case `sed -n '/datarootdir/ { - p - q -} -/@datadir@/p -/@docdir@/p -/@infodir@/p -/@localedir@/p -/@mandir@/p -' $ac_file_inputs` in -*datarootdir*) ac_datarootdir_seen=yes;; -*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) - { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF - ac_datarootdir_hack=' - s&@datadir@&$datadir&g - s&@docdir@&$docdir&g - s&@infodir@&$infodir&g - s&@localedir@&$localedir&g - s&@mandir@&$mandir&g - s&\\\${datarootdir}&$datarootdir&g' ;; -esac -_ACEOF - -# Neutralize VPATH when `$srcdir' = `.'. -# Shell code in configure.ac might set extrasub. -# FIXME: do we really want to maintain this feature? -cat >>$CONFIG_STATUS <<_ACEOF - sed "$ac_vpsub -$extrasub -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF -:t -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b -s&@configure_input@&$configure_input&;t t -s&@top_builddir@&$ac_top_builddir_sub&;t t -s&@srcdir@&$ac_srcdir&;t t -s&@abs_srcdir@&$ac_abs_srcdir&;t t -s&@top_srcdir@&$ac_top_srcdir&;t t -s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t -s&@builddir@&$ac_builddir&;t t -s&@abs_builddir@&$ac_abs_builddir&;t t -s&@abs_top_builddir@&$ac_abs_top_builddir&;t t -s&@INSTALL@&$ac_INSTALL&;t t -$ac_datarootdir_hack -" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out - -test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && - { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && - { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&5 -echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&2;} - - rm -f "$tmp/stdin" - case $ac_file in - -) cat "$tmp/out"; rm -f "$tmp/out";; - *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;; - esac - ;; - - +cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF +for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then + # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". + case "$ac_file" in + *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` + ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; + *) ac_file_in="${ac_file}.in" ;; + esac + + # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories. + + # Remove last slash and all that follows it. Not all systems have dirname. + ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` + if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then + # The file is in a subdirectory. + test ! -d "$ac_dir" && mkdir "$ac_dir" + ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`" + # A "../" for each directory in $ac_dir_suffix. + ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'` + else + ac_dir_suffix= ac_dots= + fi + + case "$ac_given_srcdir" in + .) srcdir=. + if test -z "$ac_dots"; then top_srcdir=. + else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;; + /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; + *) # Relative path. + srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix" + top_srcdir="$ac_dots$ac_given_srcdir" ;; + esac + + case "$ac_given_INSTALL" in + [/$]*) INSTALL="$ac_given_INSTALL" ;; + *) INSTALL="$ac_dots$ac_given_INSTALL" ;; + esac + + echo creating "$ac_file" + rm -f "$ac_file" + configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure." + case "$ac_file" in + *Makefile*) ac_comsub="1i\\ +# $configure_input" ;; + *) ac_comsub= ;; + esac + + ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` + sed -e "$ac_comsub +s%@configure_input@%$configure_input%g +s%@srcdir@%$srcdir%g +s%@top_srcdir@%$top_srcdir%g +s%@INSTALL@%$INSTALL%g +" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file +fi; done +rm -f conftest.s* -done # for ac_tag +EOF +cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF -{ (exit 0); exit 0; } -_ACEOF +exit 0 +EOF 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 +rm -fr confdefs* $ac_clean_files +test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 From dalej at apple.com Sun Oct 26 21:10:22 2008 From: dalej at apple.com (Dale Johannesen) Date: Mon, 27 Oct 2008 02:10:22 -0000 Subject: [llvm-commits] [llvm] r58225 - /llvm/trunk/lib/CodeGen/BranchFolding.cpp Message-ID: <200810270210.m9R2ANT4030183@zion.cs.uiuc.edu> Author: johannes Date: Sun Oct 26 21:10:21 2008 New Revision: 58225 URL: http://llvm.org/viewvc/llvm-project?rev=58225&view=rev Log: Increase default setting of tail-merge-threshold to 150, based on llvm-test measurements. Modified: llvm/trunk/lib/CodeGen/BranchFolding.cpp Modified: llvm/trunk/lib/CodeGen/BranchFolding.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/BranchFolding.cpp?rev=58225&r1=58224&r2=58225&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/BranchFolding.cpp (original) +++ llvm/trunk/lib/CodeGen/BranchFolding.cpp Sun Oct 26 21:10:21 2008 @@ -42,7 +42,7 @@ static cl::opt TailMergeThreshold("tail-merge-threshold", cl::desc("Max number of predecessors to consider tail merging"), - cl::init(100), cl::Hidden); + cl::init(150), cl::Hidden); namespace { struct VISIBILITY_HIDDEN BranchFolder : public MachineFunctionPass { From evan.cheng at apple.com Sun Oct 26 23:12:47 2008 From: evan.cheng at apple.com (Evan Cheng) Date: Sun, 26 Oct 2008 21:12:47 -0700 Subject: [llvm-commits] [llvm] r58225 - /llvm/trunk/lib/CodeGen/BranchFolding.cpp In-Reply-To: <200810270210.m9R2ANT4030183@zion.cs.uiuc.edu> References: <200810270210.m9R2ANT4030183@zion.cs.uiuc.edu> Message-ID: <19743F95-2168-4FD4-B261-1E4F8A42553C@apple.com> Which tests? Was there a PR for this? Thanks, Evan On Oct 26, 2008, at 7:10 PM, Dale Johannesen wrote: > Author: johannes > Date: Sun Oct 26 21:10:21 2008 > New Revision: 58225 > > URL: http://llvm.org/viewvc/llvm-project?rev=58225&view=rev > Log: > Increase default setting of tail-merge-threshold to > 150, based on llvm-test measurements. > > > Modified: > llvm/trunk/lib/CodeGen/BranchFolding.cpp > > Modified: llvm/trunk/lib/CodeGen/BranchFolding.cpp > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/BranchFolding.cpp?rev=58225&r1=58224&r2=58225&view=diff > > = > = > = > = > = > = > = > = > ====================================================================== > --- llvm/trunk/lib/CodeGen/BranchFolding.cpp (original) > +++ llvm/trunk/lib/CodeGen/BranchFolding.cpp Sun Oct 26 21:10:21 2008 > @@ -42,7 +42,7 @@ > static cl::opt > TailMergeThreshold("tail-merge-threshold", > cl::desc("Max number of predecessors to consider tail > merging"), > - cl::init(100), cl::Hidden); > + cl::init(150), cl::Hidden); > > namespace { > struct VISIBILITY_HIDDEN BranchFolder : public MachineFunctionPass { > > > _______________________________________________ > llvm-commits mailing list > llvm-commits at cs.uiuc.edu > http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits From sabre at nondot.org Sun Oct 26 23:39:24 2008 From: sabre at nondot.org (Chris Lattner) Date: Mon, 27 Oct 2008 04:39:24 -0000 Subject: [llvm-commits] [llvm] r58226 - /llvm/trunk/docs/ReleaseNotes.html Message-ID: <200810270439.m9R4dOr0018988@zion.cs.uiuc.edu> Author: lattner Date: Sun Oct 26 23:39:23 2008 New Revision: 58226 URL: http://llvm.org/viewvc/llvm-project?rev=58226&view=rev Log: mention getresult -> extractvalue (PR2935) Modified: llvm/trunk/docs/ReleaseNotes.html Modified: llvm/trunk/docs/ReleaseNotes.html URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/ReleaseNotes.html?rev=58226&r1=58225&r2=58226&view=diff ============================================================================== --- llvm/trunk/docs/ReleaseNotes.html (original) +++ llvm/trunk/docs/ReleaseNotes.html Sun Oct 26 23:39:23 2008 @@ -545,6 +545,10 @@
  • Various header files like "llvm/ADT/iterator" were given a ".h" suffix. Change your code to #include "llvm/ADT/iterator.h" instead.
    • +
  • The getresult instruction has been removed and replaced with the + extractvalue instruction. This is part of support for first class + aggregates.
    • +
  • In the code generator, many MachineOperand predicates were renamed to be shorter (e.g. isFrameIndex() -> isFI()), SDOperand was renamed to SDValue (and the "Val"