From isanbard at gmail.com Mon Jan 19 01:50:53 2009 From: isanbard at gmail.com (Bill Wendling) Date: Mon, 19 Jan 2009 07:50:53 -0000 Subject: [llvm-commits] [llvm-gcc-4.2] r62500 - in /llvm-gcc-4.2/trunk/gcc: c-common.c config/darwin.h Message-ID: <200901190750.n0J7ori8030847@zion.cs.uiuc.edu> Author: void Date: Mon Jan 19 01:50:53 2009 New Revision: 62500 URL: http://llvm.org/viewvc/llvm-project?rev=62500&view=rev Log: Enable warn-format by default for Darwin only. Modified: llvm-gcc-4.2/trunk/gcc/c-common.c llvm-gcc-4.2/trunk/gcc/config/darwin.h Modified: llvm-gcc-4.2/trunk/gcc/c-common.c URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/c-common.c?rev=62500&r1=62499&r2=62500&view=diff ============================================================================== --- llvm-gcc-4.2/trunk/gcc/c-common.c (original) +++ llvm-gcc-4.2/trunk/gcc/c-common.c Mon Jan 19 01:50:53 2009 @@ -298,7 +298,12 @@ (*printf, *scanf, strftime, strfmon, etc.). */ /* APPLE LOCAL default to Wformat-security 5764921 */ -int warn_format = 1; +/* LLVM LOCAL begin initialize via config/darwin.h */ +#ifndef WARN_FORMAT_INIT +#define WARN_FORMAT_INIT 0 +#endif +int warn_format = WARN_FORMAT_INIT; +/* LLVM LOCAL end initialize via config/darwin.h */ /* Warn about using __null (as NULL in C++) as sentinel. For code compiled with GCC this doesn't matter as __null is guaranteed to have the right Modified: llvm-gcc-4.2/trunk/gcc/config/darwin.h URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config/darwin.h?rev=62500&r1=62499&r2=62500&view=diff ============================================================================== --- llvm-gcc-4.2/trunk/gcc/config/darwin.h (original) +++ llvm-gcc-4.2/trunk/gcc/config/darwin.h Mon Jan 19 01:50:53 2009 @@ -1599,4 +1599,13 @@ #define LLVM_OVERRIDE_TARGET_VERSION(T,N) \ darwin_llvm_override_target_version(T,N) /* APPLE LOCAL end radar 6230142 */ + +/* LLVM LOCAL begin */ +#ifdef WARN_FORMAT_INIT +#undef WARN_FORMAT_INIT +#endif + +#define WARN_FORMAT_INIT 1 +/* LLVM LOCAL end */ + #endif /* CONFIG_DARWIN_H */ From evan.cheng at apple.com Mon Jan 19 02:08:23 2009 From: evan.cheng at apple.com (Evan Cheng) Date: Mon, 19 Jan 2009 08:08:23 -0000 Subject: [llvm-commits] [llvm] r62504 - in /llvm/trunk: lib/Target/X86/X86ISelLowering.cpp test/CodeGen/X86/uint_to_fp.ll Message-ID: <200901190808.n0J88NOk031532@zion.cs.uiuc.edu> Author: evancheng Date: Mon Jan 19 02:08:22 2009 New Revision: 62504 URL: http://llvm.org/viewvc/llvm-project?rev=62504&view=rev Log: Now not UINT_TO_FP is legal (it's marked custom), dag combiner won't optimize it to a SINT_TO_FP when the sign bit is known zero. X86 isel should perform the optimization itself. Modified: llvm/trunk/lib/Target/X86/X86ISelLowering.cpp llvm/trunk/test/CodeGen/X86/uint_to_fp.ll Modified: llvm/trunk/lib/Target/X86/X86ISelLowering.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86ISelLowering.cpp?rev=62504&r1=62503&r2=62504&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/X86ISelLowering.cpp (original) +++ llvm/trunk/lib/Target/X86/X86ISelLowering.cpp Mon Jan 19 02:08:22 2009 @@ -4884,8 +4884,15 @@ } SDValue X86TargetLowering::LowerUINT_TO_FP(SDValue Op, SelectionDAG &DAG) { - MVT SrcVT = Op.getOperand(0).getValueType(); + SDValue N0 = Op.getOperand(0); + // Now not UINT_TO_FP is legal (it's marked custom), dag combiner won't + // optimize it to a SINT_TO_FP when the sign bit is known zero. Perform + // the optimization here. + if (DAG.SignBitIsZero(N0)) + return DAG.getNode(ISD::SINT_TO_FP, Op.getValueType(), N0); + + MVT SrcVT = N0.getValueType(); if (SrcVT == MVT::i64) { // We only handle SSE2 f64 target here; caller can handle the rest. if (Op.getValueType() != MVT::f64 || !X86ScalarSSEf64) Modified: llvm/trunk/test/CodeGen/X86/uint_to_fp.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/uint_to_fp.ll?rev=62504&r1=62503&r2=62504&view=diff ============================================================================== --- llvm/trunk/test/CodeGen/X86/uint_to_fp.ll (original) +++ llvm/trunk/test/CodeGen/X86/uint_to_fp.ll Mon Jan 19 02:08:22 2009 @@ -1,4 +1,5 @@ ; RUN: llvm-as < %s | llc -march=x86 -mcpu=yonah | not grep {sub.*esp} +; RUN: llvm-as < %s | llc -march=x86 -mcpu=yonah | grep cvtsi2ss ; rdar://6034396 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:128:128" From evan.cheng at apple.com Mon Jan 19 02:19:57 2009 From: evan.cheng at apple.com (Evan Cheng) Date: Mon, 19 Jan 2009 08:19:57 -0000 Subject: [llvm-commits] [llvm] r62505 - /llvm/trunk/lib/Target/X86/X86ISelLowering.cpp Message-ID: <200901190819.n0J8Jv8o031972@zion.cs.uiuc.edu> Author: evancheng Date: Mon Jan 19 02:19:57 2009 New Revision: 62505 URL: http://llvm.org/viewvc/llvm-project?rev=62505&view=rev Log: Minor tweak to LowerUINT_TO_FP_i32. Bias (after scalar_to_vector) has two uses so we should make it the second source operand of ISD::OR so 2-address pass won't have to be smart about commuting. %reg1024 = MOVSDrm %reg0, 1, %reg0, , Mem:LD(8,8) [ConstantPool + 0] %reg1025 = MOVSD2PDrr %reg1024 %reg1026 = MOVDI2PDIrm , 1, %reg0, 0, Mem:LD(4,16) [FixedStack-1 + 0] %reg1027 = ORPSrr %reg1025, %reg1026 %reg1028 = MOVPD2SDrr %reg1027 %reg1029 = SUBSDrr %reg1028, %reg1024 %reg1030 = CVTSD2SSrr %reg1029 MOVSSmr , 1, %reg0, 0, %reg1030, Mem:ST(4,4) [FixedStack0 + 0] %reg1031 = LD_Fp32m80 , 1, %reg0, 0, Mem:LD(4,16) [FixedStack0 + 0] RET %reg1031, %ST0 The reason 2-addr pass isn't smart enough to commute the ORPSrr is because it can't look pass the MOVSD2PDrr instruction. 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=62505&r1=62504&r2=62505&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/X86ISelLowering.cpp (original) +++ llvm/trunk/lib/Target/X86/X86ISelLowering.cpp Mon Jan 19 02:19:57 2009 @@ -4858,10 +4858,10 @@ SDValue Or = DAG.getNode(ISD::OR, MVT::v2i64, DAG.getNode(ISD::BIT_CONVERT, MVT::v2i64, DAG.getNode(ISD::SCALAR_TO_VECTOR, - MVT::v2f64, Bias)), + MVT::v2f64, Load)), DAG.getNode(ISD::BIT_CONVERT, MVT::v2i64, DAG.getNode(ISD::SCALAR_TO_VECTOR, - MVT::v2f64, Load))); + MVT::v2f64, Bias))); Or = DAG.getNode(ISD::EXTRACT_VECTOR_ELT, MVT::f64, DAG.getNode(ISD::BIT_CONVERT, MVT::v2f64, Or), DAG.getIntPtrConstant(0)); From baldrick at free.fr Mon Jan 19 02:35:45 2009 From: baldrick at free.fr (Duncan Sands) Date: Mon, 19 Jan 2009 09:35:45 +0100 Subject: [llvm-commits] [llvm-gcc-4.2] r62478 - in /llvm-gcc-4.2/trunk/gcc: c-common.c c-common.h c-parser.c c.opt config/i386/darwin.h config/rs6000/darwin.h In-Reply-To: <200901190222.n0J2MecU018990@zion.cs.uiuc.edu> References: <200901190222.n0J2MecU018990@zion.cs.uiuc.edu> Message-ID: <200901190935.46121.baldrick@free.fr> Hi Bill, > Don't enable the -Wformat flag for everything. Only for C and friends. did you really mean to commit all the other changes too? Ciao, Duncan. From isanbard at gmail.com Mon Jan 19 02:46:21 2009 From: isanbard at gmail.com (Bill Wendling) Date: Mon, 19 Jan 2009 08:46:21 -0000 Subject: [llvm-commits] [llvm] r62506 - in /llvm/trunk: lib/Transforms/Utils/SimplifyCFG.cpp test/Transforms/SimplifyCFG/2009-01-18-PHIPropCrash.ll Message-ID: <200901190846.n0J8kLt2004374@zion.cs.uiuc.edu> Author: void Date: Mon Jan 19 02:46:20 2009 New Revision: 62506 URL: http://llvm.org/viewvc/llvm-project?rev=62506&view=rev Log: Temporarily revert r62487. It's causing this error during a release bootstrap of llvm-gcc. Most likely, it's miscompiling one of the "gen*" programs: /Volumes/Sandbox/Buildbot/llvm/full-llvm/build/llvm-gcc.obj/./prev-gcc/xgcc -B/Volumes/Sandbox/Buildbot/llvm/full-llvm/build/llvm-gcc.obj/./prev-gcc/ -B/Volumes/Sandbox/Buildbot/llvm/full-llvm/build/llvm-gcc.install/i386-apple-darwin9.6.0/bin/ -c -g -O2 -mdynamic-no-pic -DIN_GCC -W -Wall -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -mdynamic-no-pic -DHAVE_CONFIG_H -DGENERATOR_FILE -I. -Ibuild -I../../llvm-gcc.src/gcc -I../../llvm-gcc.src/gcc/build -I../../llvm-gcc.src/gcc/../include -I./../intl -I../../llvm-gcc.src/gcc/../libcpp/include -I../../llvm-gcc.src/gcc/../libdecnumber -I../libdecnumber -I/Volumes/Sandbox/Buildbot/llvm/full-llvm/build/llvm.obj/include -I/Volumes/Sandbox/Buildbot/llvm/full-llvm/build/llvm.src/include -DENABLE_LLVM -I/Volumes/Sandbox/Buildbot/llvm/full-llvm/build/llvm.obj/../llvm.src/include -D_DEBUG -D_GNU_SOURCE -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS -o build/gencondmd.o build/gencondmd.c ./../llvm-gcc.src/gcc/config/i386/mmx.md:926: error: expected '}' before ')' token ./../llvm-gcc.src/gcc/config/i386/mmx.md:926: warning: excess elements in struct initializer ./../llvm-gcc.src/gcc/config/i386/mmx.md:926: warning: (near initialization for 'insn_conditions[4]') ./../llvm-gcc.src/gcc/config/i386/mmx.md:926: error: expected '}' before ')' token ./../llvm-gcc.src/gcc/config/i386/mmx.md:926: error: expected ',' or ';' before ')' token ./../llvm-gcc.src/gcc/config/i386/mmx.md:927: error: expected identifier or '(' before ',' token ./../llvm-gcc.src/gcc/config/i386/sse.md:3458: error: expected identifier or '(' before ',' token .. Modified: llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp llvm/trunk/test/Transforms/SimplifyCFG/2009-01-18-PHIPropCrash.ll Modified: llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp?rev=62506&r1=62505&r2=62506&view=diff ============================================================================== --- llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp (original) +++ llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp Mon Jan 19 02:46:20 2009 @@ -21,7 +21,6 @@ #include "llvm/Support/Debug.h" #include "llvm/Analysis/ConstantFolding.h" #include "llvm/Transforms/Utils/BasicBlockUtils.h" -#include "llvm/ADT/DenseMap.h" #include "llvm/ADT/SmallVector.h" #include "llvm/ADT/SmallPtrSet.h" #include "llvm/ADT/Statistic.h" @@ -173,74 +172,6 @@ return true; } -/// BlockIsReachableFrom - Return true if there is a path from StartBB to -/// DestBB. We do this by recursively walking the CFG from DestBB up to StartBB -/// unwind we either reach StartBB or find an unreachable chunk of the CFG. -/// -/// Each entry in VisitedBlocks is either 0 -> not visited, 1 -> known reachable -/// 2 -> known unreachable, 3 -> visitation in progress. -static bool BlockIsReachableFrom(BasicBlock *StartBB, BasicBlock *DestBB, - DenseMap &VisitedBlocks) { - if (StartBB == DestBB) return true; - - unsigned &BlockEntry = VisitedBlocks[DestBB]; - if (BlockEntry == 1) return true; // Known reachable! - if (BlockEntry == 2 || // Known unreachable. - BlockEntry == 3) // Found a loop. - return false; - - // If BlockEntry is 0, this is the first time we've seen this block. Mark it - // as being visited and recurse up predecessors. - BlockEntry = 3; - - for (pred_iterator PI = pred_begin(DestBB), E = pred_end(DestBB); PI != E; - ++PI) { - if (BlockIsReachableFrom(StartBB, *PI, VisitedBlocks)) { - VisitedBlocks[DestBB] = 1; - return true; - } - } - - // If we scanned all of our predecessors and we couldn't find a path to - // StartBB, then this block must be unreachable for sure. Record this to - // prevent visitation of this block in the future. - VisitedBlocks[DestBB] = 2; - return false; -} - -/// RemoveUnreachableUsersOf - For each user of Inst, scan up the CFG until we -/// find Inst. If Inst is found, then the user is live, otherwise it is dead. -/// Remove dead users. This is basically a poor-man's dominance query, and is -/// worst-case linear time in the number of blocks in the function. -static void RemoveUnreachableUsersOf(Instruction *Inst) { - DenseMap VisitedBlocks; - - BasicBlock *InstBB = Inst->getParent(); - for (Instruction::use_iterator UI = Inst->use_begin(), E = Inst->use_end(); - UI != E;) { - Instruction *User = cast(*UI); - Use &TheUse = UI.getUse(); - - if (PHINode *PN = dyn_cast(User)) { - unsigned UseOp = UI.getOperandNo(); - ++UI; - - if (BlockIsReachableFrom(InstBB, PN->getIncomingBlock(UseOp/2), - VisitedBlocks)) - continue; - } else { - ++UI; - if (BlockIsReachableFrom(InstBB, User->getParent(), - VisitedBlocks)) - continue; - } - // If there is no path from Inst to this User, then this user is in dead - // code. Just replace uses of Inst with undef. - TheUse = UndefValue::get(Inst->getType()); - } -} - - /// TryToSimplifyUncondBranchFromEmptyBlock - BB contains an unconditional /// branch to Succ, and contains no instructions other than PHI nodes and the /// branch. If possible, eliminate BB. @@ -285,18 +216,12 @@ } if (isa(&BB->front())) { - SmallVector OldSuccPreds(pred_begin(Succ), - pred_end(Succ)); + SmallVector + OldSuccPreds(pred_begin(Succ), pred_end(Succ)); // Move all PHI nodes in BB to Succ if they are alive, otherwise // delete them. while (PHINode *PN = dyn_cast(&BB->front())) { - // The algorithm below will not work if there are users of PN that are in - // unreachable blocks. These users will not be properly dominated by the - // instruction, but the IR is valid because dead code does not need to - // obey dominance properties. - RemoveUnreachableUsersOf(PN); - if (PN->use_empty()) { // Just remove the dead phi. This happens if Succ's PHIs were the only // users of the PHI nodes. Modified: llvm/trunk/test/Transforms/SimplifyCFG/2009-01-18-PHIPropCrash.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/SimplifyCFG/2009-01-18-PHIPropCrash.ll?rev=62506&r1=62505&r2=62506&view=diff ============================================================================== --- llvm/trunk/test/Transforms/SimplifyCFG/2009-01-18-PHIPropCrash.ll (original) +++ llvm/trunk/test/Transforms/SimplifyCFG/2009-01-18-PHIPropCrash.ll Mon Jan 19 02:46:20 2009 @@ -1,4 +1,5 @@ ; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis +; XFAIL: * ; PR3016 ; Dead use caused invariant violation. From isanbard at gmail.com Mon Jan 19 02:51:29 2009 From: isanbard at gmail.com (Bill Wendling) Date: Mon, 19 Jan 2009 00:51:29 -0800 Subject: [llvm-commits] [llvm] r62487 - in /llvm/trunk: lib/Transforms/Utils/SimplifyCFG.cpp test/Transforms/SimplifyCFG/2009-01-18-PHIPropCrash.ll In-Reply-To: <200901190246.n0J2kSTF019949@zion.cs.uiuc.edu> References: <200901190246.n0J2kSTF019949@zion.cs.uiuc.edu> Message-ID: <94ACDEC4-D169-44C9-BC69-C8E6F30F43EE@gmail.com> Chris, This is causing a bootstrap failure in Release mode. Attached is the .i file that is generated. I temporarily reverted this patch. -------------- next part -------------- A non-text attachment was scrubbed... Name: testcase.i Type: application/octet-stream Size: 737589 bytes Desc: not available Url : http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20090119/589f5827/attachment.obj -------------- next part -------------- -bw On Jan 18, 2009, at 6:46 PM, Chris Lattner wrote: > Author: lattner > Date: Sun Jan 18 20:46:28 2009 > New Revision: 62487 > > URL: http://llvm.org/viewvc/llvm-project?rev=62487&view=rev > Log: > Fix PR3016, a bug which can occur do to an invalid assumption: > we assumed a CFG structure that would be valid when all code in > the function is reachable, but not all code is necessarily > reachable. Do a simple, but horrible, CFG walk to check for this > case. > > Added: > llvm/trunk/test/Transforms/SimplifyCFG/2009-01-18-PHIPropCrash.ll > Modified: > llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp > > Modified: llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp?rev=62487&r1=62486&r2=62487&view=diff > > = > = > = > = > = > = > = > = > ====================================================================== > --- llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp (original) > +++ llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp Sun Jan 18 > 20:46:28 2009 > @@ -21,6 +21,7 @@ > #include "llvm/Support/Debug.h" > #include "llvm/Analysis/ConstantFolding.h" > #include "llvm/Transforms/Utils/BasicBlockUtils.h" > +#include "llvm/ADT/DenseMap.h" > #include "llvm/ADT/SmallVector.h" > #include "llvm/ADT/SmallPtrSet.h" > #include "llvm/ADT/Statistic.h" > @@ -172,6 +173,74 @@ > return true; > } > > +/// BlockIsReachableFrom - Return true if there is a path from > StartBB to > +/// DestBB. We do this by recursively walking the CFG from DestBB > up to StartBB > +/// unwind we either reach StartBB or find an unreachable chunk of > the CFG. > +/// > +/// Each entry in VisitedBlocks is either 0 -> not visited, 1 -> > known reachable > +/// 2 -> known unreachable, 3 -> visitation in progress. > +static bool BlockIsReachableFrom(BasicBlock *StartBB, BasicBlock > *DestBB, > + DenseMap > &VisitedBlocks) { > + if (StartBB == DestBB) return true; > + > + unsigned &BlockEntry = VisitedBlocks[DestBB]; > + if (BlockEntry == 1) return true; // Known reachable! > + if (BlockEntry == 2 || // Known unreachable. > + BlockEntry == 3) // Found a loop. > + return false; > + > + // If BlockEntry is 0, this is the first time we've seen this > block. Mark it > + // as being visited and recurse up predecessors. > + BlockEntry = 3; > + > + for (pred_iterator PI = pred_begin(DestBB), E = pred_end(DestBB); > PI != E; > + ++PI) { > + if (BlockIsReachableFrom(StartBB, *PI, VisitedBlocks)) { > + VisitedBlocks[DestBB] = 1; > + return true; > + } > + } > + > + // If we scanned all of our predecessors and we couldn't find a > path to > + // StartBB, then this block must be unreachable for sure. Record > this to > + // prevent visitation of this block in the future. > + VisitedBlocks[DestBB] = 2; > + return false; > +} > + > +/// RemoveUnreachableUsersOf - For each user of Inst, scan up the > CFG until we > +/// find Inst. If Inst is found, then the user is live, otherwise > it is dead. > +/// Remove dead users. This is basically a poor-man's dominance > query, and is > +/// worst-case linear time in the number of blocks in the function. > +static void RemoveUnreachableUsersOf(Instruction *Inst) { > + DenseMap VisitedBlocks; > + > + BasicBlock *InstBB = Inst->getParent(); > + for (Instruction::use_iterator UI = Inst->use_begin(), E = Inst- > >use_end(); > + UI != E;) { > + Instruction *User = cast(*UI); > + Use &TheUse = UI.getUse(); > + > + if (PHINode *PN = dyn_cast(User)) { > + unsigned UseOp = UI.getOperandNo(); > + ++UI; > + > + if (BlockIsReachableFrom(InstBB, PN->getIncomingBlock(UseOp/2), > + VisitedBlocks)) > + continue; > + } else { > + ++UI; > + if (BlockIsReachableFrom(InstBB, User->getParent(), > + VisitedBlocks)) > + continue; > + } > + // If there is no path from Inst to this User, then this user > is in dead > + // code. Just replace uses of Inst with undef. > + TheUse = UndefValue::get(Inst->getType()); > + } > +} > + > + > /// TryToSimplifyUncondBranchFromEmptyBlock - BB contains an > unconditional > /// branch to Succ, and contains no instructions other than PHI > nodes and the > /// branch. If possible, eliminate BB. > @@ -216,12 +285,18 @@ > } > > if (isa(&BB->front())) { > - SmallVector > - OldSuccPreds(pred_begin(Succ), pred_end(Succ)); > + SmallVector OldSuccPreds(pred_begin(Succ), > + pred_end(Succ)); > > // Move all PHI nodes in BB to Succ if they are alive, otherwise > // delete them. > while (PHINode *PN = dyn_cast(&BB->front())) { > + // The algorithm below will not work if there are users of PN > that are in > + // unreachable blocks. These users will not be properly > dominated by the > + // instruction, but the IR is valid because dead code does > not need to > + // obey dominance properties. > + RemoveUnreachableUsersOf(PN); > + > if (PN->use_empty()) { > // Just remove the dead phi. This happens if Succ's PHIs > were the only > // users of the PHI nodes. > > Added: llvm/trunk/test/Transforms/SimplifyCFG/2009-01-18- > PHIPropCrash.ll > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/SimplifyCFG/2009-01-18-PHIPropCrash.ll?rev=62487&view=auto > > = > = > = > = > = > = > = > = > ====================================================================== > --- llvm/trunk/test/Transforms/SimplifyCFG/2009-01-18- > PHIPropCrash.ll (added) > +++ llvm/trunk/test/Transforms/SimplifyCFG/2009-01-18- > PHIPropCrash.ll Sun Jan 18 20:46:28 2009 > @@ -0,0 +1,30 @@ > +; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis > +; PR3016 > +; Dead use caused invariant violation. > + > +define i32 @func_105(i1 %tmp5, i1 %tmp7) nounwind { > +BB: > + br i1 true, label %BB2, label %BB1 > + > +BB1: ; preds = %BB > + br label %BB2 > + > +BB2: ; preds = %BB1, %BB > + %tmp3 = phi i1 [ true, %BB ], [ false, %BB1 ] ; [#uses=1] > + br label %BB9 > + > +BB9: ; preds = %BB11, %BB2 > + %tmp10 = phi i32 [ 0, %BB2 ], [ %tmp12, %BB11 ] ; [#uses=1] > + br i1 %tmp5, label %BB11, label %BB13 > + > +BB11: ; preds = %BB13, %BB9 > + %tmp12 = phi i32 [ 0, %BB13 ], [ %tmp10, %BB9 ] ; [#uses=2] > + br i1 %tmp3, label %BB9, label %BB20 > + > +BB13: ; preds = %BB13, %BB9 > + %tmp14 = phi i32 [ 0, %BB9 ], [ %tmp14, %BB13 ] ; [#uses=1] > + br i1 %tmp7, label %BB13, label %BB11 > + > +BB20: ; preds = %BB11 > + ret i32 %tmp12 > +} > > > _______________________________________________ > 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 Jan 19 05:04:59 2009 From: isanbard at gmail.com (Bill Wendling) Date: Mon, 19 Jan 2009 03:04:59 -0800 Subject: [llvm-commits] [llvm-gcc-4.2] r62478 - in /llvm-gcc-4.2/trunk/gcc: c-common.c c-common.h c-parser.c c.opt config/i386/darwin.h config/rs6000/darwin.h In-Reply-To: <200901190935.46121.baldrick@free.fr> References: <200901190222.n0J2MecU018990@zion.cs.uiuc.edu> <200901190935.46121.baldrick@free.fr> Message-ID: <7FCAEC81-BD8D-42A8-8B47-B165156CB5B7@gmail.com> I admit that it was a messy commit. In fact this one broke the build. I was trying to parse out which files had the format warning stuff in them, and for sure got extra baggage. Sorry for the sloppiness. Merged with mainline aren't me fort? as many of you know. -_- In good news, I hope that the stupid warn_format issue is now taken care of. -bw On Jan 19, 2009, at 12:35 AM, Duncan Sands wrote: > Hi Bill, > >> Don't enable the -Wformat flag for everything. Only for C and >> friends. > > did you really mean to commit all the other changes too? > > Ciao, > > Duncan. From isanbard at gmail.com Mon Jan 19 05:08:13 2009 From: isanbard at gmail.com (Bill Wendling) Date: Mon, 19 Jan 2009 03:08:13 -0800 Subject: [llvm-commits] [llvm] r62505 - /llvm/trunk/lib/Target/X86/X86ISelLowering.cpp In-Reply-To: <200901190819.n0J8Jv8o031972@zion.cs.uiuc.edu> References: <200901190819.n0J8Jv8o031972@zion.cs.uiuc.edu> Message-ID: <0222BA95-118C-46DE-814E-61948671F389@gmail.com> Gracias! -bw On Jan 19, 2009, at 12:19 AM, Evan Cheng wrote: > Author: evancheng > Date: Mon Jan 19 02:19:57 2009 > New Revision: 62505 > > URL: http://llvm.org/viewvc/llvm-project?rev=62505&view=rev > Log: > Minor tweak to LowerUINT_TO_FP_i32. Bias (after scalar_to_vector) > has two uses so we should make it the second source operand of > ISD::OR so 2-address pass won't have to be smart about commuting. > > %reg1024 = MOVSDrm %reg0, 1, %reg0, , Mem:LD(8,8) > [ConstantPool + 0] > %reg1025 = MOVSD2PDrr %reg1024 > %reg1026 = MOVDI2PDIrm , 1, %reg0, 0, Mem:LD(4,16) > [FixedStack-1 + 0] > %reg1027 = ORPSrr %reg1025, %reg1026 > %reg1028 = MOVPD2SDrr %reg1027 > %reg1029 = SUBSDrr %reg1028, %reg1024 > %reg1030 = CVTSD2SSrr %reg1029 > MOVSSmr , 1, %reg0, 0, %reg1030, Mem:ST(4,4) > [FixedStack0 + 0] > %reg1031 = LD_Fp32m80 , 1, %reg0, 0, Mem:LD(4,16) > [FixedStack0 + 0] > RET %reg1031, %ST0 > > The reason 2-addr pass isn't smart enough to commute the ORPSrr is > because it can't look pass the MOVSD2PDrr instruction. > > 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=62505&r1=62504&r2=62505&view=diff > > === > === > === > ===================================================================== > --- llvm/trunk/lib/Target/X86/X86ISelLowering.cpp (original) > +++ llvm/trunk/lib/Target/X86/X86ISelLowering.cpp Mon Jan 19 > 02:19:57 2009 > @@ -4858,10 +4858,10 @@ > SDValue Or = DAG.getNode(ISD::OR, MVT::v2i64, > DAG.getNode(ISD::BIT_CONVERT, MVT::v2i64, > > DAG.getNode(ISD::SCALAR_TO_VECTOR, > - MVT::v2f64, > Bias)), > + MVT::v2f64, > Load)), > DAG.getNode(ISD::BIT_CONVERT, MVT::v2i64, > > DAG.getNode(ISD::SCALAR_TO_VECTOR, > - MVT::v2f64, > Load))); > + MVT::v2f64, > Bias))); > Or = DAG.getNode(ISD::EXTRACT_VECTOR_ELT, MVT::f64, > DAG.getNode(ISD::BIT_CONVERT, MVT::v2f64, Or), > DAG.getIntPtrConstant(0)); > > > _______________________________________________ > llvm-commits mailing list > llvm-commits at cs.uiuc.edu > http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits From danchr at gmail.com Mon Jan 19 09:04:30 2009 From: danchr at gmail.com (Dan Villiom Podlaski Christiansen) Date: Mon, 19 Jan 2009 15:04:30 -0000 Subject: [llvm-commits] [llvm] r62511 - /llvm/trunk/CREDITS.TXT Message-ID: <200901191504.n0JF4UD6025370@zion.cs.uiuc.edu> Author: danchr Date: Mon Jan 19 09:04:29 2009 New Revision: 62511 URL: http://llvm.org/viewvc/llvm-project?rev=62511&view=rev Log: Adding your's truly to CREDITS.TXT (This is also a test commit.) Modified: llvm/trunk/CREDITS.TXT Modified: llvm/trunk/CREDITS.TXT URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/CREDITS.TXT?rev=62511&r1=62510&r2=62511&view=diff ============================================================================== --- llvm/trunk/CREDITS.TXT (original) +++ llvm/trunk/CREDITS.TXT Mon Jan 19 09:04:29 2009 @@ -61,6 +61,14 @@ D: Loop optimizer improvements D: Target-independent code generator improvements +N: Dan Villiom Podlaski Christiansen +E: danchr at gmail.com +E: danchr at cs.au.dk +W: http://villiom.dk +D: LLVM Makefile improvements +D: Clang diagnostic & driver tweaks +S: Aarhus, Denmark + N: Jeff Cohen E: jeffc at jolt-lang.org W: http://jolt-lang.org From baldrick at free.fr Mon Jan 19 11:28:33 2009 From: baldrick at free.fr (Duncan Sands) Date: Mon, 19 Jan 2009 18:28:33 +0100 Subject: [llvm-commits] llvm-gcc build broken Message-ID: <200901191828.34146.baldrick@free.fr> When building llvm-gcc on x86-32 linux at top of tree I get: gcc/xgcc -Bgcc/ -Bi686-pc-linux-gnu/bin/ -Bi686-pc-linux-gnu/lib/ -isystem i686-pc-linux-gnu/include -isystem i686-pc-linux-gnu/sys-include -c -DHAVE_CONFIG_H -O2 -g -O2 -I. -I../../../gcc-4.2.llvm/libiberty/../include -W-Wall -pedantic -Wwrite-strings -Wstrict-prototypes -Wc++-compat ../../../gcc-4.2.llvm/libiberty/cplus-dem.c -o cplus-dem.o ../../../gcc-4.2.llvm/libiberty/cplus-dem.c:55: warning: function declaration isn't a prototype ../../../gcc-4.2.llvm/libiberty/cplus-dem.c:55: error: conflicting types for 'malloc' ../../../gcc-4.2.llvm/libiberty/cplus-dem.c:56: warning: function declaration isn't a prototype ../../../gcc-4.2.llvm/libiberty/cplus-dem.c: In function 'code_for_qualifier': ../../../gcc-4.2.llvm/libiberty/cplus-dem.c:582: warning: implicit declaration of function 'abort' ../../../gcc-4.2.llvm/libiberty/cplus-dem.c:582: warning: incompatible implicit declaration of built-in function 'abort' ../../../gcc-4.2.llvm/libiberty/cplus-dem.c: In function 'qualifier_string': ../../../gcc-4.2.llvm/libiberty/cplus-dem.c:622: warning: incompatible implicit declaration of built-in function 'abort' ../../../gcc-4.2.llvm/libiberty/cplus-dem.c: In function 'squangle_mop_up': ../../../gcc-4.2.llvm/libiberty/cplus-dem.c:1082: warning: implicit declaration of function 'free' ../../../gcc-4.2.llvm/libiberty/cplus-dem.c: In function 'demangle_qualified': ../../../gcc-4.2.llvm/libiberty/cplus-dem.c:3177: warning: implicit declaration of function 'atoi' From nicholas at mxc.ca Mon Jan 19 11:42:34 2009 From: nicholas at mxc.ca (Nick Lewycky) Date: Mon, 19 Jan 2009 17:42:34 -0000 Subject: [llvm-commits] [llvm] r62512 - /llvm/trunk/lib/Support/APInt.cpp Message-ID: <200901191742.n0JHgZ8T031687@zion.cs.uiuc.edu> Author: nicholas Date: Mon Jan 19 11:42:33 2009 New Revision: 62512 URL: http://llvm.org/viewvc/llvm-project?rev=62512&view=rev Log: Fix typo, sentence fragment. Modified: llvm/trunk/lib/Support/APInt.cpp Modified: llvm/trunk/lib/Support/APInt.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/APInt.cpp?rev=62512&r1=62511&r2=62512&view=diff ============================================================================== --- llvm/trunk/lib/Support/APInt.cpp (original) +++ llvm/trunk/lib/Support/APInt.cpp Mon Jan 19 11:42:33 2009 @@ -1085,7 +1085,7 @@ return APInt(BitWidth, 0); // If none of the bits are shifted out, the result is *this. This avoids - // issues with shifting byt he size of the integer type, which produces + // issues with shifting by the size of the integer type, which produces // undefined results in the code below. This is also an optimization. if (shiftAmt == 0) return *this; @@ -1133,7 +1133,7 @@ /// Left-shift this APInt by shiftAmt. /// @brief Left-shift function. APInt APInt::shl(const APInt &shiftAmt) const { - // It's undefined behavior in C to shift by BitWidth or greater, but + // It's undefined behavior in C to shift by BitWidth or greater. return shl((uint32_t)shiftAmt.getLimitedValue(BitWidth)); } From evan.cheng at apple.com Mon Jan 19 11:46:15 2009 From: evan.cheng at apple.com (Evan Cheng) Date: Mon, 19 Jan 2009 17:46:15 -0000 Subject: [llvm-commits] [test-suite] r62513 - in /test-suite/trunk/External/SPEC: CFP2006/447.dealII/Makefile CINT2000/253.perlbmk/Makefile Message-ID: <200901191746.n0JHkFkl031996@zion.cs.uiuc.edu> Author: evancheng Date: Mon Jan 19 11:46:15 2009 New Revision: 62513 URL: http://llvm.org/viewvc/llvm-project?rev=62513&view=rev Log: Add SMALL_PROBLEM_SIZE change to a couple of spec makefiles. Modified: test-suite/trunk/External/SPEC/CFP2006/447.dealII/Makefile test-suite/trunk/External/SPEC/CINT2000/253.perlbmk/Makefile Modified: test-suite/trunk/External/SPEC/CFP2006/447.dealII/Makefile URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CFP2006/447.dealII/Makefile?rev=62513&r1=62512&r2=62513&view=diff ============================================================================== --- test-suite/trunk/External/SPEC/CFP2006/447.dealII/Makefile (original) +++ test-suite/trunk/External/SPEC/CFP2006/447.dealII/Makefile Mon Jan 19 11:46:15 2009 @@ -13,6 +13,18 @@ -DBOOST_DISABLE_THREADS \ -I$(SPEC_BENCH_DIR)/src/include +ifndef RUN_TYPE +ifdef SMALL_PROBLEM_SIZE +RUN_TYPE=test +else +ifdef LARGE_PROBLEM_SIZE +RUN_TYPE=ref +else +RUN_TYPE=train +endif +endif +endif + ifeq ($(RUN_TYPE),test) RUN_OPTIONS := 8 else Modified: test-suite/trunk/External/SPEC/CINT2000/253.perlbmk/Makefile URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CINT2000/253.perlbmk/Makefile?rev=62513&r1=62512&r2=62513&view=diff ============================================================================== --- test-suite/trunk/External/SPEC/CINT2000/253.perlbmk/Makefile (original) +++ test-suite/trunk/External/SPEC/CINT2000/253.perlbmk/Makefile Mon Jan 19 11:46:15 2009 @@ -9,6 +9,7 @@ CPPFLAGS += -DSPEC_CPU2000_LINUX_I386 -DSPEC_CPU2000_NEED_BOOL # Not sure why this is needed. +ifndef RUN_TYPE ifdef SMALL_PROBLEM_SIZE RUN_TYPE=test else @@ -18,6 +19,7 @@ RUN_TYPE=train endif endif +endif ifeq ($(RUN_TYPE),test) RUN_OPTIONS = test.pl From nicholas at mxc.ca Mon Jan 19 12:08:33 2009 From: nicholas at mxc.ca (Nick Lewycky) Date: Mon, 19 Jan 2009 18:08:33 -0000 Subject: [llvm-commits] [llvm] r62514 - in /llvm/trunk: test/ExecutionEngine/2007-05-12-APInt-Shl.ll unittests/ADT/APInt.cpp Message-ID: <200901191808.n0JI8XfY000612@zion.cs.uiuc.edu> Author: nicholas Date: Mon Jan 19 12:08:33 2009 New Revision: 62514 URL: http://llvm.org/viewvc/llvm-project?rev=62514&view=rev Log: Port this test from dejagnu to unit testing. The way this worked before was to test APInt by running "lli -force-interpreter=true" knowing the lli uses APInt under the hood to store its values. Now, we test APInt directly. Added: llvm/trunk/unittests/ADT/APInt.cpp Removed: llvm/trunk/test/ExecutionEngine/2007-05-12-APInt-Shl.ll Removed: llvm/trunk/test/ExecutionEngine/2007-05-12-APInt-Shl.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ExecutionEngine/2007-05-12-APInt-Shl.ll?rev=62513&view=auto ============================================================================== --- llvm/trunk/test/ExecutionEngine/2007-05-12-APInt-Shl.ll (original) +++ llvm/trunk/test/ExecutionEngine/2007-05-12-APInt-Shl.ll (removed) @@ -1,30 +0,0 @@ -; RUN: llvm-as %s -f -o %t.bc -; RUN: lli -force-interpreter=true %t.bc | tee %t.out | grep 10 - -; Test that APInt shift left works when bitwidth > 64 and shiftamt == 0 - -declare i32 @putchar(i32) - -define void @putBit(i65 %x, i65 %bitnum) { - %tmp1 = shl i65 1, %bitnum - %tmp2 = and i65 %x, %tmp1 - %cond = icmp ne i65 %tmp2, 0 - br i1 %cond, label %cond_true, label %cond_false - -cond_true: - call i32 @putchar(i32 49) - br label %cond_next - -cond_false: - call i32 @putchar(i32 48) - br label %cond_next - -cond_next: - ret void -} - -define i32 @main() { - call void @putBit(i65 1, i65 0) - call void @putBit(i65 0, i65 0) - ret i32 0 -} Added: llvm/trunk/unittests/ADT/APInt.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/ADT/APInt.cpp?rev=62514&view=auto ============================================================================== --- llvm/trunk/unittests/ADT/APInt.cpp (added) +++ llvm/trunk/unittests/ADT/APInt.cpp Mon Jan 19 12:08:33 2009 @@ -0,0 +1,25 @@ +//===- llvm/unittest/ADT/APInt.cpp - APInt unit tests -----------*- C++ -*-===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +#include "gtest/gtest.h" +#include "llvm/ADT/APInt.h" + +using namespace llvm; + +namespace { + +// Test that APInt shift left works when bitwidth > 64 and shiftamt == 0 +TEST(APIntTest, ShiftLeftByZero) { + APInt One = APInt::getNullValue(65) + 1; + APInt Shl = One.shl(0); + EXPECT_EQ(Shl[0], true); + EXPECT_EQ(Shl[1], false); +} + +} From evan.cheng at apple.com Mon Jan 19 12:31:51 2009 From: evan.cheng at apple.com (Evan Cheng) Date: Mon, 19 Jan 2009 18:31:51 -0000 Subject: [llvm-commits] [llvm] r62516 - /llvm/trunk/lib/Target/PowerPC/PPCISelDAGToDAG.cpp Message-ID: <200901191831.n0JIVphq001655@zion.cs.uiuc.edu> Author: evancheng Date: Mon Jan 19 12:31:51 2009 New Revision: 62516 URL: http://llvm.org/viewvc/llvm-project?rev=62516&view=rev Log: Handle ISD::DECLARE with PIC relocation model. Modified: llvm/trunk/lib/Target/PowerPC/PPCISelDAGToDAG.cpp Modified: llvm/trunk/lib/Target/PowerPC/PPCISelDAGToDAG.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/PPCISelDAGToDAG.cpp?rev=62516&r1=62515&r2=62516&view=diff ============================================================================== --- llvm/trunk/lib/Target/PowerPC/PPCISelDAGToDAG.cpp (original) +++ llvm/trunk/lib/Target/PowerPC/PPCISelDAGToDAG.cpp Mon Jan 19 12:31:51 2009 @@ -1107,10 +1107,21 @@ FrameIndexSDNode *FINode = dyn_cast(N1); if (!FINode) break; - if (N2.getOpcode() == ISD::ADD && - N2.getOperand(0).getOpcode() == PPCISD::Hi && - N2.getOperand(1).getOpcode() == PPCISD::Lo) - N2 = N2.getOperand(0).getOperand(0); + if (N2.getOpcode() == ISD::ADD) { + if (N2.getOperand(0).getOpcode() == ISD::ADD && + N2.getOperand(0).getOperand(0).getOpcode() == PPCISD::GlobalBaseReg && + N2.getOperand(0).getOperand(1).getOpcode() == PPCISD::Hi && + N2.getOperand(1).getOpcode() == PPCISD::Lo) + N2 = N2.getOperand(0).getOperand(1).getOperand(0); + else if (N2.getOperand(0).getOpcode() == ISD::ADD && + N2.getOperand(0).getOperand(0).getOpcode() == PPCISD::GlobalBaseReg && + N2.getOperand(0).getOperand(1).getOpcode() == PPCISD::Lo && + N2.getOperand(1).getOpcode() == PPCISD::Hi) + N2 = N2.getOperand(0).getOperand(1).getOperand(0); + else if (N2.getOperand(0).getOpcode() == PPCISD::Hi && + N2.getOperand(1).getOpcode() == PPCISD::Lo) + N2 = N2.getOperand(0).getOperand(0); + } if (!isa(N2)) break; int FI = cast(N1)->getIndex(); From evan.cheng at apple.com Mon Jan 19 12:57:29 2009 From: evan.cheng at apple.com (Evan Cheng) Date: Mon, 19 Jan 2009 18:57:29 -0000 Subject: [llvm-commits] [llvm] r62518 - /llvm/trunk/lib/Target/PowerPC/PPCISelDAGToDAG.cpp Message-ID: <200901191857.n0JIvTBH002633@zion.cs.uiuc.edu> Author: evancheng Date: Mon Jan 19 12:57:29 2009 New Revision: 62518 URL: http://llvm.org/viewvc/llvm-project?rev=62518&view=rev Log: Fix 80 col violations. Modified: llvm/trunk/lib/Target/PowerPC/PPCISelDAGToDAG.cpp Modified: llvm/trunk/lib/Target/PowerPC/PPCISelDAGToDAG.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/PPCISelDAGToDAG.cpp?rev=62518&r1=62517&r2=62518&view=diff ============================================================================== --- llvm/trunk/lib/Target/PowerPC/PPCISelDAGToDAG.cpp (original) +++ llvm/trunk/lib/Target/PowerPC/PPCISelDAGToDAG.cpp Mon Jan 19 12:57:29 2009 @@ -1114,8 +1114,8 @@ N2.getOperand(1).getOpcode() == PPCISD::Lo) N2 = N2.getOperand(0).getOperand(1).getOperand(0); else if (N2.getOperand(0).getOpcode() == ISD::ADD && - N2.getOperand(0).getOperand(0).getOpcode() == PPCISD::GlobalBaseReg && - N2.getOperand(0).getOperand(1).getOpcode() == PPCISD::Lo && + N2.getOperand(0).getOperand(0).getOpcode() == PPCISD::GlobalBaseReg && + N2.getOperand(0).getOperand(1).getOpcode() == PPCISD::Lo && N2.getOperand(1).getOpcode() == PPCISD::Hi) N2 = N2.getOperand(0).getOperand(1).getOperand(0); else if (N2.getOperand(0).getOpcode() == PPCISD::Hi && From evan.cheng at apple.com Mon Jan 19 13:06:11 2009 From: evan.cheng at apple.com (Evan Cheng) Date: Mon, 19 Jan 2009 19:06:11 -0000 Subject: [llvm-commits] [llvm] r62519 - in /llvm/trunk: lib/Target/X86/X86ISelDAGToDAG.cpp test/CodeGen/X86/rem-2.ll Message-ID: <200901191906.n0JJ6B5k003150@zion.cs.uiuc.edu> Author: evancheng Date: Mon Jan 19 13:06:11 2009 New Revision: 62519 URL: http://llvm.org/viewvc/llvm-project?rev=62519&view=rev Log: DIVREM isel deficiency: If sign bit is known zero, zero out DX/EDX/RDX instead of sign extending the low part (in AX/EAX/RAX) into it. Added: llvm/trunk/test/CodeGen/X86/rem-2.ll Modified: llvm/trunk/lib/Target/X86/X86ISelDAGToDAG.cpp Modified: llvm/trunk/lib/Target/X86/X86ISelDAGToDAG.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86ISelDAGToDAG.cpp?rev=62519&r1=62518&r2=62519&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/X86ISelDAGToDAG.cpp (original) +++ llvm/trunk/lib/Target/X86/X86ISelDAGToDAG.cpp Mon Jan 19 13:06:11 2009 @@ -1405,7 +1405,7 @@ InFlag = CurDAG->getCopyToReg(CurDAG->getEntryNode(), LoReg, N0, SDValue()).getValue(1); - if (isSigned) { + if (isSigned && !CurDAG->SignBitIsZero(N0)) { // Sign extend the low part into the high part. InFlag = SDValue(CurDAG->getTargetNode(SExtOpcode, MVT::Flag, InFlag), 0); Added: llvm/trunk/test/CodeGen/X86/rem-2.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/rem-2.ll?rev=62519&view=auto ============================================================================== --- llvm/trunk/test/CodeGen/X86/rem-2.ll (added) +++ llvm/trunk/test/CodeGen/X86/rem-2.ll Mon Jan 19 13:06:11 2009 @@ -0,0 +1,7 @@ +; RUN: llvm-as < %s | llc -march=x86 | not grep cltd + +define i32 @test(i32 %X) nounwind readnone { +entry: + %0 = srem i32 41, %X + ret i32 %0 +} From isanbard at gmail.com Mon Jan 19 13:23:09 2009 From: isanbard at gmail.com (Bill Wendling) Date: Mon, 19 Jan 2009 11:23:09 -0800 Subject: [llvm-commits] llvm-gcc build broken In-Reply-To: <200901191828.34146.baldrick@free.fr> References: <200901191828.34146.baldrick@free.fr> Message-ID: <16e5fdf90901191123w6bc8f63bicfef6953af7979c1@mail.gmail.com> I'm guessing that HAVE_STDLIB_H isn't #defined in your config.h file or something? -bw On Mon, Jan 19, 2009 at 9:28 AM, Duncan Sands wrote: > When building llvm-gcc on x86-32 linux at top of tree I get: > > gcc/xgcc -Bgcc/ -Bi686-pc-linux-gnu/bin/ -Bi686-pc-linux-gnu/lib/ -isystem i686-pc-linux-gnu/include -isystem i686-pc-linux-gnu/sys-include -c -DHAVE_CONFIG_H -O2 -g -O2 -I. -I../../../gcc-4.2.llvm/libiberty/../include -W-Wall -pedantic -Wwrite-strings -Wstrict-prototypes -Wc++-compat ../../../gcc-4.2.llvm/libiberty/cplus-dem.c -o cplus-dem.o > ../../../gcc-4.2.llvm/libiberty/cplus-dem.c:55: warning: function declaration isn't a prototype > ../../../gcc-4.2.llvm/libiberty/cplus-dem.c:55: error: conflicting types for 'malloc' > ../../../gcc-4.2.llvm/libiberty/cplus-dem.c:56: warning: function declaration isn't a prototype > ../../../gcc-4.2.llvm/libiberty/cplus-dem.c: In function 'code_for_qualifier': > ../../../gcc-4.2.llvm/libiberty/cplus-dem.c:582: warning: implicit declaration of function 'abort' > ../../../gcc-4.2.llvm/libiberty/cplus-dem.c:582: warning: incompatible implicit declaration of built-in function 'abort' > ../../../gcc-4.2.llvm/libiberty/cplus-dem.c: In function 'qualifier_string': > ../../../gcc-4.2.llvm/libiberty/cplus-dem.c:622: warning: incompatible implicit declaration of built-in function 'abort' > ../../../gcc-4.2.llvm/libiberty/cplus-dem.c: In function 'squangle_mop_up': > ../../../gcc-4.2.llvm/libiberty/cplus-dem.c:1082: warning: implicit declaration of function 'free' > ../../../gcc-4.2.llvm/libiberty/cplus-dem.c: In function 'demangle_qualified': > ../../../gcc-4.2.llvm/libiberty/cplus-dem.c:3177: warning: implicit declaration of function 'atoi' > _______________________________________________ > llvm-commits mailing list > llvm-commits at cs.uiuc.edu > http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits > From mrs at apple.com Mon Jan 19 13:48:23 2009 From: mrs at apple.com (Mike Stump) Date: Mon, 19 Jan 2009 19:48:23 -0000 Subject: [llvm-commits] [llvm] r62522 - /llvm/trunk/Makefile Message-ID: <200901191948.n0JJmNIT004852@zion.cs.uiuc.edu> Author: mrs Date: Mon Jan 19 13:48:23 2009 New Revision: 62522 URL: http://llvm.org/viewvc/llvm-project?rev=62522&view=rev Log: Add targets to support the installation of clang in isolation. Modified: llvm/trunk/Makefile Modified: llvm/trunk/Makefile URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/Makefile?rev=62522&r1=62521&r2=62522&view=diff ============================================================================== --- llvm/trunk/Makefile (original) +++ llvm/trunk/Makefile Mon Jan 19 13:48:23 2009 @@ -54,6 +54,17 @@ OPTIONAL_DIRS := endif +ifeq ($(MAKECMDGOALS),install-clang) + DIRS := tools/clang/Driver tools/clang/lib/Headers tools/clang/tools/ccc + OPTIONAL_DIRS := + NO_INSTALL = 1 +endif + +ifeq ($(MAKECMDGOALS),clang-only) + DIRS := $(filter-out tools runtime docs, $(DIRS)) tools/clang + OPTIONAL_DIRS := +endif + ifeq ($(MAKECMDGOALS),unittests) DIRS := $(filter-out tools runtime docs, $(DIRS)) utils unittests OPTIONAL_DIRS := @@ -113,8 +124,10 @@ $(TopDistDir)/include/llvm/Support/DataTypes.h \ $(TopDistDir)/include/llvm/Support/ThreadSupport.h +clang-only: all tools-only: all libs-only: all +install-clang: install install-libs: install #------------------------------------------------------------------------ From baldrick at free.fr Mon Jan 19 14:20:18 2009 From: baldrick at free.fr (Duncan Sands) Date: Mon, 19 Jan 2009 21:20:18 +0100 Subject: [llvm-commits] Invalid memory access due to debug info which building gcc In-Reply-To: <7DF8F12D-9D44-487C-8946-20A987365BF8@apple.com> References: <200901161533.05528.baldrick@free.fr> <7DF8F12D-9D44-487C-8946-20A987365BF8@apple.com> Message-ID: <200901192120.18708.baldrick@free.fr> Hi Devang, > I am investigating similar case. Would it be possible to get a small > test case (preprocessed source)? I got it down to the attached file. If you compile it like this llvm-gcc -g bad.i then you get the bad memory access. Note that it appears to compile successfully - you need to run cc1 under valgrind or the equivalent to see the problem. (The original testcase crashed the compiler, but was much bigger). Good luck, Duncan. -------------- next part -------------- typedef long unsigned int size_t; typedef unsigned short int uint16_t; typedef unsigned int uint32_t; typedef unsigned long int uint64_t; typedef uint16_t Elf64_Half; typedef uint32_t Elf64_Word; typedef uint64_t Elf64_Xword; typedef uint64_t Elf64_Addr; typedef uint64_t Elf64_Off; typedef struct { Elf64_Word p_type; Elf64_Off p_offset; Elf64_Addr p_vaddr; Elf64_Xword p_align; } Elf64_Phdr; struct dl_phdr_info { const char *dlpi_name; const Elf64_Phdr *dlpi_phdr; Elf64_Half dlpi_phnum; unsigned long long int dlpi_adds; }; typedef unsigned _Unwind_Ptr; struct object { union { const struct dwarf_fde *single; struct dwarf_fde **array; struct fde_vector *sort; } u; union { struct { } b; } s; struct object *next; }; typedef int sword; typedef unsigned int uword; struct dwarf_fde { uword length; sword CIE_delta; unsigned char pc_begin[]; }; typedef struct dwarf_fde fde; struct unw_eh_callback_data { const fde *ret; struct frame_hdr_cache_element *link; } frame_hdr_cache[8]; _Unwind_Ptr base_from_cb_data (struct unw_eh_callback_data *data) { } void _Unwind_IteratePhdrCallback (struct dl_phdr_info *info, size_t size, void *ptr) { const unsigned char *p; const struct unw_eh_frame_hdr *hdr; struct object ob; } From isanbard at gmail.com Mon Jan 19 14:59:19 2009 From: isanbard at gmail.com (Bill Wendling) Date: Mon, 19 Jan 2009 20:59:19 -0000 Subject: [llvm-commits] [llvm-gcc-4.2] r62525 - in /llvm-gcc-4.2/trunk/gcc: c-common.c c-common.h c.opt config/darwin.h Message-ID: <200901192059.n0JKxKbK007251@zion.cs.uiuc.edu> Author: void Date: Mon Jan 19 14:59:19 2009 New Revision: 62525 URL: http://llvm.org/viewvc/llvm-project?rev=62525&view=rev Log: Treat warn_format_security like warn_format. They are linked in special ways. Modified: llvm-gcc-4.2/trunk/gcc/c-common.c llvm-gcc-4.2/trunk/gcc/c-common.h llvm-gcc-4.2/trunk/gcc/c.opt llvm-gcc-4.2/trunk/gcc/config/darwin.h Modified: llvm-gcc-4.2/trunk/gcc/c-common.c URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/c-common.c?rev=62525&r1=62524&r2=62525&view=diff ============================================================================== --- llvm-gcc-4.2/trunk/gcc/c-common.c (original) +++ llvm-gcc-4.2/trunk/gcc/c-common.c Mon Jan 19 14:59:19 2009 @@ -297,13 +297,18 @@ /* Warn about format/argument anomalies in calls to formatted I/O functions (*printf, *scanf, strftime, strfmon, etc.). */ -/* APPLE LOCAL default to Wformat-security 5764921 */ +/* APPLE LOCAL begin default to Wformat-security 5764921 */ /* LLVM LOCAL begin initialize via config/darwin.h */ #ifndef WARN_FORMAT_INIT #define WARN_FORMAT_INIT 0 #endif +#ifndef WARN_FORMAT_SECURITY_INIT +#define WARN_FORMAT_SECURITY_INIT 0 +#endif int warn_format = WARN_FORMAT_INIT; +int warn_format_security = WARN_FORMAT_SECURITY_INIT; /* LLVM LOCAL end initialize via config/darwin.h */ +/* APPLE LOCAL end default to Wformat-security 5764921 */ /* Warn about using __null (as NULL in C++) as sentinel. For code compiled with GCC this doesn't matter as __null is guaranteed to have the right Modified: llvm-gcc-4.2/trunk/gcc/c-common.h URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/c-common.h?rev=62525&r1=62524&r2=62525&view=diff ============================================================================== --- llvm-gcc-4.2/trunk/gcc/c-common.h (original) +++ llvm-gcc-4.2/trunk/gcc/c-common.h Mon Jan 19 14:59:19 2009 @@ -466,6 +466,12 @@ extern int warn_format; +/* LLVM LOCAL begin */ +/* Warn about possible security problems with format functions */ + +extern int warn_format_security; +/* LLVM LOCAL end */ + /* APPLE LOCAL begin disable_typechecking_for_spec_flag */ /* This makes type conflicts a warning, instead of an error, to work around some problems with SPEC. */ Modified: llvm-gcc-4.2/trunk/gcc/c.opt URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/c.opt?rev=62525&r1=62524&r2=62525&view=diff ============================================================================== --- llvm-gcc-4.2/trunk/gcc/c.opt (original) +++ llvm-gcc-4.2/trunk/gcc/c.opt Mon Jan 19 14:59:19 2009 @@ -237,9 +237,11 @@ Warn about format strings that are not literals ; APPLE LOCAL begin default to Wformat-security 5764921 +; LLVM LOCAL begin don't initialize this Wformat-security -C ObjC C++ ObjC++ Var(warn_format_security) Init(1) +C ObjC C++ ObjC++ Warn about possible security problems with format functions +; LLVM LOCAL end don't initialize this ; APPLE LOCAL end default to Wformat-security 5764921 Wformat-y2k Modified: llvm-gcc-4.2/trunk/gcc/config/darwin.h URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config/darwin.h?rev=62525&r1=62524&r2=62525&view=diff ============================================================================== --- llvm-gcc-4.2/trunk/gcc/config/darwin.h (original) +++ llvm-gcc-4.2/trunk/gcc/config/darwin.h Mon Jan 19 14:59:19 2009 @@ -1604,8 +1604,12 @@ #ifdef WARN_FORMAT_INIT #undef WARN_FORMAT_INIT #endif - #define WARN_FORMAT_INIT 1 + +#ifdef WARN_FORMAT_SECURITY_INIT +#undef WARN_FORMAT_SECURITY_INIT +#endif +#define WARN_FORMAT_SECURITY_INIT 1 /* LLVM LOCAL end */ #endif /* CONFIG_DARWIN_H */ From dpatel at apple.com Mon Jan 19 15:00:49 2009 From: dpatel at apple.com (Devang Patel) Date: Mon, 19 Jan 2009 21:00:49 -0000 Subject: [llvm-commits] [llvm] r62526 - in /llvm/trunk: lib/VMCore/Verifier.cpp test/CodeGen/Generic/2006-03-27-DebugInfoNULLDeclare.ll test/DebugInfo/2009-01-15-dbg_declare.ll Message-ID: <200901192100.n0JL0nIA007314@zion.cs.uiuc.edu> Author: dpatel Date: Mon Jan 19 15:00:48 2009 New Revision: 62526 URL: http://llvm.org/viewvc/llvm-project?rev=62526&view=rev Log: Verify Intrinsic::dbg_declare. Removed: llvm/trunk/test/CodeGen/Generic/2006-03-27-DebugInfoNULLDeclare.ll Modified: llvm/trunk/lib/VMCore/Verifier.cpp llvm/trunk/test/DebugInfo/2009-01-15-dbg_declare.ll Modified: llvm/trunk/lib/VMCore/Verifier.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Verifier.cpp?rev=62526&r1=62525&r2=62526&view=diff ============================================================================== --- llvm/trunk/lib/VMCore/Verifier.cpp (original) +++ llvm/trunk/lib/VMCore/Verifier.cpp Mon Jan 19 15:00:48 2009 @@ -1332,6 +1332,11 @@ switch (ID) { default: break; + case Intrinsic::dbg_declare: // llvm.dbg.declare + if (Constant *C = dyn_cast(CI.getOperand(1))) + Assert1(C && !isa(C), + "invalid llvm.dbg.declare intrinsic call", &CI); + break; case Intrinsic::memcpy: case Intrinsic::memmove: case Intrinsic::memset: Removed: llvm/trunk/test/CodeGen/Generic/2006-03-27-DebugInfoNULLDeclare.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Generic/2006-03-27-DebugInfoNULLDeclare.ll?rev=62525&view=auto ============================================================================== --- llvm/trunk/test/CodeGen/Generic/2006-03-27-DebugInfoNULLDeclare.ll (original) +++ llvm/trunk/test/CodeGen/Generic/2006-03-27-DebugInfoNULLDeclare.ll (removed) @@ -1,9 +0,0 @@ -; RUN: llvm-as < %s | llc - -declare void @llvm.dbg.declare({ }*, { }*) - -define void @foo() { - call void @llvm.dbg.declare( { }* null, { }* null ) - ret void -} - Modified: llvm/trunk/test/DebugInfo/2009-01-15-dbg_declare.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/2009-01-15-dbg_declare.ll?rev=62526&r1=62525&r2=62526&view=diff ============================================================================== --- llvm/trunk/test/DebugInfo/2009-01-15-dbg_declare.ll (original) +++ llvm/trunk/test/DebugInfo/2009-01-15-dbg_declare.ll Mon Jan 19 15:00:48 2009 @@ -8,7 +8,9 @@ define i32 @isascii(i32 %_c) nounwind { entry: - call void @llvm.dbg.declare({ }* null, { }* bitcast (%llvm.dbg.variable.type* @llvm.dbg.variable24 to { }*)) + %j = alloca i32 + %0 = bitcast i32* %j to { }* + call void @llvm.dbg.declare({ }* %0, { }* bitcast (%llvm.dbg.variable.type* @llvm.dbg.variable24 to { }*)) unreachable } From dpatel at apple.com Mon Jan 19 15:13:39 2009 From: dpatel at apple.com (Devang Patel) Date: Mon, 19 Jan 2009 21:13:39 -0000 Subject: [llvm-commits] [llvm] r62527 - /llvm/trunk/include/llvm/Analysis/DebugInfo.h Message-ID: <200901192113.n0JLDdTI007753@zion.cs.uiuc.edu> Author: dpatel Date: Mon Jan 19 15:13:39 2009 New Revision: 62527 URL: http://llvm.org/viewvc/llvm-project?rev=62527&view=rev Log: DebugInfo is a lightweight APIs and consumers are expected to use light objects directly. There is no need to support isa<>, dyn_cast<> etc... Modified: llvm/trunk/include/llvm/Analysis/DebugInfo.h Modified: llvm/trunk/include/llvm/Analysis/DebugInfo.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Analysis/DebugInfo.h?rev=62527&r1=62526&r2=62527&view=diff ============================================================================== --- llvm/trunk/include/llvm/Analysis/DebugInfo.h (original) +++ llvm/trunk/include/llvm/Analysis/DebugInfo.h Mon Jan 19 15:13:39 2009 @@ -78,7 +78,6 @@ unsigned getTag() const { return getUnsignedField(0) & ~VersionMask; } - static inline bool classof(const DIDescriptor *D) { return true; } }; /// DIAnchor - A wrapper for various anchor descriptors. @@ -96,10 +95,6 @@ int64_t getLo() const { return (int64_t)getUInt64Field(1); } int64_t getHi() const { return (int64_t)getUInt64Field(2); } - static inline bool classof(const DISubrange *) { return true; } - static inline bool classof(const DIDescriptor *D) { - return D->getTag() == dwarf::DW_TAG_subrange_type; - } }; /// DIArray - This descriptor holds an array of descriptors. @@ -111,12 +106,6 @@ DIDescriptor getElement(unsigned Idx) const { return getDescriptorField(Idx); } - - static inline bool classof(const DIArray *) { return true; } - static inline bool classof(const DIDescriptor *D) { - return D->getTag() == dwarf::DW_TAG_array_type - || D->getTag() == dwarf::DW_AT_GNU_vector; - } }; /// DICompileUnit - A wrapper for a compile unit. @@ -128,11 +117,6 @@ std::string getFilename() const { return getStringField(3); } std::string getDirectory() const { return getStringField(4); } std::string getProducer() const { return getStringField(5); } - - static inline bool classof(const DICompileUnit *) { return true; } - static inline bool classof(const DIDescriptor *D) { - return D->getTag() == dwarf::DW_TAG_compile_unit; - } }; /// DIEnumerator - A wrapper for an enumerator (e.g. X and Y in 'enum {X,Y}'). @@ -144,10 +128,6 @@ std::string getName() const { return getStringField(1); } uint64_t getEnumValue() const { return getUInt64Field(2); } - static inline bool classof(const DIEnumerator *) { return true; } - static inline bool classof(const DIDescriptor *D) { - return D->getTag() == dwarf::DW_TAG_enumerator; - } }; /// DIType - This is a wrapper for a type. @@ -200,13 +180,6 @@ assert (0 && "Invalid DIDescriptor"); return ""; } - - static inline bool classof(const DIType *) { return true; } - static inline bool classof(const DIDescriptor *D) { - unsigned Tag = D->getTag(); - return isBasicType(Tag) || isDerivedType(Tag) || isCompositeType(Tag); - } - }; /// DIBasicType - A basic type, like 'int' or 'float'. @@ -231,11 +204,6 @@ DIType getTypeDerivedFrom() const { return getFieldAs(9); } std::string getFilename() const { return getStringField(10); } std::string getDirectory() const { return getStringField(11); } - - static inline bool classof(const DIDerivedType *) { return true; } - static inline bool classof(const DIDescriptor *D) { - return isDerivedType(D->getTag()); - } }; @@ -249,11 +217,6 @@ DIArray getTypeArray() const { return getFieldAs(10); } std::string getFilename() const { return getStringField(11); } std::string getDirectory() const { return getStringField(12); } - - static inline bool classof(const DIDerivedType *) { return true; } - static inline bool classof(const DIDescriptor *D) { - return isCompositeType(D->getTag()); - } }; /// DIGlobal - This is a common class for global variables and subprograms. @@ -300,12 +263,6 @@ assert (0 && "Invalid DIDescriptor"); return ""; } - - static inline bool classof(const DIGlobal *) { return true; } - static inline bool classof(const DIDescriptor *D) { - unsigned Tag = D->getTag(); - return isSubprogram(Tag) || isGlobalVariable(Tag); - } }; @@ -316,10 +273,6 @@ std::string getFilename() const { return getStringField(11); } std::string getDirectory() const { return getStringField(12); } DICompositeType getType() const { return getFieldAs(8); } - static inline bool classof(const DISubprogram *) { return true; } - static inline bool classof(const DIDescriptor *D) { - return isSubprogram(D->getTag()); - } }; /// DIGlobalVariable - This is a wrapper for a global variable. @@ -330,10 +283,6 @@ GlobalVariable *getGlobal() const { return getGlobalVariableField(11); } std::string getFilename() const { return getStringField(12); } std::string getDirectory() const { return getStringField(13); } - static inline bool classof(const DIGlobalVariable *) { return true; } - static inline bool classof(const DIDescriptor *D) { - return isGlobalVariable(D->getTag()); - } }; @@ -354,10 +303,6 @@ /// isVariable - Return true if the specified tag is legal for DIVariable. static bool isVariable(unsigned Tag); - static inline bool classof(const DIVariable *) { return true; } - static inline bool classof(const DIDescriptor *D) { - return isVariable(D->getTag()); - } }; @@ -367,10 +312,6 @@ explicit DIBlock(GlobalVariable *GV = 0); DIDescriptor getContext() const { return getDescriptorField(1); } - static inline bool classof(const DIBlock *) { return true; } - static inline bool classof(const DIDescriptor *D) { - return D->getTag() == dwarf::DW_TAG_lexical_block; - } }; /// DIFactory - This object assists with the construction of the various From dalej at apple.com Mon Jan 19 15:17:05 2009 From: dalej at apple.com (Dale Johannesen) Date: Mon, 19 Jan 2009 21:17:05 -0000 Subject: [llvm-commits] [llvm] r62528 - in /llvm/trunk: lib/Support/APFloat.cpp test/CodeGen/X86/2009-01-19-fmod-constant-float.ll Message-ID: <200901192117.n0JLH5k1007884@zion.cs.uiuc.edu> Author: johannes Date: Mon Jan 19 15:17:05 2009 New Revision: 62528 URL: http://llvm.org/viewvc/llvm-project?rev=62528&view=rev Log: compile-time fmod was done incorrectly. PR 3316. Added: llvm/trunk/test/CodeGen/X86/2009-01-19-fmod-constant-float.ll Modified: llvm/trunk/lib/Support/APFloat.cpp Modified: llvm/trunk/lib/Support/APFloat.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/APFloat.cpp?rev=62528&r1=62527&r2=62528&view=diff ============================================================================== --- llvm/trunk/lib/Support/APFloat.cpp (original) +++ llvm/trunk/lib/Support/APFloat.cpp Mon Jan 19 15:17:05 2009 @@ -1531,7 +1531,7 @@ integerPart *x = new integerPart[parts]; bool ignored; fs = V.convertToInteger(x, parts * integerPartWidth, true, - rmNearestTiesToEven, &ignored); + rmTowardZero, &ignored); if (fs==opInvalidOp) return fs; @@ -1811,7 +1811,9 @@ if (exponent < 0) { /* Our absolute value is less than one; truncate everything. */ APInt::tcSet(parts, 0, dstPartsCount); - truncatedBits = semantics->precision; + /* For exponent -1 the integer bit represents .5, look at that. + For smaller exponents leftmost truncated bit is 0. */ + truncatedBits = semantics->precision -1U - exponent; } else { /* We want the most significant (exponent + 1) bits; the rest are truncated. */ Added: llvm/trunk/test/CodeGen/X86/2009-01-19-fmod-constant-float.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2009-01-19-fmod-constant-float.ll?rev=62528&view=auto ============================================================================== --- llvm/trunk/test/CodeGen/X86/2009-01-19-fmod-constant-float.ll (added) +++ llvm/trunk/test/CodeGen/X86/2009-01-19-fmod-constant-float.ll Mon Jan 19 15:17:05 2009 @@ -0,0 +1,77 @@ +; RUN: llvm-as < %s | opt -std-compile-opts | llc | grep 1036831949 | count 2 +; RUN: llvm-as < %s | opt -std-compile-opts | llc | grep 3184315597 | count 2 +; check constant folding for 'frem'. PR 3316. + +; ModuleID = 'tt.c' +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:128:128" +target triple = "i386-apple-darwin9.6" + +define float @test1() nounwind { +entry: + %retval = alloca float ; [#uses=2] + %0 = alloca float ; [#uses=2] + %"alloca point" = bitcast i32 0 to i32 ; [#uses=0] + %1 = call double @fmod(double 1.000000e-01, double 1.000000e+00) nounwind readonly ; [#uses=1] + %2 = fptrunc double %1 to float ; [#uses=1] + store float %2, float* %0, align 4 + %3 = load float* %0, align 4 ; [#uses=1] + store float %3, float* %retval, align 4 + br label %return + +return: ; preds = %entry + %retval1 = load float* %retval ; [#uses=1] + ret float %retval1 +} + +declare double @fmod(double, double) nounwind readonly + +define float @test2() nounwind { +entry: + %retval = alloca float ; [#uses=2] + %0 = alloca float ; [#uses=2] + %"alloca point" = bitcast i32 0 to i32 ; [#uses=0] + %1 = call double @fmod(double -1.000000e-01, double 1.000000e+00) nounwind readonly ; [#uses=1] + %2 = fptrunc double %1 to float ; [#uses=1] + store float %2, float* %0, align 4 + %3 = load float* %0, align 4 ; [#uses=1] + store float %3, float* %retval, align 4 + br label %return + +return: ; preds = %entry + %retval1 = load float* %retval ; [#uses=1] + ret float %retval1 +} + +define float @test3() nounwind { +entry: + %retval = alloca float ; [#uses=2] + %0 = alloca float ; [#uses=2] + %"alloca point" = bitcast i32 0 to i32 ; [#uses=0] + %1 = call double @fmod(double 1.000000e-01, double -1.000000e+00) nounwind readonly ; [#uses=1] + %2 = fptrunc double %1 to float ; [#uses=1] + store float %2, float* %0, align 4 + %3 = load float* %0, align 4 ; [#uses=1] + store float %3, float* %retval, align 4 + br label %return + +return: ; preds = %entry + %retval1 = load float* %retval ; [#uses=1] + ret float %retval1 +} + +define float @test4() nounwind { +entry: + %retval = alloca float ; [#uses=2] + %0 = alloca float ; [#uses=2] + %"alloca point" = bitcast i32 0 to i32 ; [#uses=0] + %1 = call double @fmod(double -1.000000e-01, double -1.000000e+00) nounwind readonly ; [#uses=1] + %2 = fptrunc double %1 to float ; [#uses=1] + store float %2, float* %0, align 4 + %3 = load float* %0, align 4 ; [#uses=1] + store float %3, float* %retval, align 4 + br label %return + +return: ; preds = %entry + %retval1 = load float* %retval ; [#uses=1] + ret float %retval1 +} From sabre at nondot.org Mon Jan 19 15:20:34 2009 From: sabre at nondot.org (Chris Lattner) Date: Mon, 19 Jan 2009 21:20:34 -0000 Subject: [llvm-commits] [llvm] r62529 - in /llvm/trunk: lib/Transforms/Scalar/JumpThreading.cpp test/Transforms/JumpThreading/2009-01-19-InfSwitchLoop.ll Message-ID: <200901192120.n0JLKYvo008000@zion.cs.uiuc.edu> Author: lattner Date: Mon Jan 19 15:20:34 2009 New Revision: 62529 URL: http://llvm.org/viewvc/llvm-project?rev=62529&view=rev Log: Fix PR3353, infinitely jump threading an infinite loop make from switches. Added: llvm/trunk/test/Transforms/JumpThreading/2009-01-19-InfSwitchLoop.ll Modified: llvm/trunk/lib/Transforms/Scalar/JumpThreading.cpp Modified: llvm/trunk/lib/Transforms/Scalar/JumpThreading.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/JumpThreading.cpp?rev=62529&r1=62528&r2=62529&view=diff ============================================================================== --- llvm/trunk/lib/Transforms/Scalar/JumpThreading.cpp (original) +++ llvm/trunk/lib/Transforms/Scalar/JumpThreading.cpp Mon Jan 19 15:20:34 2009 @@ -419,6 +419,11 @@ /// switches out of repeated 'if' conditions. bool JumpThreading::ProcessSwitchOnDuplicateCond(BasicBlock *PredBB, BasicBlock *DestBB) { + // Can't thread edge to self. + if (PredBB == DestBB) + return false; + + SwitchInst *PredSI = cast(PredBB->getTerminator()); SwitchInst *DestSI = cast(DestBB->getTerminator()); Added: llvm/trunk/test/Transforms/JumpThreading/2009-01-19-InfSwitchLoop.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/JumpThreading/2009-01-19-InfSwitchLoop.ll?rev=62529&view=auto ============================================================================== --- llvm/trunk/test/Transforms/JumpThreading/2009-01-19-InfSwitchLoop.ll (added) +++ llvm/trunk/test/Transforms/JumpThreading/2009-01-19-InfSwitchLoop.ll Mon Jan 19 15:20:34 2009 @@ -0,0 +1,21 @@ +; RUN: llvm-as < %s | opt -jump-threading | llvm-dis +; PR3353 + +define i32 @test(i8 %X) { +entry: + %Y = add i8 %X, 1 + %Z = add i8 %Y, 1 + br label %bb33.i + +bb33.i: ; preds = %bb33.i, %bb32.i + switch i8 %Y, label %bb32.i [ + i8 39, label %bb35.split.i + i8 13, label %bb33.i + ] + +bb35.split.i: + ret i32 5 +bb32.i: + ret i32 1 +} + From gohman at apple.com Mon Jan 19 15:44:22 2009 From: gohman at apple.com (Dan Gohman) Date: Mon, 19 Jan 2009 21:44:22 -0000 Subject: [llvm-commits] [llvm] r62533 - in /llvm/trunk: lib/CodeGen/SelectionDAG/DAGCombiner.cpp lib/CodeGen/SelectionDAG/SelectionDAG.cpp test/CodeGen/X86/pr3018.ll Message-ID: <200901192144.n0JLiNcY008949@zion.cs.uiuc.edu> Author: djg Date: Mon Jan 19 15:44:21 2009 New Revision: 62533 URL: http://llvm.org/viewvc/llvm-project?rev=62533&view=rev Log: Fix SelectionDAG::ReplaceAllUsesWith to behave correctly when uses are added to the From node while it is processing From's use list, because of automatic local CSE. The fix is to avoid visiting any new uses. Fix a few places in the DAGCombiner that assumed that after a RAUW call, the From node has no users and may be deleted. This fixes PR3018. Added: llvm/trunk/test/CodeGen/X86/pr3018.ll Modified: llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp Modified: llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp?rev=62533&r1=62532&r2=62533&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp Mon Jan 19 15:44:21 2009 @@ -522,12 +522,17 @@ } } - // Nodes can be reintroduced into the worklist. Make sure we do not - // process a node that has been replaced. - removeFromWorkList(N); + // Finally, if the node is now dead, remove it from the graph. The node + // may not be dead if the replacement process recursively simplified to + // something else needing this node. + if (N->use_empty()) { + // Nodes can be reintroduced into the worklist. Make sure we do not + // process a node that has been replaced. + removeFromWorkList(N); - // Finally, since the node is now dead, remove it from the graph. - DAG.DeleteNode(N); + // Finally, since the node is now dead, remove it from the graph. + DAG.DeleteNode(N); + } return SDValue(N, 0); } @@ -658,12 +663,17 @@ for (unsigned i = 0, e = N->getNumOperands(); i != e; ++i) AddToWorkList(N->getOperand(i).getNode()); - // Nodes can be reintroduced into the worklist. Make sure we do not - // process a node that has been replaced. - removeFromWorkList(N); + // Finally, if the node is now dead, remove it from the graph. The node + // may not be dead if the replacement process recursively simplified to + // something else needing this node. + if (N->use_empty()) { + // Nodes can be reintroduced into the worklist. Make sure we do not + // process a node that has been replaced. + removeFromWorkList(N); - // Finally, since the node is now dead, remove it from the graph. - DAG.DeleteNode(N); + // Finally, since the node is now dead, remove it from the graph. + DAG.DeleteNode(N); + } } // If the root changed (e.g. it was a dead load, update the root). Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp?rev=62533&r1=62532&r2=62533&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp Mon Jan 19 15:44:21 2009 @@ -4388,9 +4388,16 @@ "Cannot replace with this method!"); assert(From != To.getNode() && "Cannot replace uses of with self"); - while (!From->use_empty()) { - SDNode::use_iterator UI = From->use_begin(); + // Iterate over all the existing uses of From. This specifically avoids + // visiting any new uses of From that arrise while the replacement is + // happening, because any such uses would be the result of CSE: If an + // existing node looks like From after one of its operands is replaced + // by To, we don't want to replace of all its users with To too. + // See PR3018 for more info. + SDNode::use_iterator UI = From->use_begin(), UE = From->use_end(); + while (UI != UE) { SDNode *U = *UI; + do ++UI; while (UI != UE && *UI == U); // This node is about to morph, remove its old self from the CSE maps. RemoveNodeFromCSEMaps(U); @@ -4437,9 +4444,12 @@ if (From == To) return; - while (!From->use_empty()) { - SDNode::use_iterator UI = From->use_begin(); + // Iterate over just the existing users of From. See the comments in + // the ReplaceAllUsesWith above. + SDNode::use_iterator UI = From->use_begin(), UE = From->use_end(); + while (UI != UE) { SDNode *U = *UI; + do ++UI; while (UI != UE && *UI == U); // This node is about to morph, remove its old self from the CSE maps. RemoveNodeFromCSEMaps(U); @@ -4480,9 +4490,12 @@ if (From->getNumValues() == 1) // Handle the simple case efficiently. return ReplaceAllUsesWith(SDValue(From, 0), To[0], UpdateListener); - while (!From->use_empty()) { - SDNode::use_iterator UI = From->use_begin(); + // Iterate over just the existing users of From. See the comments in + // the ReplaceAllUsesWith above. + SDNode::use_iterator UI = From->use_begin(), UE = From->use_end(); + while (UI != UE) { SDNode *U = *UI; + do ++UI; while (UI != UE && *UI == U); // This node is about to morph, remove its old self from the CSE maps. RemoveNodeFromCSEMaps(U); Added: llvm/trunk/test/CodeGen/X86/pr3018.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/pr3018.ll?rev=62533&view=auto ============================================================================== --- llvm/trunk/test/CodeGen/X86/pr3018.ll (added) +++ llvm/trunk/test/CodeGen/X86/pr3018.ll Mon Jan 19 15:44:21 2009 @@ -0,0 +1,8 @@ +; RUN: llvm-as < %s | llc -march=x86 | grep {orl \$1} + +define i32 @test(i32 %A) nounwind { + %B = or i32 %A, 1 + %C = or i32 %B, 1 + %D = and i32 %C, 7057 + ret i32 %D +} From sabre at nondot.org Mon Jan 19 15:55:26 2009 From: sabre at nondot.org (Chris Lattner) Date: Mon, 19 Jan 2009 21:55:26 -0000 Subject: [llvm-commits] [llvm] r62534 - /llvm/trunk/lib/VMCore/ConstantFold.cpp Message-ID: <200901192155.n0JLtQc8009317@zion.cs.uiuc.edu> Author: lattner Date: Mon Jan 19 15:55:26 2009 New Revision: 62534 URL: http://llvm.org/viewvc/llvm-project?rev=62534&view=rev Log: div/rem by zero and div/rem overflow are both undefined according to langref. Constant fold them to undef instead of trying to preserve the trap. This fixes PR3354. Modified: llvm/trunk/lib/VMCore/ConstantFold.cpp Modified: llvm/trunk/lib/VMCore/ConstantFold.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/ConstantFold.cpp?rev=62534&r1=62533&r2=62534&view=diff ============================================================================== --- llvm/trunk/lib/VMCore/ConstantFold.cpp (original) +++ llvm/trunk/lib/VMCore/ConstantFold.cpp Mon Jan 19 15:55:26 2009 @@ -655,11 +655,15 @@ case Instruction::SDiv: if (CI2->equalsInt(1)) return const_cast(C1); // X / 1 == X + if (CI2->equalsInt(0)) + return UndefValue::get(CI2->getType()); // X / 0 == undef break; case Instruction::URem: case Instruction::SRem: if (CI2->equalsInt(1)) return Constant::getNullValue(CI2->getType()); // X % 1 == 0 + if (CI2->equalsInt(0)) + return UndefValue::get(CI2->getType()); // X % 0 == undef break; case Instruction::And: if (CI2->isZero()) return const_cast(C2); // X & 0 == 0 @@ -733,24 +737,20 @@ case Instruction::Mul: return ConstantInt::get(C1V * C2V); case Instruction::UDiv: - if (CI2->isNullValue()) - return 0; // X / 0 -> can't fold + assert(!CI2->isNullValue() && "Div by zero handled above"); return ConstantInt::get(C1V.udiv(C2V)); case Instruction::SDiv: - if (CI2->isNullValue()) - return 0; // X / 0 -> can't fold + assert(!CI2->isNullValue() && "Div by zero handled above"); if (C2V.isAllOnesValue() && C1V.isMinSignedValue()) - return 0; // MIN_INT / -1 -> overflow + return UndefValue::get(CI1->getType()); // MIN_INT / -1 -> undef return ConstantInt::get(C1V.sdiv(C2V)); case Instruction::URem: - if (C2->isNullValue()) - return 0; // X / 0 -> can't fold + assert(!CI2->isNullValue() && "Div by zero handled above"); return ConstantInt::get(C1V.urem(C2V)); - case Instruction::SRem: - if (CI2->isNullValue()) - return 0; // X % 0 -> can't fold + case Instruction::SRem: + assert(!CI2->isNullValue() && "Div by zero handled above"); if (C2V.isAllOnesValue() && C1V.isMinSignedValue()) - return 0; // MIN_INT % -1 -> overflow + return UndefValue::get(CI1->getType()); // MIN_INT % -1 -> undef return ConstantInt::get(C1V.srem(C2V)); case Instruction::And: return ConstantInt::get(C1V & C2V); From sabre at nondot.org Mon Jan 19 16:00:18 2009 From: sabre at nondot.org (Chris Lattner) Date: Mon, 19 Jan 2009 22:00:18 -0000 Subject: [llvm-commits] [llvm] r62535 - in /llvm/trunk: include/llvm/ADT/DenseMap.h lib/Transforms/Scalar/GVN.cpp Message-ID: <200901192200.n0JM0IHp009492@zion.cs.uiuc.edu> Author: lattner Date: Mon Jan 19 16:00:18 2009 New Revision: 62535 URL: http://llvm.org/viewvc/llvm-project?rev=62535&view=rev Log: improve compatibility with cygwin, patch by Jay Foad! Modified: llvm/trunk/include/llvm/ADT/DenseMap.h llvm/trunk/lib/Transforms/Scalar/GVN.cpp Modified: llvm/trunk/include/llvm/ADT/DenseMap.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ADT/DenseMap.h?rev=62535&r1=62534&r2=62535&view=diff ============================================================================== --- llvm/trunk/include/llvm/ADT/DenseMap.h (original) +++ llvm/trunk/include/llvm/ADT/DenseMap.h Mon Jan 19 16:00:18 2009 @@ -44,12 +44,23 @@ }; // Provide DenseMapInfo for unsigned ints. -template<> struct DenseMapInfo { - static inline uint32_t getEmptyKey() { return ~0; } - static inline uint32_t getTombstoneKey() { return ~0 - 1; } - static unsigned getHashValue(const uint32_t& Val) { return Val * 37; } +template<> struct DenseMapInfo { + static inline unsigned getEmptyKey() { return ~0; } + static inline unsigned getTombstoneKey() { return ~0 - 1; } + static unsigned getHashValue(const unsigned& Val) { return Val * 37; } static bool isPod() { return true; } - static bool isEqual(const uint32_t& LHS, const uint32_t& RHS) { + static bool isEqual(const unsigned& LHS, const unsigned& RHS) { + return LHS == RHS; + } +}; + +// Provide DenseMapInfo for unsigned longs. +template<> struct DenseMapInfo { + static inline unsigned long getEmptyKey() { return ~0L; } + static inline unsigned long getTombstoneKey() { return ~0L - 1L; } + static unsigned getHashValue(const unsigned long& Val) { return Val * 37L; } + static bool isPod() { return true; } + static bool isEqual(const unsigned long& LHS, const unsigned long& RHS) { return LHS == RHS; } }; Modified: llvm/trunk/lib/Transforms/Scalar/GVN.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/GVN.cpp?rev=62535&r1=62534&r2=62535&view=diff ============================================================================== --- llvm/trunk/lib/Transforms/Scalar/GVN.cpp (original) +++ llvm/trunk/lib/Transforms/Scalar/GVN.cpp Mon Jan 19 16:00:18 2009 @@ -1251,7 +1251,7 @@ DenseMap::iterator LA = localAvail.find(Current); if (LA == localAvail.end()) return 0; - DenseMap::iterator V = LA->second->table.find(valno); + DenseMap::iterator V = LA->second->table.find(valno); if (V != LA->second->table.end()) { // Found an instance, record it. From clattner at apple.com Mon Jan 19 16:04:42 2009 From: clattner at apple.com (Chris Lattner) Date: Mon, 19 Jan 2009 14:04:42 -0800 Subject: [llvm-commits] [llvm] r62528 - in /llvm/trunk: lib/Support/APFloat.cpp test/CodeGen/X86/2009-01-19-fmod-constant-float.ll In-Reply-To: <200901192117.n0JLH5k1007884@zion.cs.uiuc.edu> References: <200901192117.n0JLH5k1007884@zion.cs.uiuc.edu> Message-ID: <1C1B630F-025C-4E49-BEA0-BD394D833254@apple.com> On Jan 19, 2009, at 1:17 PM, Dale Johannesen wrote: > Author: johannes > Date: Mon Jan 19 15:17:05 2009 > New Revision: 62528 > > URL: http://llvm.org/viewvc/llvm-project?rev=62528&view=rev > Log: > compile-time fmod was done incorrectly. PR 3316. Thanks Dale! > +++ llvm/trunk/test/CodeGen/X86/2009-01-19-fmod-constant-float.ll > Mon Jan 19 15:17:05 2009 > @@ -0,0 +1,77 @@ > +; RUN: llvm-as < %s | opt -std-compile-opts | llc | grep 1036831949 > | count 2 > +; RUN: llvm-as < %s | opt -std-compile-opts | llc | grep 3184315597 > | count 2 > +; check constant folding for 'frem'. PR 3316. There is no reason to run all of -std-compile-opts here, and doing so will make the test depend on *what* std-compile-opts includes. Can you please reduce this to just running the constant folding pass or something? Also, this is not an x86-specific test so it would be nice to run just constant folding + llvm-dis instead of running llc. -Chris From sabre at nondot.org Mon Jan 19 16:12:33 2009 From: sabre at nondot.org (Chris Lattner) Date: Mon, 19 Jan 2009 22:12:33 -0000 Subject: [llvm-commits] [llvm] r62536 - /llvm/trunk/test/Transforms/SimplifyCFG/2006-10-19-UncondDiv.ll Message-ID: <200901192212.n0JMCXnQ009978@zion.cs.uiuc.edu> Author: lattner Date: Mon Jan 19 16:12:33 2009 New Revision: 62536 URL: http://llvm.org/viewvc/llvm-project?rev=62536&view=rev Log: convert this to an unfoldable potentially trapping constant expr. Modified: llvm/trunk/test/Transforms/SimplifyCFG/2006-10-19-UncondDiv.ll Modified: llvm/trunk/test/Transforms/SimplifyCFG/2006-10-19-UncondDiv.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/SimplifyCFG/2006-10-19-UncondDiv.ll?rev=62536&r1=62535&r2=62536&view=diff ============================================================================== --- llvm/trunk/test/Transforms/SimplifyCFG/2006-10-19-UncondDiv.ll (original) +++ llvm/trunk/test/Transforms/SimplifyCFG/2006-10-19-UncondDiv.ll Mon Jan 19 16:12:33 2009 @@ -2,6 +2,8 @@ ; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis | \ ; RUN: not grep select + at G = extern_weak global i32 + define i32 @test(i32 %tmp) { cond_false179: %tmp181 = icmp eq i32 %tmp, 0 ; [#uses=1] @@ -9,7 +11,7 @@ cond_true182: ; preds = %cond_false179 br label %cond_next185 cond_next185: ; preds = %cond_true182, %cond_false179 - %d0.3 = phi i32 [ udiv (i32 1, i32 0), %cond_true182 ], [ %tmp, %cond_false179 ] ; [#uses=1] + %d0.3 = phi i32 [ udiv (i32 1, i32 ptrtoint (i32* @G to i32)), %cond_true182 ], [ %tmp, %cond_false179 ] ; [#uses=1] ret i32 %d0.3 } @@ -20,7 +22,7 @@ cond_true182: ; preds = %cond_false179 br label %cond_next185 cond_next185: ; preds = %cond_true182, %cond_false179 - %d0.3 = phi i32 [ udiv (i32 1, i32 0), %cond_true182 ], [ %tmp, %cond_false179 ] ; [#uses=1] + %d0.3 = phi i32 [ udiv (i32 1, i32 ptrtoint (i32* @G to i32)), %cond_true182 ], [ %tmp, %cond_false179 ] ; [#uses=1] call i32 @test( i32 4 ) ; :0 [#uses=0] ret i32 %d0.3 } From dalej at apple.com Mon Jan 19 16:33:12 2009 From: dalej at apple.com (Dale Johannesen) Date: Mon, 19 Jan 2009 22:33:12 -0000 Subject: [llvm-commits] [llvm] r62538 - in /llvm/trunk/test: CodeGen/X86/2009-01-19-fmod-constant-float.ll Transforms/InstCombine/2009-01-19-fmod-constant-float.ll Message-ID: <200901192233.n0JMXCRf010608@zion.cs.uiuc.edu> Author: johannes Date: Mon Jan 19 16:33:12 2009 New Revision: 62538 URL: http://llvm.org/viewvc/llvm-project?rev=62538&view=rev Log: Move & restructure test per review. Added: llvm/trunk/test/Transforms/InstCombine/2009-01-19-fmod-constant-float.ll Removed: llvm/trunk/test/CodeGen/X86/2009-01-19-fmod-constant-float.ll Removed: llvm/trunk/test/CodeGen/X86/2009-01-19-fmod-constant-float.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2009-01-19-fmod-constant-float.ll?rev=62537&view=auto ============================================================================== --- llvm/trunk/test/CodeGen/X86/2009-01-19-fmod-constant-float.ll (original) +++ llvm/trunk/test/CodeGen/X86/2009-01-19-fmod-constant-float.ll (removed) @@ -1,77 +0,0 @@ -; RUN: llvm-as < %s | opt -std-compile-opts | llc | grep 1036831949 | count 2 -; RUN: llvm-as < %s | opt -std-compile-opts | llc | grep 3184315597 | count 2 -; check constant folding for 'frem'. PR 3316. - -; ModuleID = 'tt.c' -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:128:128" -target triple = "i386-apple-darwin9.6" - -define float @test1() nounwind { -entry: - %retval = alloca float ; [#uses=2] - %0 = alloca float ; [#uses=2] - %"alloca point" = bitcast i32 0 to i32 ; [#uses=0] - %1 = call double @fmod(double 1.000000e-01, double 1.000000e+00) nounwind readonly ; [#uses=1] - %2 = fptrunc double %1 to float ; [#uses=1] - store float %2, float* %0, align 4 - %3 = load float* %0, align 4 ; [#uses=1] - store float %3, float* %retval, align 4 - br label %return - -return: ; preds = %entry - %retval1 = load float* %retval ; [#uses=1] - ret float %retval1 -} - -declare double @fmod(double, double) nounwind readonly - -define float @test2() nounwind { -entry: - %retval = alloca float ; [#uses=2] - %0 = alloca float ; [#uses=2] - %"alloca point" = bitcast i32 0 to i32 ; [#uses=0] - %1 = call double @fmod(double -1.000000e-01, double 1.000000e+00) nounwind readonly ; [#uses=1] - %2 = fptrunc double %1 to float ; [#uses=1] - store float %2, float* %0, align 4 - %3 = load float* %0, align 4 ; [#uses=1] - store float %3, float* %retval, align 4 - br label %return - -return: ; preds = %entry - %retval1 = load float* %retval ; [#uses=1] - ret float %retval1 -} - -define float @test3() nounwind { -entry: - %retval = alloca float ; [#uses=2] - %0 = alloca float ; [#uses=2] - %"alloca point" = bitcast i32 0 to i32 ; [#uses=0] - %1 = call double @fmod(double 1.000000e-01, double -1.000000e+00) nounwind readonly ; [#uses=1] - %2 = fptrunc double %1 to float ; [#uses=1] - store float %2, float* %0, align 4 - %3 = load float* %0, align 4 ; [#uses=1] - store float %3, float* %retval, align 4 - br label %return - -return: ; preds = %entry - %retval1 = load float* %retval ; [#uses=1] - ret float %retval1 -} - -define float @test4() nounwind { -entry: - %retval = alloca float ; [#uses=2] - %0 = alloca float ; [#uses=2] - %"alloca point" = bitcast i32 0 to i32 ; [#uses=0] - %1 = call double @fmod(double -1.000000e-01, double -1.000000e+00) nounwind readonly ; [#uses=1] - %2 = fptrunc double %1 to float ; [#uses=1] - store float %2, float* %0, align 4 - %3 = load float* %0, align 4 ; [#uses=1] - store float %3, float* %retval, align 4 - br label %return - -return: ; preds = %entry - %retval1 = load float* %retval ; [#uses=1] - ret float %retval1 -} Added: llvm/trunk/test/Transforms/InstCombine/2009-01-19-fmod-constant-float.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/2009-01-19-fmod-constant-float.ll?rev=62538&view=auto ============================================================================== --- llvm/trunk/test/Transforms/InstCombine/2009-01-19-fmod-constant-float.ll (added) +++ llvm/trunk/test/Transforms/InstCombine/2009-01-19-fmod-constant-float.ll Mon Jan 19 16:33:12 2009 @@ -0,0 +1,77 @@ +; RUN: llvm-as < %s | opt -simplifycfg -instcombine | llvm-dis | grep 0x3FB99999A0000000 | count 2 +; RUN: llvm-as < %s | opt -simplifycfg -instcombine | llvm-dis | grep 0xBFB99999A0000000 | count 2 +; check constant folding for 'frem'. PR 3316. + +; ModuleID = 'tt.c' +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:128:128" +target triple = "i386-apple-darwin9.6" + +define float @test1() nounwind { +entry: + %retval = alloca float ; [#uses=2] + %0 = alloca float ; [#uses=2] + %"alloca point" = bitcast i32 0 to i32 ; [#uses=0] + %1 = call double @fmod(double 1.000000e-01, double 1.000000e+00) nounwind readonly ; [#uses=1] + %2 = fptrunc double %1 to float ; [#uses=1] + store float %2, float* %0, align 4 + %3 = load float* %0, align 4 ; [#uses=1] + store float %3, float* %retval, align 4 + br label %return + +return: ; preds = %entry + %retval1 = load float* %retval ; [#uses=1] + ret float %retval1 +} + +declare double @fmod(double, double) nounwind readonly + +define float @test2() nounwind { +entry: + %retval = alloca float ; [#uses=2] + %0 = alloca float ; [#uses=2] + %"alloca point" = bitcast i32 0 to i32 ; [#uses=0] + %1 = call double @fmod(double -1.000000e-01, double 1.000000e+00) nounwind readonly ; [#uses=1] + %2 = fptrunc double %1 to float ; [#uses=1] + store float %2, float* %0, align 4 + %3 = load float* %0, align 4 ; [#uses=1] + store float %3, float* %retval, align 4 + br label %return + +return: ; preds = %entry + %retval1 = load float* %retval ; [#uses=1] + ret float %retval1 +} + +define float @test3() nounwind { +entry: + %retval = alloca float ; [#uses=2] + %0 = alloca float ; [#uses=2] + %"alloca point" = bitcast i32 0 to i32 ; [#uses=0] + %1 = call double @fmod(double 1.000000e-01, double -1.000000e+00) nounwind readonly ; [#uses=1] + %2 = fptrunc double %1 to float ; [#uses=1] + store float %2, float* %0, align 4 + %3 = load float* %0, align 4 ; [#uses=1] + store float %3, float* %retval, align 4 + br label %return + +return: ; preds = %entry + %retval1 = load float* %retval ; [#uses=1] + ret float %retval1 +} + +define float @test4() nounwind { +entry: + %retval = alloca float ; [#uses=2] + %0 = alloca float ; [#uses=2] + %"alloca point" = bitcast i32 0 to i32 ; [#uses=0] + %1 = call double @fmod(double -1.000000e-01, double -1.000000e+00) nounwind readonly ; [#uses=1] + %2 = fptrunc double %1 to float ; [#uses=1] + store float %2, float* %0, align 4 + %3 = load float* %0, align 4 ; [#uses=1] + store float %3, float* %retval, align 4 + br label %return + +return: ; preds = %entry + %retval1 = load float* %retval ; [#uses=1] + ret float %retval1 +} From gohman at apple.com Mon Jan 19 16:39:37 2009 From: gohman at apple.com (Dan Gohman) Date: Mon, 19 Jan 2009 22:39:37 -0000 Subject: [llvm-commits] [llvm] r62539 - in /llvm/trunk: include/llvm/CodeGen/SelectionDAG.h include/llvm/CodeGen/SelectionDAGNodes.h lib/CodeGen/SelectionDAG/SelectionDAG.cpp Message-ID: <200901192239.n0JMdboM010810@zion.cs.uiuc.edu> Author: djg Date: Mon Jan 19 16:39:36 2009 New Revision: 62539 URL: http://llvm.org/viewvc/llvm-project?rev=62539&view=rev Log: Remove SDNode's virtual destructor. This makes it impossible for SDNode subclasses to keep state that requires non-trivial destructors, however it was already effectively impossible, since the destructor isn't actually ever called. There currently aren't any SDNode subclasses affected by this, and in general it's desireable to keep SDNode objects light-weight. This eliminates the last virtual member function in the SDNode class, so it eliminates the need for a vtable pointer, making SDNode smaller. Modified: llvm/trunk/include/llvm/CodeGen/SelectionDAG.h llvm/trunk/include/llvm/CodeGen/SelectionDAGNodes.h llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp Modified: llvm/trunk/include/llvm/CodeGen/SelectionDAG.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/SelectionDAG.h?rev=62539&r1=62538&r2=62539&view=diff ============================================================================== --- llvm/trunk/include/llvm/CodeGen/SelectionDAG.h (original) +++ llvm/trunk/include/llvm/CodeGen/SelectionDAG.h Mon Jan 19 16:39:36 2009 @@ -800,6 +800,7 @@ void *&InsertPos); void DeleteNodeNotInCSEMaps(SDNode *N); + void DeallocateNode(SDNode *N); unsigned getMVTAlignment(MVT MemoryVT) const; Modified: llvm/trunk/include/llvm/CodeGen/SelectionDAGNodes.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/SelectionDAGNodes.h?rev=62539&r1=62538&r2=62539&view=diff ============================================================================== --- llvm/trunk/include/llvm/CodeGen/SelectionDAGNodes.h (original) +++ llvm/trunk/include/llvm/CodeGen/SelectionDAGNodes.h Mon Jan 19 16:39:36 2009 @@ -1119,14 +1119,7 @@ /// addUse - add SDUse to the list of uses. void addUse(SDUse &U) { U.addToList(&Uses); } - // Out-of-line virtual method to give class a home. - virtual void ANCHOR(); public: - virtual ~SDNode() { - assert(NumOperands == 0 && "Operand list not cleared before deletion"); - NodeType = ISD::DELETED_NODE; - } - //===--------------------------------------------------------------------===// // Accessors // @@ -1470,7 +1463,6 @@ /// UnarySDNode - This class is used for single-operand SDNodes. This is solely /// to allow co-allocation of node operands with the node itself. class UnarySDNode : public SDNode { - virtual void ANCHOR(); // Out-of-line virtual method to give class a home. SDUse Op; public: UnarySDNode(unsigned Opc, SDVTList VTs, SDValue X) @@ -1483,7 +1475,6 @@ /// BinarySDNode - This class is used for two-operand SDNodes. This is solely /// to allow co-allocation of node operands with the node itself. class BinarySDNode : public SDNode { - virtual void ANCHOR(); // Out-of-line virtual method to give class a home. SDUse Ops[2]; public: BinarySDNode(unsigned Opc, SDVTList VTs, SDValue X, SDValue Y) @@ -1497,7 +1488,6 @@ /// TernarySDNode - This class is used for three-operand SDNodes. This is solely /// to allow co-allocation of node operands with the node itself. class TernarySDNode : public SDNode { - virtual void ANCHOR(); // Out-of-line virtual method to give class a home. SDUse Ops[3]; public: TernarySDNode(unsigned Opc, SDVTList VTs, SDValue X, SDValue Y, @@ -1516,7 +1506,6 @@ /// operand. This node should be directly created by end-users and not added to /// the AllNodes list. class HandleSDNode : public SDNode { - virtual void ANCHOR(); // Out-of-line virtual method to give class a home. SDUse Op; public: // FIXME: Remove the "noinline" attribute once is @@ -1536,8 +1525,6 @@ /// Abstact virtual class for operations for memory operations class MemSDNode : public SDNode { - virtual void ANCHOR(); // Out-of-line virtual method to give class a home. - private: // MemoryVT - VT of in-memory value. MVT MemoryVT; @@ -1613,10 +1600,9 @@ /// AtomicSDNode - A SDNode reprenting atomic operations. /// class AtomicSDNode : public MemSDNode { - virtual void ANCHOR(); // Out-of-line virtual method to give class a home. SDUse Ops[4]; - public: +public: // Opc: opcode for atomic // VTL: value type list // Chain: memory chain for operaand @@ -1678,7 +1664,6 @@ /// memory and need an associated memory operand. /// class MemIntrinsicSDNode : public MemSDNode { - virtual void ANCHOR(); // Out-of-line virtual method to give class a home. bool ReadMem; // Intrinsic reads memory bool WriteMem; // Intrinsic writes memory public: @@ -1706,7 +1691,6 @@ class ConstantSDNode : public SDNode { const ConstantInt *Value; - virtual void ANCHOR(); // Out-of-line virtual method to give class a home. protected: friend class SelectionDAG; ConstantSDNode(bool isTarget, const ConstantInt *val, MVT VT) @@ -1732,7 +1716,6 @@ class ConstantFPSDNode : public SDNode { const ConstantFP *Value; - virtual void ANCHOR(); // Out-of-line virtual method to give class a home. protected: friend class SelectionDAG; ConstantFPSDNode(bool isTarget, const ConstantFP *val, MVT VT) @@ -1776,7 +1759,6 @@ class GlobalAddressSDNode : public SDNode { GlobalValue *TheGlobal; int64_t Offset; - virtual void ANCHOR(); // Out-of-line virtual method to give class a home. protected: friend class SelectionDAG; GlobalAddressSDNode(bool isTarget, const GlobalValue *GA, MVT VT, @@ -1797,7 +1779,6 @@ class FrameIndexSDNode : public SDNode { int FI; - virtual void ANCHOR(); // Out-of-line virtual method to give class a home. protected: friend class SelectionDAG; FrameIndexSDNode(int fi, MVT VT, bool isTarg) @@ -1817,7 +1798,6 @@ class JumpTableSDNode : public SDNode { int JTI; - virtual void ANCHOR(); // Out-of-line virtual method to give class a home. protected: friend class SelectionDAG; JumpTableSDNode(int jti, MVT VT, bool isTarg) @@ -1842,7 +1822,6 @@ } Val; int Offset; // It's a MachineConstantPoolValue if top bit is set. unsigned Alignment; - virtual void ANCHOR(); // Out-of-line virtual method to give class a home. protected: friend class SelectionDAG; ConstantPoolSDNode(bool isTarget, Constant *c, MVT VT, int o=0) @@ -1908,7 +1887,6 @@ class BasicBlockSDNode : public SDNode { MachineBasicBlock *MBB; - virtual void ANCHOR(); // Out-of-line virtual method to give class a home. protected: friend class SelectionDAG; explicit BasicBlockSDNode(MachineBasicBlock *mbb) @@ -1934,7 +1912,6 @@ /// class SrcValueSDNode : public SDNode { const Value *V; - virtual void ANCHOR(); // Out-of-line virtual method to give class a home. protected: friend class SelectionDAG; /// Create a SrcValue for a general value. @@ -1957,7 +1934,6 @@ /// and ISD::STORE have been lowered. /// class MemOperandSDNode : public SDNode { - virtual void ANCHOR(); // Out-of-line virtual method to give class a home. protected: friend class SelectionDAG; /// Create a MachineMemOperand node @@ -1977,7 +1953,6 @@ class RegisterSDNode : public SDNode { unsigned Reg; - virtual void ANCHOR(); // Out-of-line virtual method to give class a home. protected: friend class SelectionDAG; RegisterSDNode(unsigned reg, MVT VT) @@ -1998,7 +1973,6 @@ unsigned Line; unsigned Column; Value *CU; - virtual void ANCHOR(); // Out-of-line virtual method to give class a home. protected: friend class SelectionDAG; DbgStopPointSDNode(SDValue ch, unsigned l, unsigned c, @@ -2022,7 +1996,6 @@ class LabelSDNode : public SDNode { SDUse Chain; unsigned LabelID; - virtual void ANCHOR(); // Out-of-line virtual method to give class a home. protected: friend class SelectionDAG; LabelSDNode(unsigned NodeTy, SDValue ch, unsigned id) @@ -2042,7 +2015,6 @@ class ExternalSymbolSDNode : public SDNode { const char *Symbol; - virtual void ANCHOR(); // Out-of-line virtual method to give class a home. protected: friend class SelectionDAG; ExternalSymbolSDNode(bool isTarget, const char *Sym, MVT VT) @@ -2062,7 +2034,6 @@ class CondCodeSDNode : public SDNode { ISD::CondCode Condition; - virtual void ANCHOR(); // Out-of-line virtual method to give class a home. protected: friend class SelectionDAG; explicit CondCodeSDNode(ISD::CondCode Cond) @@ -2082,7 +2053,6 @@ /// future and most targets don't support it. class CvtRndSatSDNode : public SDNode { ISD::CvtCode CvtCode; - virtual void ANCHOR(); // Out-of-line virtual method to give class a home. protected: friend class SelectionDAG; explicit CvtRndSatSDNode(MVT VT, const SDValue *Ops, unsigned NumOps, @@ -2187,7 +2157,6 @@ /// ARG_FLAGSSDNode - Leaf node holding parameter flags. class ARG_FLAGSSDNode : public SDNode { ISD::ArgFlagsTy TheFlags; - virtual void ANCHOR(); // Out-of-line virtual method to give class a home. protected: friend class SelectionDAG; explicit ARG_FLAGSSDNode(ISD::ArgFlagsTy Flags) @@ -2211,7 +2180,6 @@ // will expand the size of the representation. At the moment we only // need Inreg. bool Inreg; - virtual void ANCHOR(); // Out-of-line virtual method to give class a home. protected: friend class SelectionDAG; CallSDNode(unsigned cc, bool isvararg, bool istailcall, bool isinreg, @@ -2256,7 +2224,6 @@ /// to parameterize some operations. class VTSDNode : public SDNode { MVT ValueType; - virtual void ANCHOR(); // Out-of-line virtual method to give class a home. protected: friend class SelectionDAG; explicit VTSDNode(MVT VT) @@ -2323,7 +2290,6 @@ /// LoadSDNode - This class is used to represent ISD::LOAD nodes. /// class LoadSDNode : public LSBaseSDNode { - virtual void ANCHOR(); // Out-of-line virtual method to give class a home. protected: friend class SelectionDAG; LoadSDNode(SDValue *ChainPtrOff, SDVTList VTs, @@ -2353,7 +2319,6 @@ /// StoreSDNode - This class is used to represent ISD::STORE nodes. /// class StoreSDNode : public LSBaseSDNode { - virtual void ANCHOR(); // Out-of-line virtual method to give class a home. protected: friend class SelectionDAG; StoreSDNode(SDValue *ChainValuePtrOff, SDVTList VTs, Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp?rev=62539&r1=62538&r2=62539&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp Mon Jan 19 16:39:36 2009 @@ -557,14 +557,7 @@ DeadNodes.push_back(Operand); } - if (N->OperandsNeedDelete) - delete[] N->OperandList; - - N->OperandList = 0; - N->NumOperands = 0; - - // Finally, remove N itself. - NodeAllocator.Deallocate(AllNodes.remove(N)); + DeallocateNode(N); } } @@ -585,16 +578,23 @@ } void SelectionDAG::DeleteNodeNotInCSEMaps(SDNode *N) { + assert(N != AllNodes.begin()); + // 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) { + DeallocateNode(N); +} + +void SelectionDAG::DeallocateNode(SDNode *N) { + if (N->OperandsNeedDelete) delete[] N->OperandList; - N->OperandList = 0; - } - assert(N != AllNodes.begin()); + // Set the opcode to DELETED_NODE to help catch bugs when node + // memory is reallocated. + N->NodeType = ISD::DELETED_NODE; + NodeAllocator.Deallocate(AllNodes.remove(N)); } @@ -786,17 +786,8 @@ void SelectionDAG::allnodes_clear() { assert(&*AllNodes.begin() == &EntryNode); AllNodes.remove(AllNodes.begin()); - while (!AllNodes.empty()) { - SDNode *N = AllNodes.remove(AllNodes.begin()); - N->SetNextInBucket(0); - - if (N->OperandsNeedDelete) { - delete [] N->OperandList; - N->OperandList = 0; - } - - NodeAllocator.Deallocate(N); - } + while (!AllNodes.empty()) + DeallocateNode(AllNodes.begin()); } void SelectionDAG::clear() { @@ -4737,36 +4728,6 @@ // SDNode Class //===----------------------------------------------------------------------===// -// Out-of-line virtual method to give class a home. -void SDNode::ANCHOR() {} -void UnarySDNode::ANCHOR() {} -void BinarySDNode::ANCHOR() {} -void TernarySDNode::ANCHOR() {} -void HandleSDNode::ANCHOR() {} -void ConstantSDNode::ANCHOR() {} -void ConstantFPSDNode::ANCHOR() {} -void GlobalAddressSDNode::ANCHOR() {} -void FrameIndexSDNode::ANCHOR() {} -void JumpTableSDNode::ANCHOR() {} -void ConstantPoolSDNode::ANCHOR() {} -void BasicBlockSDNode::ANCHOR() {} -void SrcValueSDNode::ANCHOR() {} -void MemOperandSDNode::ANCHOR() {} -void RegisterSDNode::ANCHOR() {} -void DbgStopPointSDNode::ANCHOR() {} -void LabelSDNode::ANCHOR() {} -void ExternalSymbolSDNode::ANCHOR() {} -void CondCodeSDNode::ANCHOR() {} -void ARG_FLAGSSDNode::ANCHOR() {} -void VTSDNode::ANCHOR() {} -void MemSDNode::ANCHOR() {} -void LoadSDNode::ANCHOR() {} -void StoreSDNode::ANCHOR() {} -void AtomicSDNode::ANCHOR() {} -void MemIntrinsicSDNode::ANCHOR() {} -void CallSDNode::ANCHOR() {} -void CvtRndSatSDNode::ANCHOR() {} - HandleSDNode::~HandleSDNode() { DropOperands(); } From sabre at nondot.org Mon Jan 19 17:03:14 2009 From: sabre at nondot.org (Chris Lattner) Date: Mon, 19 Jan 2009 23:03:14 -0000 Subject: [llvm-commits] [llvm] r62541 - in /llvm/trunk: lib/Transforms/Utils/SimplifyCFG.cpp test/Transforms/SimplifyCFG/2009-01-19-UnconditionalTrappingConstantExpr.ll Message-ID: <200901192303.n0JN3E0H011531@zion.cs.uiuc.edu> Author: lattner Date: Mon Jan 19 17:03:13 2009 New Revision: 62541 URL: http://llvm.org/viewvc/llvm-project?rev=62541&view=rev Log: Fix a problem exposed by PR3354: simplifycfg was making a potentially trapping instruction be executed unconditionally. Added: llvm/trunk/test/Transforms/SimplifyCFG/2009-01-19-UnconditionalTrappingConstantExpr.ll Modified: llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp Modified: llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp?rev=62541&r1=62540&r2=62541&view=diff ============================================================================== --- llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp (original) +++ llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp Mon Jan 19 17:03:13 2009 @@ -1423,11 +1423,21 @@ if ((!isa(Cond) && !isa(Cond)) || Cond->getParent() != BB || &BB->front() != Cond || !Cond->hasOneUse()) return false; - + // Make sure the instruction after the condition is the cond branch. BasicBlock::iterator CondIt = Cond; ++CondIt; if (&*CondIt != BI) return false; + + // Cond is known to be a compare or binary operator. Check to make sure that + // neither operand is a potentially-trapping constant expression. + if (ConstantExpr *CE = dyn_cast(Cond->getOperand(0))) + if (CE->canTrap()) + return false; + if (ConstantExpr *CE = dyn_cast(Cond->getOperand(1))) + if (CE->canTrap()) + return false; + // Finally, don't infinitely unroll conditional loops. BasicBlock *TrueDest = BI->getSuccessor(0); @@ -1438,6 +1448,7 @@ for (pred_iterator PI = pred_begin(BB), E = pred_end(BB); PI != E; ++PI) { BasicBlock *PredBlock = *PI; BranchInst *PBI = dyn_cast(PredBlock->getTerminator()); + // Check that we have two conditional branches. If there is a PHI node in // the common successor, verify that the same value flows in from both // blocks. @@ -1459,6 +1470,8 @@ else continue; + DOUT << "FOLDING BRANCH TO COMMON DEST:\n" << *PBI << *BB; + // If we need to invert the condition in the pred block to match, do so now. if (InvertPredCond) { Value *NewCond = Added: llvm/trunk/test/Transforms/SimplifyCFG/2009-01-19-UnconditionalTrappingConstantExpr.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/SimplifyCFG/2009-01-19-UnconditionalTrappingConstantExpr.ll?rev=62541&view=auto ============================================================================== --- llvm/trunk/test/Transforms/SimplifyCFG/2009-01-19-UnconditionalTrappingConstantExpr.ll (added) +++ llvm/trunk/test/Transforms/SimplifyCFG/2009-01-19-UnconditionalTrappingConstantExpr.ll Mon Jan 19 17:03:13 2009 @@ -0,0 +1,20 @@ +; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis | grep {br i1 } | count 2 +; PR3354 +; Do not merge bb1 into the entry block, it might trap. + + at G = extern_weak global i32 + +define i32 @test(i32 %tmp21, i32 %tmp24) { + %tmp25 = icmp sle i32 %tmp21, %tmp24 + br i1 %tmp25, label %bb2, label %bb1 + +bb1: ; preds = %bb + %tmp26 = icmp sgt i32 sdiv (i32 -32768, i32 ptrtoint (i32* @G to i32)), 0 + br i1 %tmp26, label %bb6, label %bb2 +bb2: + ret i32 42 + +bb6: + unwind +} + From isanbard at gmail.com Mon Jan 19 17:15:05 2009 From: isanbard at gmail.com (Bill Wendling) Date: Mon, 19 Jan 2009 23:15:05 -0000 Subject: [llvm-commits] [llvm] r62543 - /llvm/tags/Apple/llvmCore-2092/ Message-ID: <200901192315.n0JNF57k011986@zion.cs.uiuc.edu> Author: void Date: Mon Jan 19 17:15:05 2009 New Revision: 62543 URL: http://llvm.org/viewvc/llvm-project?rev=62543&view=rev Log: Creating llvmCore-2092 branch Added: llvm/tags/Apple/llvmCore-2092/ - copied from r62542, llvm/trunk/ From isanbard at gmail.com Mon Jan 19 17:15:14 2009 From: isanbard at gmail.com (Bill Wendling) Date: Mon, 19 Jan 2009 23:15:14 -0000 Subject: [llvm-commits] [llvm-gcc-4.2] r62544 - /llvm-gcc-4.2/tags/Apple/llvmgcc42-2092/ Message-ID: <200901192315.n0JNFEo5012000@zion.cs.uiuc.edu> Author: void Date: Mon Jan 19 17:15:13 2009 New Revision: 62544 URL: http://llvm.org/viewvc/llvm-project?rev=62544&view=rev Log: Creating llvmgcc42-2092 branch Added: llvm-gcc-4.2/tags/Apple/llvmgcc42-2092/ - copied from r62543, llvm-gcc-4.2/trunk/ From dpatel at apple.com Mon Jan 19 17:21:49 2009 From: dpatel at apple.com (Devang Patel) Date: Mon, 19 Jan 2009 23:21:49 -0000 Subject: [llvm-commits] [llvm] r62545 - in /llvm/trunk: include/llvm/Analysis/DebugInfo.h lib/Analysis/DebugInfo.cpp lib/CodeGen/AsmPrinter/DwarfWriter.cpp lib/CodeGen/SelectionDAG/FastISel.cpp lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp Message-ID: <200901192321.n0JNLnaw012245@zion.cs.uiuc.edu> Author: dpatel Date: Mon Jan 19 17:21:49 2009 New Revision: 62545 URL: http://llvm.org/viewvc/llvm-project?rev=62545&view=rev Log: Verify debug info. Modified: llvm/trunk/include/llvm/Analysis/DebugInfo.h llvm/trunk/lib/Analysis/DebugInfo.cpp llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp llvm/trunk/lib/CodeGen/SelectionDAG/FastISel.cpp llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp Modified: llvm/trunk/include/llvm/Analysis/DebugInfo.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Analysis/DebugInfo.h?rev=62545&r1=62544&r2=62545&view=diff ============================================================================== --- llvm/trunk/include/llvm/Analysis/DebugInfo.h (original) +++ llvm/trunk/include/llvm/Analysis/DebugInfo.h Mon Jan 19 17:21:49 2009 @@ -78,6 +78,7 @@ unsigned getTag() const { return getUnsignedField(0) & ~VersionMask; } + }; /// DIAnchor - A wrapper for various anchor descriptors. @@ -117,6 +118,8 @@ std::string getFilename() const { return getStringField(3); } std::string getDirectory() const { return getStringField(4); } std::string getProducer() const { return getStringField(5); } + /// Verify - Verify that a compile unit is well formed. + bool Verify() const; }; /// DIEnumerator - A wrapper for an enumerator (e.g. X and Y in 'enum {X,Y}'). @@ -155,6 +158,8 @@ return TAG == dwarf::DW_TAG_base_type; } + /// Verify - Verify that a type descriptor is well formed. + bool Verify() const; public: explicit DIType(GlobalVariable *GV); explicit DIType() {} @@ -217,6 +222,9 @@ DIArray getTypeArray() const { return getFieldAs(10); } std::string getFilename() const { return getStringField(11); } std::string getDirectory() const { return getStringField(12); } + + /// Verify - Verify that a composite type descriptor is well formed. + bool Verify() const; }; /// DIGlobal - This is a common class for global variables and subprograms. @@ -273,6 +281,9 @@ std::string getFilename() const { return getStringField(11); } std::string getDirectory() const { return getStringField(12); } DICompositeType getType() const { return getFieldAs(8); } + + /// Verify - Verify that a subprogram descriptor is well formed. + bool Verify() const; }; /// DIGlobalVariable - This is a wrapper for a global variable. @@ -283,6 +294,9 @@ GlobalVariable *getGlobal() const { return getGlobalVariableField(11); } std::string getFilename() const { return getStringField(12); } std::string getDirectory() const { return getStringField(13); } + + /// Verify - Verify that a global variable descriptor is well formed. + bool Verify() const; }; @@ -303,6 +317,9 @@ /// isVariable - Return true if the specified tag is legal for DIVariable. static bool isVariable(unsigned Tag); + + /// Verify - Verify that a variable descriptor is well formed. + bool Verify() const; }; Modified: llvm/trunk/lib/Analysis/DebugInfo.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/DebugInfo.cpp?rev=62545&r1=62544&r2=62545&view=diff ============================================================================== --- llvm/trunk/lib/Analysis/DebugInfo.cpp (original) +++ llvm/trunk/lib/Analysis/DebugInfo.cpp Mon Jan 19 17:21:49 2009 @@ -180,6 +180,100 @@ return C->getNumOperands(); } +/// Verify - Verify that a compile unit is well formed. +bool DICompileUnit::Verify() const { + if (isNull()) + return false; + if (getFilename().empty()) + return false; + // It is possible that directory and produce string is empty. + return true; +} + +/// Verify - Verify that a type descriptor is well formed. +bool DIType::Verify() const { + if (isNull()) + return false; + if (getContext().isNull()) + return false; + + DICompileUnit CU = getCompileUnit(); + if (!CU.isNull() && !CU.Verify()) + return false; + return true; +} + +/// Verify - Verify that a composite type descriptor is well formed. +bool DICompositeType::Verify() const { + if (isNull()) + return false; + if (getContext().isNull()) + return false; + + DICompileUnit CU = getCompileUnit(); + if (!CU.isNull() && !CU.Verify()) + return false; + return true; +} + +/// Verify - Verify that a subprogram descriptor is well formed. +bool DISubprogram::Verify() const { + if (isNull()) + return false; + + if (getContext().isNull()) + return false; + + DICompileUnit CU = getCompileUnit(); + if (!CU.Verify()) + return false; + + DICompositeType Ty = getType(); + if (!Ty.isNull() && !Ty.Verify()) + return false; + return true; +} + +/// Verify - Verify that a global variable descriptor is well formed. +bool DIGlobalVariable::Verify() const { + if (isNull()) + return false; + + if (getContext().isNull()) + return false; + + DICompileUnit CU = getCompileUnit(); + if (!CU.Verify()) + return false; + + DIType Ty = getType(); + if (!Ty.Verify()) + return false; + + if (!getGlobal()) + return false; + + return true; +} + +/// Verify - Verify that a variable descriptor is well formed. +bool DIVariable::Verify() const { + if (isNull()) + return false; + + if (getContext().isNull()) + return false; + + DIType Ty = getType(); + if (!Ty.Verify()) + return false; + + + return true; +} + + + //===----------------------------------------------------------------------===// // DIFactory: Basic Helpers //===----------------------------------------------------------------------===// Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp?rev=62545&r1=62544&r2=62545&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp (original) +++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp Mon Jan 19 17:21:49 2009 @@ -3029,6 +3029,9 @@ /// ValidDebugInfo - Return true if V represents valid debug info value. bool ValidDebugInfo(Value *V) { + if (!V) + return false; + if (!shouldEmit) return false; @@ -3046,7 +3049,21 @@ if (Version != DIDescriptor::Version7 && Version != DIDescriptor::Version6) return false; - //FIXME - Check individual descriptors. + unsigned Tag = DI.getTag(); + switch (Tag) { + case DW_TAG_variable: + assert (DIVariable(GV).Verify() && "Invalid DebugInfo value"); + break; + case DW_TAG_compile_unit: + assert (DICompileUnit(GV).Verify() && "Invalid DebugInfo value"); + break; + case DW_TAG_subprogram: + assert (DISubprogram(GV).Verify() && "Invalid DebugInfo value"); + break; + default: + break; + } + return true; } Modified: llvm/trunk/lib/CodeGen/SelectionDAG/FastISel.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/FastISel.cpp?rev=62545&r1=62544&r2=62545&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/FastISel.cpp (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/FastISel.cpp Mon Jan 19 17:21:49 2009 @@ -317,7 +317,7 @@ default: break; case Intrinsic::dbg_stoppoint: { DbgStopPointInst *SPI = cast(I); - if (DW && SPI->getContext() && DW->ValidDebugInfo(SPI->getContext())) { + if (DW && DW->ValidDebugInfo(SPI->getContext())) { DICompileUnit CU(cast(SPI->getContext())); unsigned SrcFile = DW->RecordSource(CU.getDirectory(), CU.getFilename()); @@ -331,7 +331,7 @@ } case Intrinsic::dbg_region_start: { DbgRegionStartInst *RSI = cast(I); - if (DW && RSI->getContext() && DW->ValidDebugInfo(RSI->getContext())) { + if (DW && DW->ValidDebugInfo(RSI->getContext())) { unsigned ID = DW->RecordRegionStart(cast(RSI->getContext())); const TargetInstrDesc &II = TII.get(TargetInstrInfo::DBG_LABEL); @@ -341,7 +341,7 @@ } case Intrinsic::dbg_region_end: { DbgRegionEndInst *REI = cast(I); - if (DW && REI->getContext() && DW->ValidDebugInfo(REI->getContext())) { + if (DW && DW->ValidDebugInfo(REI->getContext())) { unsigned ID = DW->RecordRegionEnd(cast(REI->getContext())); const TargetInstrDesc &II = TII.get(TargetInstrInfo::DBG_LABEL); @@ -353,7 +353,7 @@ if (!DW) return true; DbgFuncStartInst *FSI = cast(I); Value *SP = FSI->getSubprogram(); - if (SP && DW->ValidDebugInfo(SP)) { + if (DW->ValidDebugInfo(SP)) { // llvm.dbg.func.start implicitly defines a dbg_stoppoint which is // what (most?) gdb expects. DISubprogram Subprogram(cast(SP)); @@ -375,7 +375,7 @@ case Intrinsic::dbg_declare: { DbgDeclareInst *DI = cast(I); Value *Variable = DI->getVariable(); - if (DW && Variable && DW->ValidDebugInfo(Variable)) { + if (DW && DW->ValidDebugInfo(Variable)) { // Determine the address of the declared object. Value *Address = DI->getAddress(); if (BitCastInst *BCI = dyn_cast(Address)) Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp?rev=62545&r1=62544&r2=62545&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp Mon Jan 19 17:21:49 2009 @@ -3747,7 +3747,7 @@ case Intrinsic::dbg_stoppoint: { DwarfWriter *DW = DAG.getDwarfWriter(); DbgStopPointInst &SPI = cast(I); - if (DW && SPI.getContext() && DW->ValidDebugInfo(SPI.getContext())) + if (DW && DW->ValidDebugInfo(SPI.getContext())) DAG.setRoot(DAG.getDbgStopPoint(getRoot(), SPI.getLine(), SPI.getColumn(), @@ -3757,7 +3757,7 @@ case Intrinsic::dbg_region_start: { DwarfWriter *DW = DAG.getDwarfWriter(); DbgRegionStartInst &RSI = cast(I); - if (DW && RSI.getContext() && DW->ValidDebugInfo(RSI.getContext())) { + if (DW && DW->ValidDebugInfo(RSI.getContext())) { unsigned LabelID = DW->RecordRegionStart(cast(RSI.getContext())); DAG.setRoot(DAG.getLabel(ISD::DBG_LABEL, getRoot(), LabelID)); @@ -3768,7 +3768,7 @@ case Intrinsic::dbg_region_end: { DwarfWriter *DW = DAG.getDwarfWriter(); DbgRegionEndInst &REI = cast(I); - if (DW && REI.getContext() && DW->ValidDebugInfo(REI.getContext())) { + if (DW && DW->ValidDebugInfo(REI.getContext())) { unsigned LabelID = DW->RecordRegionEnd(cast(REI.getContext())); DAG.setRoot(DAG.getLabel(ISD::DBG_LABEL, getRoot(), LabelID)); @@ -3803,7 +3803,7 @@ DwarfWriter *DW = DAG.getDwarfWriter(); DbgDeclareInst &DI = cast(I); Value *Variable = DI.getVariable(); - if (DW && Variable && DW->ValidDebugInfo(Variable)) + if (DW && DW->ValidDebugInfo(Variable)) DAG.setRoot(DAG.getNode(ISD::DECLARE, MVT::Other, getRoot(), getValue(DI.getAddress()), getValue(Variable))); return 0; From isanbard at gmail.com Mon Jan 19 17:43:57 2009 From: isanbard at gmail.com (Bill Wendling) Date: Mon, 19 Jan 2009 23:43:57 -0000 Subject: [llvm-commits] [llvm] r62546 - /llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp Message-ID: <200901192343.n0JNhvNs012937@zion.cs.uiuc.edu> Author: void Date: Mon Jan 19 17:43:56 2009 New Revision: 62546 URL: http://llvm.org/viewvc/llvm-project?rev=62546&view=rev Log: Doxygen-ify comments. Modified: llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp Modified: llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp?rev=62546&r1=62545&r2=62546&view=diff ============================================================================== --- llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp (original) +++ llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp Mon Jan 19 17:43:56 2009 @@ -74,11 +74,11 @@ PN->addIncoming(PN->getIncomingValueForBlock(ExistPred), NewPred); } -// CanPropagatePredecessorsForPHIs - Return true if we can fold BB, an -// almost-empty BB ending in an unconditional branch to Succ, into succ. -// -// Assumption: Succ is the single successor for BB. -// +/// CanPropagatePredecessorsForPHIs - Return true if we can fold BB, an +/// almost-empty BB ending in an unconditional branch to Succ, into succ. +/// +/// Assumption: Succ is the single successor for BB. +/// static bool CanPropagatePredecessorsForPHIs(BasicBlock *BB, BasicBlock *Succ) { assert(*succ_begin(BB) == Succ && "Succ is not successor of BB!"); @@ -347,15 +347,15 @@ } -// If we have a merge point of an "if condition" as accepted above, return true -// if the specified value dominates the block. We don't handle the true -// generality of domination here, just a special case which works well enough -// for us. -// -// If AggressiveInsts is non-null, and if V does not dominate BB, we check to -// see if V (which must be an instruction) is cheap to compute and is -// non-trapping. If both are true, the instruction is inserted into the set and -// true is returned. +/// DominatesMergePoint - If we have a merge point of an "if condition" as +/// accepted above, return true if the specified value dominates the block. We +/// don't handle the true generality of domination here, just a special case +/// which works well enough for us. +/// +/// If AggressiveInsts is non-null, and if V does not dominate BB, we check to +/// see if V (which must be an instruction) is cheap to compute and is +/// non-trapping. If both are true, the instruction is inserted into the set +/// and true is returned. static bool DominatesMergePoint(Value *V, BasicBlock *BB, std::set *AggressiveInsts) { Instruction *I = dyn_cast(V); @@ -426,9 +426,9 @@ return true; } -// GatherConstantSetEQs - Given a potentially 'or'd together collection of -// icmp_eq instructions that compare a value against a constant, return the -// value being compared, and stick the constant into the Values vector. +/// GatherConstantSetEQs - Given a potentially 'or'd together collection of +/// icmp_eq instructions that compare a value against a constant, return the +/// value being compared, and stick the constant into the Values vector. static Value *GatherConstantSetEQs(Value *V, std::vector &Values){ if (Instruction *Inst = dyn_cast(V)) { if (Inst->getOpcode() == Instruction::ICmp && @@ -450,9 +450,9 @@ return 0; } -// GatherConstantSetNEs - Given a potentially 'and'd together collection of -// setne instructions that compare a value against a constant, return the value -// being compared, and stick the constant into the Values vector. +/// GatherConstantSetNEs - Given a potentially 'and'd together collection of +/// setne instructions that compare a value against a constant, return the value +/// being compared, and stick the constant into the Values vector. static Value *GatherConstantSetNEs(Value *V, std::vector &Values){ if (Instruction *Inst = dyn_cast(V)) { if (Inst->getOpcode() == Instruction::ICmp && @@ -474,8 +474,6 @@ return 0; } - - /// GatherValueComparisons - If the specified Cond is an 'and' or 'or' of a /// bunch of comparisons of one value against constants, return the value and /// the constants being compared. @@ -532,8 +530,8 @@ return 0; } -/// Given a value comparison instruction, decode all of the 'cases' that it -/// represents and return the 'default' block. +/// GetValueEqualityComparisonCases - Given a value comparison instruction, +/// decode all of the 'cases' that it represents and return the 'default' block. static BasicBlock * GetValueEqualityComparisonCases(TerminatorInst *TI, std::vector > &Cases) { for (unsigned i = 0, e = Cases.size(); i != e; ++i) @@ -565,8 +563,8 @@ } } -// ValuesOverlap - Return true if there are any keys in C1 that exist in C2 as -// well. +/// ValuesOverlap - Return true if there are any keys in C1 that exist in C2 as +/// well. static bool ValuesOverlap(std::vector > &C1, std::vector > &C2) { @@ -600,12 +598,12 @@ return false; } -// SimplifyEqualityComparisonWithOnlyPredecessor - If TI is known to be a -// terminator instruction and its block is known to only have a single -// predecessor block, check to see if that predecessor is also a value -// comparison with the same value, and if that comparison determines the outcome -// of this comparison. If so, simplify TI. This does a very limited form of -// jump threading. +/// SimplifyEqualityComparisonWithOnlyPredecessor - If TI is known to be a +/// terminator instruction and its block is known to only have a single +/// predecessor block, check to see if that predecessor is also a value +/// comparison with the same value, and if that comparison determines the +/// outcome of this comparison. If so, simplify TI. This does a very limited +/// form of jump threading. static bool SimplifyEqualityComparisonWithOnlyPredecessor(TerminatorInst *TI, BasicBlock *Pred) { Value *PredVal = isValueEqualityComparison(Pred->getTerminator()); @@ -716,10 +714,10 @@ return false; } -// FoldValueComparisonIntoPredecessors - The specified terminator is a value -// equality comparison instruction (either a switch or a branch on "X == c"). -// See if any of the predecessors of the terminator block are value comparisons -// on the same value. If so, and if safe to do so, fold them together. +/// FoldValueComparisonIntoPredecessors - The specified terminator is a value +/// equality comparison instruction (either a switch or a branch on "X == c"). +/// See if any of the predecessors of the terminator block are value comparisons +/// on the same value. If so, and if safe to do so, fold them together. static bool FoldValueComparisonIntoPredecessors(TerminatorInst *TI) { BasicBlock *BB = TI->getParent(); Value *CV = isValueEqualityComparison(TI); // CondVal @@ -1684,13 +1682,13 @@ }; } -// SimplifyCFG - This function is used to do simplification of a CFG. For -// example, it adjusts branches to branches to eliminate the extra hop, it -// eliminates unreachable basic blocks, and does other "peephole" optimization -// of the CFG. It returns true if a modification was made. -// -// WARNING: The entry node of a function may not be simplified. -// +/// SimplifyCFG - This function is used to do simplification of a CFG. For +/// example, it adjusts branches to branches to eliminate the extra hop, it +/// eliminates unreachable basic blocks, and does other "peephole" optimization +/// of the CFG. It returns true if a modification was made. +/// +/// WARNING: The entry node of a function may not be simplified. +/// bool llvm::SimplifyCFG(BasicBlock *BB) { bool Changed = false; Function *M = BB->getParent(); From evan.cheng at apple.com Mon Jan 19 18:16:19 2009 From: evan.cheng at apple.com (Evan Cheng) Date: Tue, 20 Jan 2009 00:16:19 -0000 Subject: [llvm-commits] [llvm] r62547 - in /llvm/trunk: lib/CodeGen/RegAllocLinearScan.cpp test/CodeGen/X86/uint_to_fp-2.ll Message-ID: <200901200016.n0K0GJhD013991@zion.cs.uiuc.edu> Author: evancheng Date: Mon Jan 19 18:16:18 2009 New Revision: 62547 URL: http://llvm.org/viewvc/llvm-project?rev=62547&view=rev Log: Make linear scan's trivial coalescer slightly more aggressive. Added: llvm/trunk/test/CodeGen/X86/uint_to_fp-2.ll Modified: llvm/trunk/lib/CodeGen/RegAllocLinearScan.cpp Modified: llvm/trunk/lib/CodeGen/RegAllocLinearScan.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/RegAllocLinearScan.cpp?rev=62547&r1=62546&r2=62547&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/RegAllocLinearScan.cpp (original) +++ llvm/trunk/lib/CodeGen/RegAllocLinearScan.cpp Mon Jan 19 18:16:18 2009 @@ -249,7 +249,7 @@ if ((cur.preference && cur.preference == Reg) || !cur.containsOneValue()) return Reg; - VNInfo *vni = cur.getValNumInfo(0); + VNInfo *vni = cur.begin()->valno; if (!vni->def || vni->def == ~1U || vni->def == ~0U) return Reg; MachineInstr *CopyMI = li_->getInstructionFromIndex(vni->def); @@ -686,13 +686,13 @@ unsigned StartPosition = cur->beginNumber(); const TargetRegisterClass *RCLeader = RelatedRegClasses.getLeaderValue(RC); - // If this live interval is defined by a move instruction and its source is - // assigned a physical register that is compatible with the target register - // class, then we should try to assign it the same register. + // If start of this live interval is defined by a move instruction and its + // source is assigned a physical register that is compatible with the target + // register class, then we should try to assign it the same register. // This can happen when the move is from a larger register class to a smaller // one, e.g. X86::mov32to32_. These move instructions are not coalescable. - if (!cur->preference && cur->containsOneValue()) { - VNInfo *vni = cur->getValNumInfo(0); + if (!cur->preference && cur->hasAtLeastOneValue()) { + VNInfo *vni = cur->begin()->valno; if (vni->def && vni->def != ~1U && vni->def != ~0U) { MachineInstr *CopyMI = li_->getInstructionFromIndex(vni->def); unsigned SrcReg, DstReg; Added: llvm/trunk/test/CodeGen/X86/uint_to_fp-2.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/uint_to_fp-2.ll?rev=62547&view=auto ============================================================================== --- llvm/trunk/test/CodeGen/X86/uint_to_fp-2.ll (added) +++ llvm/trunk/test/CodeGen/X86/uint_to_fp-2.ll Mon Jan 19 18:16:18 2009 @@ -0,0 +1,8 @@ +; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep movsd | count 1 +; rdar://6504833 + +define float @f(i32 %x) nounwind readnone { +entry: + %0 = uitofp i32 %x to float + ret float %0 +} From isanbard at gmail.com Mon Jan 19 18:30:09 2009 From: isanbard at gmail.com (Bill Wendling) Date: Tue, 20 Jan 2009 00:30:09 -0000 Subject: [llvm-commits] [llvm-gcc-4.2] r62548 - in /llvm-gcc-4.2/trunk: config/darwin10.h gcc/config/darwin10.h Message-ID: <200901200030.n0K0U9UT014441@zion.cs.uiuc.edu> Author: void Date: Mon Jan 19 18:30:09 2009 New Revision: 62548 URL: http://llvm.org/viewvc/llvm-project?rev=62548&view=rev Log: Put darwin10.h in the correct place. Added: llvm-gcc-4.2/trunk/gcc/config/darwin10.h - copied unchanged from r62519, llvm-gcc-4.2/trunk/config/darwin10.h Removed: llvm-gcc-4.2/trunk/config/darwin10.h Removed: llvm-gcc-4.2/trunk/config/darwin10.h URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/config/darwin10.h?rev=62547&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/config/darwin10.h (original) +++ llvm-gcc-4.2/trunk/config/darwin10.h (removed) @@ -1,2 +0,0 @@ -/* APPLE LOCAL .file/.loc 6349436 */ -/* #define DWARF2_ASM_LINE_DEBUG_INFO 1 */ From isanbard at gmail.com Mon Jan 19 18:31:06 2009 From: isanbard at gmail.com (Bill Wendling) Date: Tue, 20 Jan 2009 00:31:06 -0000 Subject: [llvm-commits] [llvm-gcc-4.2] r62549 - /llvm-gcc-4.2/tags/Apple/llvmgcc42-2092/ Message-ID: <200901200031.n0K0V6pl014478@zion.cs.uiuc.edu> Author: void Date: Mon Jan 19 18:31:05 2009 New Revision: 62549 URL: http://llvm.org/viewvc/llvm-project?rev=62549&view=rev Log: Bad tag. Removed: llvm-gcc-4.2/tags/Apple/llvmgcc42-2092/ From isanbard at gmail.com Mon Jan 19 18:32:18 2009 From: isanbard at gmail.com (Bill Wendling) Date: Tue, 20 Jan 2009 00:32:18 -0000 Subject: [llvm-commits] [llvm-gcc-4.2] r62550 - /llvm-gcc-4.2/tags/Apple/llvmgcc42-2092/ Message-ID: <200901200032.n0K0WIIr014520@zion.cs.uiuc.edu> Author: void Date: Mon Jan 19 18:32:18 2009 New Revision: 62550 URL: http://llvm.org/viewvc/llvm-project?rev=62550&view=rev Log: Creating llvmgcc42-2092 branch Added: llvm-gcc-4.2/tags/Apple/llvmgcc42-2092/ - copied from r62549, llvm-gcc-4.2/trunk/ From nicholas at mxc.ca Mon Jan 19 18:51:41 2009 From: nicholas at mxc.ca (Nick Lewycky) Date: Tue, 20 Jan 2009 00:51:41 -0000 Subject: [llvm-commits] [llvm] r62553 - in /llvm/trunk: autoconf/configure.ac lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp Message-ID: <200901200051.n0K0pfn5015144@zion.cs.uiuc.edu> Author: nicholas Date: Mon Jan 19 18:51:40 2009 New Revision: 62553 URL: http://llvm.org/viewvc/llvm-project?rev=62553&view=rev Log: Make the Interpreter use libffi if it's available. Patch from Alexei Svitkine! This requires a rebuild of 'configure' itself. I will be committing that next, but built with the wrong version of autoconf. Somebody who has the right one, please update it. As a side-note, because of the way autoconf works, all built tools will link against libffi, not just lli. If you know how to fix this, please let me know ... Modified: llvm/trunk/autoconf/configure.ac llvm/trunk/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp Modified: llvm/trunk/autoconf/configure.ac URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/autoconf/configure.ac?rev=62553&r1=62552&r2=62553&view=diff ============================================================================== --- llvm/trunk/autoconf/configure.ac (original) +++ llvm/trunk/autoconf/configure.ac Mon Jan 19 18:51:40 2009 @@ -717,6 +717,11 @@ [Define if dlopen() is available on this platform.]), AC_MSG_WARN([dlopen() not found - disabling plugin support])) +dnl libffi is optional; used to call external functions from the interpreter +AC_SEARCH_LIBS(ffi_call,ffi,AC_DEFINE([HAVE_LIBFFI],[1], + [Define to 1 if you have the libffi library (-lffi).]), + AC_MSG_WARN([libffi not found - disabling external calls from interpreter])) + dnl mallinfo is optional; the code can compile (minus features) without it AC_SEARCH_LIBS(mallinfo,malloc,AC_DEFINE([HAVE_MALLINFO],[1], [Define if mallinfo() is available on this platform.])) @@ -779,6 +784,10 @@ AC_SUBST(HAVE_PTHREAD, 0) fi +dnl Debian vs. the world. +AC_CHECK_HEADER(ffi/ffi.h, AC_DEFINE(FFI_HEADER, ["ffi/ffi.h"], [Path to ffi.h])) +AC_CHECK_HEADER(ffi.h, AC_DEFINE(FFI_HEADER, ["ffi.h"], [Path to ffi.h])) + dnl===-----------------------------------------------------------------------=== dnl=== dnl=== SECTION 7: Check for types and structures Modified: llvm/trunk/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp?rev=62553&r1=62552&r2=62553&view=diff ============================================================================== --- llvm/trunk/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp (original) +++ llvm/trunk/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp Mon Jan 19 18:51:40 2009 @@ -10,18 +10,19 @@ // This file contains both code to deal with invoking "external" functions, but // also contains code that implements "exported" external functions. // -// External functions in the interpreter are implemented by -// using the system's dynamic loader to look up the address of the function -// we want to invoke. If a function is found, then one of the -// many lle_* wrapper functions in this file will translate its arguments from -// GenericValues to the types the function is actually expecting, before the -// function is called. +// There are currently two mechanisms for handling external functions in the +// Interpreter. The first is to implement lle_* wrapper functions that are +// specific to well-known library functions which manually translate the +// arguments from GenericValues and make the call. If such a wrapper does +// not exist, and libffi is available, then the Interpreter will attempt to +// invoke the function using libffi, after finding its address. // //===----------------------------------------------------------------------===// #include "Interpreter.h" #include "llvm/DerivedTypes.h" #include "llvm/Module.h" +#include "llvm/Config/config.h" // Detect libffi #include "llvm/Support/Streams.h" #include "llvm/System/DynamicLibrary.h" #include "llvm/Target/TargetData.h" @@ -32,18 +33,22 @@ #include #include -#ifdef __linux__ -#include +#ifdef HAVE_LIBFFI +#include FFI_HEADER #endif -using std::vector; - using namespace llvm; -typedef GenericValue (*ExFunc)(FunctionType *, const vector &); -static ManagedStatic > Functions; +typedef GenericValue (*ExFunc)(const FunctionType *, + const std::vector &); +static ManagedStatic > ExportedFunctions; static std::map FuncNames; +#ifdef HAVE_LIBFFI +typedef void (*RawFunc)(void); +static ManagedStatic > RawFunctions; +#endif // HAVE_LIBFFI + static Interpreter *TheInterpreter; static char getTypeID(const Type *Ty) { @@ -89,34 +94,181 @@ if (FnPtr == 0) // Try calling a generic function... if it exists... FnPtr = (ExFunc)(intptr_t)sys::DynamicLibrary::SearchForAddressOfSymbol( ("lle_X_"+F->getName()).c_str()); - if (FnPtr == 0) - FnPtr = (ExFunc)(intptr_t) - sys::DynamicLibrary::SearchForAddressOfSymbol(F->getName()); if (FnPtr != 0) - Functions->insert(std::make_pair(F, FnPtr)); // Cache for later + ExportedFunctions->insert(std::make_pair(F, FnPtr)); // Cache for later return FnPtr; } +#ifdef HAVE_LIBFFI +static ffi_type *ffiTypeFor(const Type *Ty) { + switch (Ty->getTypeID()) { + case Type::VoidTyID: return &ffi_type_void; + case Type::IntegerTyID: + switch (cast(Ty)->getBitWidth()) { + case 8: return &ffi_type_sint8; + case 16: return &ffi_type_sint16; + case 32: return &ffi_type_sint32; + case 64: return &ffi_type_sint64; + } + case Type::FloatTyID: return &ffi_type_float; + case Type::DoubleTyID: return &ffi_type_double; + case Type::PointerTyID: return &ffi_type_pointer; + default: break; + } + // TODO: Support other types such as StructTyID, ArrayTyID, OpaqueTyID, etc. + cerr << "Type could not be mapped for use with libffi.\n"; + abort(); + return NULL; +} + +static void *ffiValueFor(const Type *Ty, const GenericValue &AV, + void *ArgDataPtr) { + switch (Ty->getTypeID()) { + case Type::IntegerTyID: + switch (cast(Ty)->getBitWidth()) { + case 8: { + int8_t *I8Ptr = (int8_t *) ArgDataPtr; + *I8Ptr = (int8_t) AV.IntVal.getZExtValue(); + return ArgDataPtr; + } + case 16: { + int16_t *I16Ptr = (int16_t *) ArgDataPtr; + *I16Ptr = (int16_t) AV.IntVal.getZExtValue(); + return ArgDataPtr; + } + case 32: { + int32_t *I32Ptr = (int32_t *) ArgDataPtr; + *I32Ptr = (int32_t) AV.IntVal.getZExtValue(); + return ArgDataPtr; + } + case 64: { + int64_t *I64Ptr = (int64_t *) ArgDataPtr; + *I64Ptr = (int64_t) AV.IntVal.getZExtValue(); + return ArgDataPtr; + } + } + case Type::FloatTyID: { + float *FloatPtr = (float *) ArgDataPtr; + *FloatPtr = AV.DoubleVal; + return ArgDataPtr; + } + case Type::DoubleTyID: { + double *DoublePtr = (double *) ArgDataPtr; + *DoublePtr = AV.DoubleVal; + return ArgDataPtr; + } + case Type::PointerTyID: { + void **PtrPtr = (void **) ArgDataPtr; + *PtrPtr = GVTOP(AV); + return ArgDataPtr; + } + default: break; + } + // TODO: Support other types such as StructTyID, ArrayTyID, OpaqueTyID, etc. + cerr << "Type value could not be mapped for use with libffi.\n"; + abort(); + return NULL; +} + +static bool ffiInvoke(RawFunc Fn, Function *F, + const std::vector &ArgVals, + const TargetData *TD, GenericValue &Result) { + ffi_cif cif; + const FunctionType *FTy = F->getFunctionType(); + const unsigned NumArgs = F->arg_size(); + + // TODO: We don't have type information about the remaining arguments, because + // this information is never passed into ExecutionEngine::runFunction(). + if (ArgVals.size() > NumArgs && F->isVarArg()) { + cerr << "Calling external var arg function '" << F->getName() + << "' is not supported by the Interpreter.\n"; + abort(); + } + + unsigned ArgBytes = 0; + + std::vector args(NumArgs); + for (Function::const_arg_iterator A = F->arg_begin(), E = F->arg_end(); + A != E; ++A) { + const unsigned ArgNo = A->getArgNo(); + const Type *ArgTy = FTy->getParamType(ArgNo); + args[ArgNo] = ffiTypeFor(ArgTy); + ArgBytes += TD->getTypeStoreSize(ArgTy); + } + + uint8_t *ArgData = (uint8_t*) alloca(ArgBytes); + uint8_t *ArgDataPtr = ArgData; + std::vector values(NumArgs); + for (Function::const_arg_iterator A = F->arg_begin(), E = F->arg_end(); + A != E; ++A) { + const unsigned ArgNo = A->getArgNo(); + const Type *ArgTy = FTy->getParamType(ArgNo); + values[ArgNo] = ffiValueFor(ArgTy, ArgVals[ArgNo], ArgDataPtr); + ArgDataPtr += TD->getTypeStoreSize(ArgTy); + } + + const Type *RetTy = FTy->getReturnType(); + ffi_type *rtype = ffiTypeFor(RetTy); + + if (ffi_prep_cif(&cif, FFI_DEFAULT_ABI, NumArgs, rtype, &args[0]) == FFI_OK) { + void *ret = NULL; + if (RetTy->getTypeID() != Type::VoidTyID) + ret = alloca(TD->getTypeStoreSize(RetTy)); + ffi_call(&cif, Fn, ret, &values[0]); + switch (RetTy->getTypeID()) { + case Type::IntegerTyID: + switch (cast(RetTy)->getBitWidth()) { + case 8: Result.IntVal = APInt(8 , *(int8_t *) ret); break; + case 16: Result.IntVal = APInt(16, *(int16_t*) ret); break; + case 32: Result.IntVal = APInt(32, *(int32_t*) ret); break; + case 64: Result.IntVal = APInt(64, *(int64_t*) ret); break; + } + break; + case Type::FloatTyID: Result.FloatVal = *(float *) ret; break; + case Type::DoubleTyID: Result.DoubleVal = *(double*) ret; break; + case Type::PointerTyID: Result.PointerVal = *(void **) ret; break; + default: break; + } + return true; + } + + return false; +} +#endif // HAVE_LIBFFI + GenericValue Interpreter::callExternalFunction(Function *F, const std::vector &ArgVals) { TheInterpreter = this; // Do a lookup to see if the function is in our cache... this should just be a // deferred annotation! - std::map::iterator FI = Functions->find(F); - ExFunc Fn = (FI == Functions->end()) ? lookupFunction(F) : FI->second; - if (Fn == 0) { - cerr << "Tried to execute an unknown external function: " - << F->getType()->getDescription() << " " << F->getName() << "\n"; - if (F->getName() == "__main") - return GenericValue(); - abort(); + std::map::iterator FI = ExportedFunctions->find(F); + if (ExFunc Fn = (FI == ExportedFunctions->end()) ? lookupFunction(F) + : FI->second) + return Fn(F->getFunctionType(), ArgVals); + +#ifdef HAVE_LIBFFI + std::map::iterator RF = RawFunctions->find(F); + RawFunc RawFn; + if (RF == RawFunctions->end()) { + RawFn = (RawFunc)(intptr_t) + sys::DynamicLibrary::SearchForAddressOfSymbol(F->getName()); + if (RawFn != 0) + RawFunctions->insert(std::make_pair(F, RawFn)); // Cache for later + } else { + RawFn = RF->second; } - // TODO: FIXME when types are not const! - GenericValue Result = Fn(const_cast(F->getFunctionType()), - ArgVals); - return Result; + GenericValue Result; + if (RawFn != 0 && ffiInvoke(RawFn, F, ArgVals, getTargetData(), Result)) + return Result; +#endif // HAVE_LIBFFI + + cerr << "Tried to execute an unknown external function: " + << F->getType()->getDescription() << " " << F->getName() << "\n"; + if (F->getName() != "__main") + abort(); + return GenericValue(); } @@ -125,24 +277,9 @@ // extern "C" { // Don't add C++ manglings to llvm mangling :) -// void putchar(ubyte) -GenericValue lle_X_putchar(FunctionType *FT, const vector &Args){ - cout << ((char)Args[0].IntVal.getZExtValue()) << std::flush; - return Args[0]; -} - -// void _IO_putc(int c, FILE* fp) -GenericValue lle_X__IO_putc(FunctionType *FT, const vector &Args){ -#ifdef __linux__ - _IO_putc((char)Args[0].IntVal.getZExtValue(), (FILE*) Args[1].PointerVal); -#else - assert(0 && "Can't call _IO_putc on this platform"); -#endif - return Args[0]; -} - // void atexit(Function*) -GenericValue lle_X_atexit(FunctionType *FT, const vector &Args) { +GenericValue lle_X_atexit(const FunctionType *FT, + const std::vector &Args) { assert(Args.size() == 1); TheInterpreter->addAtExitHandler((Function*)GVTOP(Args[0])); GenericValue GV; @@ -151,163 +288,23 @@ } // void exit(int) -GenericValue lle_X_exit(FunctionType *FT, const vector &Args) { +GenericValue lle_X_exit(const FunctionType *FT, + const std::vector &Args) { TheInterpreter->exitCalled(Args[0]); return GenericValue(); } // void abort(void) -GenericValue lle_X_abort(FunctionType *FT, const vector &Args) { +GenericValue lle_X_abort(const FunctionType *FT, + const std::vector &Args) { raise (SIGABRT); return GenericValue(); } -// void *malloc(uint) -GenericValue lle_X_malloc(FunctionType *FT, const vector &Args) { - assert(Args.size() == 1 && "Malloc expects one argument!"); - assert(isa(FT->getReturnType()) && "malloc must return pointer"); - return PTOGV(malloc(Args[0].IntVal.getZExtValue())); -} - -// void *calloc(uint, uint) -GenericValue lle_X_calloc(FunctionType *FT, const vector &Args) { - assert(Args.size() == 2 && "calloc expects two arguments!"); - assert(isa(FT->getReturnType()) && "calloc must return pointer"); - return PTOGV(calloc(Args[0].IntVal.getZExtValue(), - Args[1].IntVal.getZExtValue())); -} - -// void *calloc(uint, uint) -GenericValue lle_X_realloc(FunctionType *FT, const vector &Args) { - assert(Args.size() == 2 && "calloc expects two arguments!"); - assert(isa(FT->getReturnType()) &&"realloc must return pointer"); - return PTOGV(realloc(GVTOP(Args[0]), Args[1].IntVal.getZExtValue())); -} - -// void free(void *) -GenericValue lle_X_free(FunctionType *FT, const vector &Args) { - assert(Args.size() == 1); - free(GVTOP(Args[0])); - return GenericValue(); -} - -// int atoi(char *) -GenericValue lle_X_atoi(FunctionType *FT, const vector &Args) { - assert(Args.size() == 1); - GenericValue GV; - GV.IntVal = APInt(32, atoi((char*)GVTOP(Args[0]))); - return GV; -} - -// double pow(double, double) -GenericValue lle_X_pow(FunctionType *FT, const vector &Args) { - assert(Args.size() == 2); - GenericValue GV; - GV.DoubleVal = pow(Args[0].DoubleVal, Args[1].DoubleVal); - return GV; -} - -// double sin(double) -GenericValue lle_X_sin(FunctionType *FT, const vector &Args) { - assert(Args.size() == 1); - GenericValue GV; - GV.DoubleVal = sin(Args[0].DoubleVal); - return GV; -} - -// double cos(double) -GenericValue lle_X_cos(FunctionType *FT, const vector &Args) { - assert(Args.size() == 1); - GenericValue GV; - GV.DoubleVal = cos(Args[0].DoubleVal); - return GV; -} - -// double exp(double) -GenericValue lle_X_exp(FunctionType *FT, const vector &Args) { - assert(Args.size() == 1); - GenericValue GV; - GV.DoubleVal = exp(Args[0].DoubleVal); - return GV; -} - -// double sqrt(double) -GenericValue lle_X_sqrt(FunctionType *FT, const vector &Args) { - assert(Args.size() == 1); - GenericValue GV; - GV.DoubleVal = sqrt(Args[0].DoubleVal); - return GV; -} - -// double log(double) -GenericValue lle_X_log(FunctionType *FT, const vector &Args) { - assert(Args.size() == 1); - GenericValue GV; - GV.DoubleVal = log(Args[0].DoubleVal); - return GV; -} - -// double floor(double) -GenericValue lle_X_floor(FunctionType *FT, const vector &Args) { - assert(Args.size() == 1); - GenericValue GV; - GV.DoubleVal = floor(Args[0].DoubleVal); - return GV; -} - -#ifdef HAVE_RAND48 - -// double drand48() -GenericValue lle_X_drand48(FunctionType *FT, const vector &Args) { - assert(Args.empty()); - GenericValue GV; - GV.DoubleVal = drand48(); - return GV; -} - -// long lrand48() -GenericValue lle_X_lrand48(FunctionType *FT, const vector &Args) { - assert(Args.empty()); - GenericValue GV; - GV.IntVal = APInt(32, lrand48()); - return GV; -} - -// void srand48(long) -GenericValue lle_X_srand48(FunctionType *FT, const vector &Args) { - assert(Args.size() == 1); - srand48(Args[0].IntVal.getZExtValue()); - return GenericValue(); -} - -#endif - -// int rand() -GenericValue lle_X_rand(FunctionType *FT, const vector &Args) { - assert(Args.empty()); - GenericValue GV; - GV.IntVal = APInt(32, rand()); - return GV; -} - -// void srand(uint) -GenericValue lle_X_srand(FunctionType *FT, const vector &Args) { - assert(Args.size() == 1); - srand(Args[0].IntVal.getZExtValue()); - return GenericValue(); -} - -// int puts(const char*) -GenericValue lle_X_puts(FunctionType *FT, const vector &Args) { - assert(Args.size() == 1); - GenericValue GV; - GV.IntVal = APInt(32, puts((char*)GVTOP(Args[0]))); - return GV; -} - -// int sprintf(sbyte *, sbyte *, ...) - a very rough implementation to make +// int sprintf(char *, const char *, ...) - a very rough implementation to make // output useful. -GenericValue lle_X_sprintf(FunctionType *FT, const vector &Args) { +GenericValue lle_X_sprintf(const FunctionType *FT, + const std::vector &Args) { char *OutputBuffer = (char *)GVTOP(Args[0]); const char *FmtStr = (const char *)GVTOP(Args[1]); unsigned ArgNo = 2; @@ -384,10 +381,12 @@ return GV; } -// int printf(sbyte *, ...) - a very rough implementation to make output useful. -GenericValue lle_X_printf(FunctionType *FT, const vector &Args) { +// int printf(const char *, ...) - a very rough implementation to make output +// useful. +GenericValue lle_X_printf(const FunctionType *FT, + const std::vector &Args) { char Buffer[10000]; - vector NewArgs; + std::vector NewArgs; NewArgs.push_back(PTOGV((void*)&Buffer[0])); NewArgs.insert(NewArgs.end(), Args.begin(), Args.end()); GenericValue GV = lle_X_sprintf(FT, NewArgs); @@ -472,7 +471,8 @@ } // int sscanf(const char *format, ...); -GenericValue lle_X_sscanf(FunctionType *FT, const vector &args) { +GenericValue lle_X_sscanf(const FunctionType *FT, + const std::vector &args) { assert(args.size() < 10 && "Only handle up to 10 args to sscanf right now!"); char *Args[10]; @@ -488,7 +488,8 @@ } // int scanf(const char *format, ...); -GenericValue lle_X_scanf(FunctionType *FT, const vector &args) { +GenericValue lle_X_scanf(const FunctionType *FT, + const std::vector &args) { assert(args.size() < 10 && "Only handle up to 10 args to scanf right now!"); char *Args[10]; @@ -503,324 +504,33 @@ return GV; } - -// int clock(void) - Profiling implementation -GenericValue lle_i_clock(FunctionType *FT, const vector &Args) { - extern unsigned int clock(void); - GenericValue GV; - GV.IntVal = APInt(32, clock()); - return GV; -} - - -//===----------------------------------------------------------------------===// -// String Functions... -//===----------------------------------------------------------------------===// - -// int strcmp(const char *S1, const char *S2); -GenericValue lle_X_strcmp(FunctionType *FT, const vector &Args) { - assert(Args.size() == 2); - GenericValue Ret; - Ret.IntVal = APInt(32, strcmp((char*)GVTOP(Args[0]), (char*)GVTOP(Args[1]))); - return Ret; -} - -// char *strcat(char *Dest, const char *src); -GenericValue lle_X_strcat(FunctionType *FT, const vector &Args) { - assert(Args.size() == 2); - assert(isa(FT->getReturnType()) &&"strcat must return pointer"); - return PTOGV(strcat((char*)GVTOP(Args[0]), (char*)GVTOP(Args[1]))); -} - -// char *strcpy(char *Dest, const char *src); -GenericValue lle_X_strcpy(FunctionType *FT, const vector &Args) { - assert(Args.size() == 2); - assert(isa(FT->getReturnType()) &&"strcpy must return pointer"); - return PTOGV(strcpy((char*)GVTOP(Args[0]), (char*)GVTOP(Args[1]))); -} - -static GenericValue size_t_to_GV (size_t n) { - GenericValue Ret; - if (sizeof (size_t) == sizeof (uint64_t)) { - Ret.IntVal = APInt(64, n); - } else { - assert (sizeof (size_t) == sizeof (unsigned int)); - Ret.IntVal = APInt(32, n); - } - return Ret; -} - -static size_t GV_to_size_t (GenericValue GV) { - size_t count; - if (sizeof (size_t) == sizeof (uint64_t)) { - count = (size_t)GV.IntVal.getZExtValue(); - } else { - assert (sizeof (size_t) == sizeof (unsigned int)); - count = (size_t)GV.IntVal.getZExtValue(); - } - return count; -} - -// size_t strlen(const char *src); -GenericValue lle_X_strlen(FunctionType *FT, const vector &Args) { - assert(Args.size() == 1); - size_t strlenResult = strlen ((char *) GVTOP (Args[0])); - return size_t_to_GV (strlenResult); -} - -// char *strdup(const char *src); -GenericValue lle_X_strdup(FunctionType *FT, const vector &Args) { - assert(Args.size() == 1); - assert(isa(FT->getReturnType()) && "strdup must return pointer"); - return PTOGV(strdup((char*)GVTOP(Args[0]))); -} - -// char *__strdup(const char *src); -GenericValue lle_X___strdup(FunctionType *FT, const vector &Args) { - assert(Args.size() == 1); - assert(isa(FT->getReturnType()) &&"_strdup must return pointer"); - return PTOGV(strdup((char*)GVTOP(Args[0]))); -} - -// void *memset(void *S, int C, size_t N) -GenericValue lle_X_memset(FunctionType *FT, const vector &Args) { - assert(Args.size() == 3); - size_t count = GV_to_size_t (Args[2]); - assert(isa(FT->getReturnType()) && "memset must return pointer"); - return PTOGV(memset(GVTOP(Args[0]), uint32_t(Args[1].IntVal.getZExtValue()), - count)); -} - -// void *memcpy(void *Dest, void *src, size_t Size); -GenericValue lle_X_memcpy(FunctionType *FT, const vector &Args) { - assert(Args.size() == 3); - assert(isa(FT->getReturnType()) && "memcpy must return pointer"); - size_t count = GV_to_size_t (Args[2]); - return PTOGV(memcpy((char*)GVTOP(Args[0]), (char*)GVTOP(Args[1]), count)); -} - -// void *memcpy(void *Dest, void *src, size_t Size); -GenericValue lle_X_memmove(FunctionType *FT, const vector &Args) { - assert(Args.size() == 3); - assert(isa(FT->getReturnType()) && "memmove must return pointer"); - size_t count = GV_to_size_t (Args[2]); - return PTOGV(memmove((char*)GVTOP(Args[0]), (char*)GVTOP(Args[1]), count)); -} - -//===----------------------------------------------------------------------===// -// IO Functions... -//===----------------------------------------------------------------------===// - -// getFILE - Turn a pointer in the host address space into a legit pointer in -// the interpreter address space. This is an identity transformation. -#define getFILE(ptr) ((FILE*)ptr) - -// FILE *fopen(const char *filename, const char *mode); -GenericValue lle_X_fopen(FunctionType *FT, const vector &Args) { - assert(Args.size() == 2); - assert(isa(FT->getReturnType()) && "fopen must return pointer"); - return PTOGV(fopen((const char *)GVTOP(Args[0]), - (const char *)GVTOP(Args[1]))); -} - -// int fclose(FILE *F); -GenericValue lle_X_fclose(FunctionType *FT, const vector &Args) { - assert(Args.size() == 1); - GenericValue GV; - GV.IntVal = APInt(32, fclose(getFILE(GVTOP(Args[0])))); - return GV; -} - -// int feof(FILE *stream); -GenericValue lle_X_feof(FunctionType *FT, const vector &Args) { - assert(Args.size() == 1); - GenericValue GV; - - GV.IntVal = APInt(32, feof(getFILE(GVTOP(Args[0])))); - return GV; -} - -// size_t fread(void *ptr, size_t size, size_t nitems, FILE *stream); -GenericValue lle_X_fread(FunctionType *FT, const vector &Args) { - assert(Args.size() == 4); - size_t result; - - result = fread((void*)GVTOP(Args[0]), GV_to_size_t (Args[1]), - GV_to_size_t (Args[2]), getFILE(GVTOP(Args[3]))); - return size_t_to_GV (result); -} - -// size_t fwrite(const void *ptr, size_t size, size_t nitems, FILE *stream); -GenericValue lle_X_fwrite(FunctionType *FT, const vector &Args) { - assert(Args.size() == 4); - size_t result; - - result = fwrite((void*)GVTOP(Args[0]), GV_to_size_t (Args[1]), - GV_to_size_t (Args[2]), getFILE(GVTOP(Args[3]))); - return size_t_to_GV (result); -} - -// char *fgets(char *s, int n, FILE *stream); -GenericValue lle_X_fgets(FunctionType *FT, const vector &Args) { - assert(Args.size() == 3); - return PTOGV(fgets((char*)GVTOP(Args[0]), Args[1].IntVal.getZExtValue(), - getFILE(GVTOP(Args[2])))); -} - -// FILE *freopen(const char *path, const char *mode, FILE *stream); -GenericValue lle_X_freopen(FunctionType *FT, const vector &Args) { - assert(Args.size() == 3); - assert(isa(FT->getReturnType()) &&"freopen must return pointer"); - return PTOGV(freopen((char*)GVTOP(Args[0]), (char*)GVTOP(Args[1]), - getFILE(GVTOP(Args[2])))); -} - -// int fflush(FILE *stream); -GenericValue lle_X_fflush(FunctionType *FT, const vector &Args) { - assert(Args.size() == 1); - GenericValue GV; - GV.IntVal = APInt(32, fflush(getFILE(GVTOP(Args[0])))); - return GV; -} - -// int getc(FILE *stream); -GenericValue lle_X_getc(FunctionType *FT, const vector &Args) { - assert(Args.size() == 1); - GenericValue GV; - GV.IntVal = APInt(32, getc(getFILE(GVTOP(Args[0])))); - return GV; -} - -// int _IO_getc(FILE *stream); -GenericValue lle_X__IO_getc(FunctionType *F, const vector &Args) { - return lle_X_getc(F, Args); -} - -// int fputc(int C, FILE *stream); -GenericValue lle_X_fputc(FunctionType *FT, const vector &Args) { - assert(Args.size() == 2); - GenericValue GV; - GV.IntVal = APInt(32, fputc(Args[0].IntVal.getZExtValue(), - getFILE(GVTOP(Args[1])))); - return GV; -} - -// int ungetc(int C, FILE *stream); -GenericValue lle_X_ungetc(FunctionType *FT, const vector &Args) { - assert(Args.size() == 2); - GenericValue GV; - GV.IntVal = APInt(32, ungetc(Args[0].IntVal.getZExtValue(), - getFILE(GVTOP(Args[1])))); - return GV; -} - -// int ferror (FILE *stream); -GenericValue lle_X_ferror(FunctionType *FT, const vector &Args) { - assert(Args.size() == 1); - GenericValue GV; - GV.IntVal = APInt(32, ferror (getFILE(GVTOP(Args[0])))); - return GV; -} - -// int fprintf(FILE *,sbyte *, ...) - a very rough implementation to make output -// useful. -GenericValue lle_X_fprintf(FunctionType *FT, const vector &Args) { +// int fprintf(FILE *, const char *, ...) - a very rough implementation to make +// output useful. +GenericValue lle_X_fprintf(const FunctionType *FT, + const std::vector &Args) { assert(Args.size() >= 2); char Buffer[10000]; - vector NewArgs; + std::vector NewArgs; NewArgs.push_back(PTOGV(Buffer)); NewArgs.insert(NewArgs.end(), Args.begin()+1, Args.end()); GenericValue GV = lle_X_sprintf(FT, NewArgs); - fputs(Buffer, getFILE(GVTOP(Args[0]))); - return GV; -} - -// int __cxa_guard_acquire (__guard *g); -GenericValue lle_X___cxa_guard_acquire(FunctionType *FT, - const vector &Args) { - assert(Args.size() == 1); - GenericValue GV; -#ifdef __linux__ - GV.IntVal = APInt(32, __cxxabiv1::__cxa_guard_acquire ( - (__cxxabiv1::__guard*)GVTOP(Args[0]))); -#else - assert(0 && "Can't call __cxa_guard_acquire on this platform"); -#endif + fputs(Buffer, (FILE *) GVTOP(Args[0])); return GV; } -// void __cxa_guard_release (__guard *g); -GenericValue lle_X___cxa_guard_release(FunctionType *FT, - const vector &Args) { - assert(Args.size() == 1); -#ifdef __linux__ - __cxxabiv1::__cxa_guard_release ((__cxxabiv1::__guard*)GVTOP(Args[0])); -#else - assert(0 && "Can't call __cxa_guard_release on this platform"); -#endif - return GenericValue(); -} - } // End extern "C" void Interpreter::initializeExternalFunctions() { - FuncNames["lle_X_putchar"] = lle_X_putchar; - FuncNames["lle_X__IO_putc"] = lle_X__IO_putc; + FuncNames["lle_X_atexit"] = lle_X_atexit; FuncNames["lle_X_exit"] = lle_X_exit; FuncNames["lle_X_abort"] = lle_X_abort; - FuncNames["lle_X_malloc"] = lle_X_malloc; - FuncNames["lle_X_calloc"] = lle_X_calloc; - FuncNames["lle_X_realloc"] = lle_X_realloc; - FuncNames["lle_X_free"] = lle_X_free; - FuncNames["lle_X_atoi"] = lle_X_atoi; - FuncNames["lle_X_pow"] = lle_X_pow; - FuncNames["lle_X_sin"] = lle_X_sin; - FuncNames["lle_X_cos"] = lle_X_cos; - FuncNames["lle_X_exp"] = lle_X_exp; - FuncNames["lle_X_log"] = lle_X_log; - FuncNames["lle_X_floor"] = lle_X_floor; - FuncNames["lle_X_srand"] = lle_X_srand; - FuncNames["lle_X_rand"] = lle_X_rand; -#ifdef HAVE_RAND48 - FuncNames["lle_X_drand48"] = lle_X_drand48; - FuncNames["lle_X_srand48"] = lle_X_srand48; - FuncNames["lle_X_lrand48"] = lle_X_lrand48; -#endif - FuncNames["lle_X_sqrt"] = lle_X_sqrt; - FuncNames["lle_X_puts"] = lle_X_puts; + FuncNames["lle_X_printf"] = lle_X_printf; FuncNames["lle_X_sprintf"] = lle_X_sprintf; FuncNames["lle_X_sscanf"] = lle_X_sscanf; FuncNames["lle_X_scanf"] = lle_X_scanf; - FuncNames["lle_i_clock"] = lle_i_clock; - - FuncNames["lle_X_strcmp"] = lle_X_strcmp; - FuncNames["lle_X_strcat"] = lle_X_strcat; - FuncNames["lle_X_strcpy"] = lle_X_strcpy; - FuncNames["lle_X_strlen"] = lle_X_strlen; - FuncNames["lle_X___strdup"] = lle_X___strdup; - FuncNames["lle_X_memset"] = lle_X_memset; - FuncNames["lle_X_memcpy"] = lle_X_memcpy; - FuncNames["lle_X_memmove"] = lle_X_memmove; - - FuncNames["lle_X_fopen"] = lle_X_fopen; - FuncNames["lle_X_fclose"] = lle_X_fclose; - FuncNames["lle_X_feof"] = lle_X_feof; - FuncNames["lle_X_fread"] = lle_X_fread; - FuncNames["lle_X_fwrite"] = lle_X_fwrite; - FuncNames["lle_X_fgets"] = lle_X_fgets; - FuncNames["lle_X_fflush"] = lle_X_fflush; - FuncNames["lle_X_fgetc"] = lle_X_getc; - FuncNames["lle_X_getc"] = lle_X_getc; - FuncNames["lle_X__IO_getc"] = lle_X__IO_getc; - FuncNames["lle_X_fputc"] = lle_X_fputc; - FuncNames["lle_X_ungetc"] = lle_X_ungetc; FuncNames["lle_X_fprintf"] = lle_X_fprintf; - FuncNames["lle_X_freopen"] = lle_X_freopen; - - FuncNames["lle_X___cxa_guard_acquire"] = lle_X___cxa_guard_acquire; - FuncNames["lle_X____cxa_guard_release"] = lle_X___cxa_guard_release; } From nicholas at mxc.ca Mon Jan 19 18:52:25 2009 From: nicholas at mxc.ca (Nick Lewycky) Date: Tue, 20 Jan 2009 00:52:25 -0000 Subject: [llvm-commits] [llvm] r62554 - /llvm/trunk/configure Message-ID: <200901200052.n0K0qP0p015175@zion.cs.uiuc.edu> Author: nicholas Date: Mon Jan 19 18:52:24 2009 New Revision: 62554 URL: http://llvm.org/viewvc/llvm-project?rev=62554&view=rev Log: Regenerate. BUILT WITH WRONG VERSION OF AUTOCONF! Somebody please regenerate with an approved version. Thanks! Modified: llvm/trunk/configure Modified: llvm/trunk/configure URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/configure?rev=62554&r1=62553&r2=62554&view=diff ============================================================================== --- llvm/trunk/configure (original) +++ llvm/trunk/configure Mon Jan 19 18:52:24 2009 @@ -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 @@ -940,6 +955,7 @@ CC CFLAGS LDFLAGS +LIBS CPPFLAGS CPP CXX @@ -1066,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) @@ -1085,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 \ @@ -1282,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) @@ -1586,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 @@ -1665,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. @@ -1681,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 $@ @@ -2426,7 +2443,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 @@ -2466,7 +2483,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 @@ -2523,7 +2540,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 @@ -2564,7 +2581,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 @@ -2622,7 +2639,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 @@ -2666,7 +2683,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 @@ -2807,7 +2824,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 @@ -2835,6 +2852,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 @@ -2846,8 +2869,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. @@ -3025,27 +3046,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 @@ -3100,27 +3104,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 @@ -3155,27 +3142,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 @@ -3211,27 +3181,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 @@ -3347,27 +3300,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 @@ -3457,17 +3393,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 @@ -3501,17 +3430,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 @@ -3576,17 +3498,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 @@ -3620,17 +3535,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 @@ -3685,7 +3593,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 @@ -3767,7 +3675,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 @@ -3863,27 +3771,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 @@ -4059,27 +3950,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 @@ -4121,7 +3995,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 @@ -4142,27 +4017,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. */ @@ -4197,27 +4055,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 @@ -4268,27 +4109,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 @@ -4418,7 +4242,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 @@ -4456,7 +4280,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 @@ -4495,7 +4319,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 @@ -4585,7 +4409,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 @@ -4623,7 +4447,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 @@ -4662,7 +4486,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 @@ -5115,17 +4939,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 @@ -5159,17 +4976,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 @@ -5234,17 +5044,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 @@ -5278,17 +5081,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 @@ -5345,7 +5141,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 @@ -5389,7 +5185,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 @@ -5507,27 +5303,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 @@ -5582,27 +5361,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 @@ -5637,27 +5399,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 @@ -5693,27 +5438,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 @@ -5829,27 +5557,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 @@ -5914,7 +5625,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 @@ -5958,7 +5669,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 @@ -6071,27 +5782,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 @@ -6146,27 +5840,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 @@ -6201,27 +5878,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 @@ -6257,27 +5917,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 @@ -6341,7 +5984,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 @@ -6366,116 +6009,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" @@ -6490,147 +6140,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 @@ -6642,6 +6167,7 @@ _ACEOF fi +rm -f conftest.l $LEX_OUTPUT_ROOT.c fi @@ -6680,7 +6206,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 @@ -6827,7 +6353,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 @@ -6868,7 +6394,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 @@ -6909,7 +6435,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 @@ -6950,7 +6476,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 @@ -6991,7 +6517,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 @@ -7032,7 +6558,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 @@ -7073,7 +6599,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 @@ -7113,7 +6639,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 @@ -7153,7 +6679,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 @@ -7210,7 +6736,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 @@ -7251,7 +6777,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 @@ -7292,7 +6818,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 @@ -7333,7 +6859,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 @@ -7375,7 +6901,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 @@ -7431,7 +6957,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 @@ -7489,7 +7015,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 @@ -7548,7 +7074,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 @@ -7606,7 +7132,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 @@ -7690,7 +7216,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. @@ -7753,7 +7279,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 @@ -7793,7 +7319,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 @@ -7833,7 +7359,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 @@ -7873,7 +7399,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 @@ -7913,7 +7439,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 @@ -7953,7 +7479,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 @@ -7993,7 +7519,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 @@ -8066,7 +7592,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 @@ -8123,7 +7649,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 @@ -8165,7 +7691,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 @@ -8210,7 +7736,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 @@ -8255,7 +7781,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 @@ -8300,7 +7826,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 @@ -8345,7 +7871,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_GAS="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8412,27 +7938,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 @@ -8441,7 +7951,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 @@ -8484,10 +7994,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}; @@ -8496,11 +8006,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; @@ -8527,7 +8037,7 @@ const int foo = 10; if (!foo) return 0; } - return !x[0] && !zero.x; + return !cs[0] && !zero.x; #endif ; @@ -8547,27 +8057,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 @@ -8632,27 +8125,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 @@ -8725,27 +8201,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 @@ -8754,7 +8214,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 @@ -8825,27 +8285,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 @@ -8854,7 +8298,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 @@ -8917,27 +8361,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 @@ -8973,17 +8400,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 @@ -10077,27 +9497,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 @@ -10106,7 +9510,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 @@ -10160,27 +9564,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 @@ -10189,7 +9577,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 @@ -10245,27 +9633,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 @@ -10274,7 +9646,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 @@ -10319,27 +9691,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 @@ -10391,27 +9747,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 @@ -10420,7 +9760,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 @@ -10476,27 +9816,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 @@ -10505,7 +9829,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 @@ -10582,27 +9906,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 @@ -10611,7 +9919,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 @@ -10633,7 +9941,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 @@ -10716,27 +10024,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 @@ -10745,7 +10037,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'}'` @@ -10832,7 +10124,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 @@ -11117,17 +10392,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 @@ -11232,27 +10500,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 @@ -11352,27 +10603,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 @@ -11381,7 +10616,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'}'` @@ -11461,27 +10696,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 @@ -11517,17 +10735,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 @@ -11633,27 +10844,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 @@ -11689,17 +10883,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 @@ -11803,27 +10990,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 @@ -11859,17 +11029,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 @@ -12002,27 +11165,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 @@ -12031,7 +11178,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'}'` @@ -12113,27 +11260,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 @@ -12142,7 +11273,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'}'` @@ -12224,27 +11355,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 @@ -12253,7 +11368,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'}'` @@ -12335,27 +11450,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 @@ -12364,7 +11463,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'}'` @@ -12447,27 +11546,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 @@ -12476,7 +11559,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'}'` @@ -12976,7 +12059,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 12979 "configure"' > conftest.$ac_ext + echo '#line 12062 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -13100,27 +12183,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 @@ -13129,7 +12196,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' @@ -13224,17 +12291,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 @@ -13268,17 +12328,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 @@ -13343,17 +12396,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 @@ -13387,17 +12433,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 @@ -13438,7 +12477,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 @@ -13456,7 +12495,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 @@ -13482,7 +12521,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 @@ -13500,7 +12539,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 @@ -13607,27 +12646,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 @@ -13670,27 +12692,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 @@ -14145,7 +13150,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 @@ -14185,7 +13190,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 @@ -14241,7 +13246,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 @@ -14281,7 +13286,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 @@ -14337,7 +13342,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 @@ -14377,7 +13382,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 @@ -14694,11 +13699,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:14697: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13702: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14701: \$? = $ac_status" >&5 + echo "$as_me:13706: \$? = $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. @@ -14962,11 +13967,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:14965: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13970: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14969: \$? = $ac_status" >&5 + echo "$as_me:13974: \$? = $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. @@ -15066,11 +14071,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:15069: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14074: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15073: \$? = $ac_status" >&5 + echo "$as_me:14078: \$? = $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 @@ -15546,27 +14551,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; } }'` @@ -15580,7 +14569,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 @@ -15621,27 +14610,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; } }'` @@ -15655,7 +14628,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 @@ -16903,27 +15876,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 @@ -16932,7 +15889,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 @@ -17014,27 +15971,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 @@ -17043,7 +15984,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 @@ -17093,27 +16034,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 @@ -17122,7 +16047,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 @@ -17194,27 +16119,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 @@ -17223,7 +16132,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 @@ -17273,27 +16182,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 @@ -17302,7 +16195,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 @@ -17353,27 +16246,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 @@ -17382,7 +16259,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 @@ -17433,27 +16310,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 @@ -17462,7 +16323,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 @@ -17518,7 +16379,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; } }'` @@ -18739,7 +17584,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 @@ -18781,27 +17626,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; } }'` @@ -18815,7 +17644,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 @@ -19986,11 +18815,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:19989: $lt_compile\"" >&5) + (eval echo "\"\$as_me:18818: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:19993: \$? = $ac_status" >&5 + echo "$as_me:18822: \$? = $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. @@ -20090,11 +18919,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:20093: $lt_compile\"" >&5) + (eval echo "\"\$as_me:18922: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:20097: \$? = $ac_status" >&5 + echo "$as_me:18926: \$? = $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 @@ -21660,11 +20489,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:21663: $lt_compile\"" >&5) + (eval echo "\"\$as_me:20492: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:21667: \$? = $ac_status" >&5 + echo "$as_me:20496: \$? = $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. @@ -21764,11 +20593,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:21767: $lt_compile\"" >&5) + (eval echo "\"\$as_me:20596: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:21771: \$? = $ac_status" >&5 + echo "$as_me:20600: \$? = $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 @@ -22234,27 +21063,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; } }'` @@ -22268,7 +21081,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 @@ -22299,27 +21112,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; } }'` @@ -22333,7 +21130,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 @@ -23999,11 +22796,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:24002: $lt_compile\"" >&5) + (eval echo "\"\$as_me:22799: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:24006: \$? = $ac_status" >&5 + echo "$as_me:22803: \$? = $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. @@ -24267,11 +23064,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:24270: $lt_compile\"" >&5) + (eval echo "\"\$as_me:23067: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:24274: \$? = $ac_status" >&5 + echo "$as_me:23071: \$? = $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. @@ -24371,11 +23168,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:24374: $lt_compile\"" >&5) + (eval echo "\"\$as_me:23171: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:24378: \$? = $ac_status" >&5 + echo "$as_me:23175: \$? = $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 @@ -24851,27 +23648,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; } }'` @@ -24885,7 +23666,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 @@ -24926,27 +23707,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; } }'` @@ -24960,7 +23725,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 @@ -27100,7 +25865,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 @@ -27140,7 +25905,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 @@ -27224,27 +25989,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 @@ -27312,27 +26060,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 @@ -27341,7 +26073,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 @@ -27399,27 +26131,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 @@ -27428,7 +26144,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 @@ -27481,27 +26197,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 @@ -27510,7 +26210,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 @@ -27562,27 +26262,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 @@ -27591,7 +26275,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 @@ -27656,27 +26340,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 @@ -27685,7 +26353,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 @@ -27715,9 +26383,9 @@ fi -{ echo "$as_me:$LINENO: checking for library containing mallinfo" >&5 -echo $ECHO_N "checking for library containing mallinfo... $ECHO_C" >&6; } -if test "${ac_cv_search_mallinfo+set}" = set; then +{ echo "$as_me:$LINENO: checking for library containing ffi_call" >&5 +echo $ECHO_N "checking for library containing ffi_call... $ECHO_C" >&6; } +if test "${ac_cv_search_ffi_call+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_func_search_save_LIBS=$LIBS @@ -27734,16 +26402,16 @@ #ifdef __cplusplus extern "C" #endif -char mallinfo (); +char ffi_call (); int main () { -return mallinfo (); +return ffi_call (); ; return 0; } _ACEOF -for ac_lib in '' malloc; do +for ac_lib in '' ffi; do if test -z "$ac_lib"; then ac_res="none required" else @@ -27763,28 +26431,12 @@ 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_search_mallinfo=$ac_res + (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_ffi_call=$ac_res else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -27792,42 +26444,42 @@ 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 + if test "${ac_cv_search_ffi_call+set}" = set; then break fi done -if test "${ac_cv_search_mallinfo+set}" = set; then +if test "${ac_cv_search_ffi_call+set}" = set; then : else - ac_cv_search_mallinfo=no + ac_cv_search_ffi_call=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_search_mallinfo" >&5 -echo "${ECHO_T}$ac_cv_search_mallinfo" >&6; } -ac_res=$ac_cv_search_mallinfo +{ echo "$as_me:$LINENO: result: $ac_cv_search_ffi_call" >&5 +echo "${ECHO_T}$ac_cv_search_ffi_call" >&6; } +ac_res=$ac_cv_search_ffi_call if test "$ac_res" != no; then test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" cat >>confdefs.h <<\_ACEOF -#define HAVE_MALLINFO 1 +#define HAVE_LIBFFI 1 _ACEOF +else + { echo "$as_me:$LINENO: WARNING: libffi not found - disabling external calls from interpreter" >&5 +echo "$as_me: WARNING: libffi not found - disabling external calls from interpreter" >&2;} fi -if test "$ENABLE_THREADS" -eq 1 ; then - -{ echo "$as_me:$LINENO: checking for pthread_mutex_init in -lpthread" >&5 -echo $ECHO_N "checking for pthread_mutex_init in -lpthread... $ECHO_C" >&6; } -if test "${ac_cv_lib_pthread_pthread_mutex_init+set}" = set; then +{ echo "$as_me:$LINENO: checking for library containing mallinfo" >&5 +echo $ECHO_N "checking for library containing mallinfo... $ECHO_C" >&6; } +if test "${ac_cv_search_mallinfo+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lpthread $LIBS" + ac_func_search_save_LIBS=$LIBS cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -27841,16 +26493,23 @@ #ifdef __cplusplus extern "C" #endif -char pthread_mutex_init (); +char mallinfo (); int main () { -return pthread_mutex_init (); +return mallinfo (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext +for ac_lib in '' malloc; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + rm -f conftest.$ac_objext conftest$ac_exeext if { (ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; @@ -27863,27 +26522,95 @@ 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 + (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 +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_mallinfo+set}" = set; then + break +fi +done +if test "${ac_cv_search_mallinfo+set}" = set; then + : +else + ac_cv_search_mallinfo=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ echo "$as_me:$LINENO: result: $ac_cv_search_mallinfo" >&5 +echo "${ECHO_T}$ac_cv_search_mallinfo" >&6; } +ac_res=$ac_cv_search_mallinfo +if test "$ac_res" != no; then + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +cat >>confdefs.h <<\_ACEOF +#define HAVE_MALLINFO 1 +_ACEOF + +fi + + +if test "$ENABLE_THREADS" -eq 1 ; then + +{ echo "$as_me:$LINENO: checking for pthread_mutex_init in -lpthread" >&5 +echo $ECHO_N "checking for pthread_mutex_init in -lpthread... $ECHO_C" >&6; } +if test "${ac_cv_lib_pthread_pthread_mutex_init+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lpthread $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 pthread_mutex_init (); +int +main () +{ +return pthread_mutex_init (); + ; + 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_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 + (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 @@ -27892,7 +26619,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 @@ -27955,27 +26682,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 @@ -27984,7 +26695,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 @@ -28065,27 +26776,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 @@ -28094,7 +26789,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 @@ -28171,27 +26866,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 @@ -28264,27 +26942,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 @@ -28293,7 +26955,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 @@ -28364,27 +27026,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 @@ -28393,7 +27039,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 @@ -28458,27 +27104,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 @@ -28521,38 +27150,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; } @@ -28601,27 +27240,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 @@ -28798,27 +27420,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 @@ -28876,27 +27481,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 @@ -28962,27 +27550,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 @@ -29018,17 +27589,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 @@ -29136,27 +27700,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 @@ -29192,17 +27739,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 @@ -29305,27 +27845,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 @@ -29361,17 +27884,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 @@ -29477,27 +27993,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 @@ -29533,17 +28032,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 @@ -29648,27 +28140,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 @@ -29704,17 +28179,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 @@ -29818,27 +28286,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 @@ -29874,17 +28325,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 @@ -29957,6 +28401,286 @@ fi +if test "${ac_cv_header_ffi_ffi_h+set}" = set; then + { echo "$as_me:$LINENO: checking for ffi/ffi.h" >&5 +echo $ECHO_N "checking for ffi/ffi.h... $ECHO_C" >&6; } +if test "${ac_cv_header_ffi_ffi_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_ffi_ffi_h" >&5 +echo "${ECHO_T}$ac_cv_header_ffi_ffi_h" >&6; } +else + # Is the header compilable? +{ echo "$as_me:$LINENO: checking ffi/ffi.h usability" >&5 +echo $ECHO_N "checking ffi/ffi.h usability... $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. */ +$ac_includes_default +#include +_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_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } + +# Is the header present? +{ echo "$as_me:$LINENO: checking ffi/ffi.h presence" >&5 +echo $ECHO_N "checking ffi/ffi.h presence... $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 +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 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); } >/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 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi + +rm -f conftest.err conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: ffi/ffi.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: ffi/ffi.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: ffi/ffi.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: ffi/ffi.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: ffi/ffi.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: ffi/ffi.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: ffi/ffi.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: ffi/ffi.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: ffi/ffi.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: ffi/ffi.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: ffi/ffi.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: ffi/ffi.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: ffi/ffi.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: ffi/ffi.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: ffi/ffi.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: ffi/ffi.h: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX +## ----------------------------------- ## +## Report this to llvmbugs at cs.uiuc.edu ## +## ----------------------------------- ## +_ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +{ echo "$as_me:$LINENO: checking for ffi/ffi.h" >&5 +echo $ECHO_N "checking for ffi/ffi.h... $ECHO_C" >&6; } +if test "${ac_cv_header_ffi_ffi_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_ffi_ffi_h=$ac_header_preproc +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_ffi_ffi_h" >&5 +echo "${ECHO_T}$ac_cv_header_ffi_ffi_h" >&6; } + +fi +if test $ac_cv_header_ffi_ffi_h = yes; then + +cat >>confdefs.h <<\_ACEOF +#define FFI_HEADER "ffi/ffi.h" +_ACEOF + +fi + + +if test "${ac_cv_header_ffi_h+set}" = set; then + { echo "$as_me:$LINENO: checking for ffi.h" >&5 +echo $ECHO_N "checking for ffi.h... $ECHO_C" >&6; } +if test "${ac_cv_header_ffi_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_ffi_h" >&5 +echo "${ECHO_T}$ac_cv_header_ffi_h" >&6; } +else + # Is the header compilable? +{ echo "$as_me:$LINENO: checking ffi.h usability" >&5 +echo $ECHO_N "checking ffi.h usability... $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. */ +$ac_includes_default +#include +_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_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } + +# Is the header present? +{ echo "$as_me:$LINENO: checking ffi.h presence" >&5 +echo $ECHO_N "checking ffi.h presence... $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 +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 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); } >/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 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi + +rm -f conftest.err conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: ffi.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: ffi.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: ffi.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: ffi.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: ffi.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: ffi.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: ffi.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: ffi.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: ffi.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: ffi.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: ffi.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: ffi.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: ffi.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: ffi.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: ffi.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: ffi.h: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX +## ----------------------------------- ## +## Report this to llvmbugs at cs.uiuc.edu ## +## ----------------------------------- ## +_ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +{ echo "$as_me:$LINENO: checking for ffi.h" >&5 +echo $ECHO_N "checking for ffi.h... $ECHO_C" >&6; } +if test "${ac_cv_header_ffi_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_ffi_h=$ac_header_preproc +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_ffi_h" >&5 +echo "${ECHO_T}$ac_cv_header_ffi_h" >&6; } + +fi +if test $ac_cv_header_ffi_h = yes; then + +cat >>confdefs.h <<\_ACEOF +#define FFI_HEADER "ffi.h" +_ACEOF + +fi + + + + { echo "$as_me:$LINENO: checking for HUGE_VAL sanity" >&5 @@ -30073,27 +28797,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 @@ -30153,27 +28860,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 @@ -30231,27 +28921,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 @@ -30287,7 +28960,9 @@ int main () { -struct tm *tp; tp->tm_sec; +struct tm tm; + int *p = &tm.tm_sec; + return !p; ; return 0; } @@ -30305,27 +28980,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 @@ -30383,27 +29041,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 @@ -30466,27 +29107,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 @@ -30544,27 +29168,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 @@ -30667,27 +29274,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 @@ -30696,7 +29287,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'}'` @@ -30780,27 +29371,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 @@ -30809,7 +29384,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'}'` @@ -30894,27 +29469,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 @@ -30923,7 +29482,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'}'` @@ -31006,27 +29565,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 @@ -31035,7 +29578,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'}'` @@ -31122,27 +29665,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 @@ -31151,7 +29678,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'}'` @@ -31235,27 +29762,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 @@ -31264,7 +29775,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'}'` @@ -31348,27 +29859,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 @@ -31377,7 +29872,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'}'` @@ -31521,27 +30016,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 @@ -31550,7 +30029,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 @@ -31581,7 +30060,7 @@ # include # define alloca _alloca # else -# if HAVE_ALLOCA_H +# ifdef HAVE_ALLOCA_H # include # else # ifdef _AIX @@ -31617,27 +30096,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 @@ -31646,7 +30109,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 @@ -31766,27 +30229,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 @@ -31795,7 +30242,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'}'` @@ -31932,27 +30379,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 @@ -32020,27 +30450,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 @@ -32111,27 +30524,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 @@ -32208,27 +30604,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 @@ -32302,27 +30681,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 @@ -32399,27 +30761,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 @@ -32496,27 +30841,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 @@ -32590,27 +30918,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 @@ -32687,27 +30998,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 @@ -32785,27 +31079,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 @@ -32883,27 +31160,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 @@ -32978,27 +31238,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 @@ -33066,27 +31309,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 @@ -33153,27 +31379,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 @@ -33241,27 +31450,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 @@ -33328,27 +31520,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 @@ -33415,27 +31590,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 @@ -33502,27 +31660,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 @@ -33593,27 +31734,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 @@ -33649,17 +31773,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 @@ -33790,27 +31907,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 @@ -33819,7 +31920,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'}'` @@ -33876,21 +31977,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 @@ -34213,27 +32314,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 @@ -34242,7 +32327,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'}'` @@ -34492,27 +32577,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 @@ -34742,7 +32810,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=: @@ -34751,10 +32820,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 @@ -34978,19 +33050,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'" @@ -35006,7 +33087,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 @@ -35035,7 +33116,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 @@ -35059,7 +33140,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. @@ -35346,8 +33427,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 @@ -35985,7 +34066,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 dpatel at apple.com Mon Jan 19 18:58:55 2009 From: dpatel at apple.com (Devang Patel) Date: Tue, 20 Jan 2009 00:58:55 -0000 Subject: [llvm-commits] [llvm] r62555 - /llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp Message-ID: <200901200058.n0K0wtJV015379@zion.cs.uiuc.edu> Author: dpatel Date: Mon Jan 19 18:58:55 2009 New Revision: 62555 URL: http://llvm.org/viewvc/llvm-project?rev=62555&view=rev Log: Do not use DenseMap because the iterator is invalidated while constructing types. After all there was a reason why std::map was used initially! Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp?rev=62555&r1=62554&r2=62555&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp (original) +++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp Mon Jan 19 18:58:55 2009 @@ -779,11 +779,11 @@ /// GVToDieMap - Tracks the mapping of unit level debug informaton /// variables to debug information entries. - DenseMap GVToDieMap; + std::map GVToDieMap; /// GVToDIEntryMap - Tracks the mapping of unit level debug informaton /// descriptors to debug information entries using a DIEntry proxy. - DenseMap GVToDIEntryMap; + std::map GVToDIEntryMap; /// Globals - A map of globally visible named entities for this unit. /// From dpatel at apple.com Mon Jan 19 18:59:56 2009 From: dpatel at apple.com (Devang Patel) Date: Mon, 19 Jan 2009 16:59:56 -0800 Subject: [llvm-commits] Invalid memory access due to debug info which building gcc In-Reply-To: <200901192120.18708.baldrick@free.fr> References: <200901161533.05528.baldrick@free.fr> <7DF8F12D-9D44-487C-8946-20A987365BF8@apple.com> <200901192120.18708.baldrick@free.fr> Message-ID: On Jan 19, 2009, at 12:20 PM, Duncan Sands wrote: > Hi Devang, > >> I am investigating similar case. Would it be possible to get a small >> test case (preprocessed source)? > > I got it down to the attached file. If you compile it like this > llvm-gcc -g bad.i > then you get the bad memory access. Note that it appears to > compile successfully - you need to run cc1 under valgrind or > the equivalent to see the problem. (The original testcase > crashed the compiler, but was much bigger). > > Good luck, > Thanks Duncan. Pl. try and see if rev. 62555 helps or not. If not then please let me know. Thanks, - Devang From gohman at apple.com Mon Jan 19 19:06:45 2009 From: gohman at apple.com (Dan Gohman) Date: Tue, 20 Jan 2009 01:06:45 -0000 Subject: [llvm-commits] [llvm] r62557 - in /llvm/trunk: lib/CodeGen/SelectionDAG/DAGCombiner.cpp test/CodeGen/X86/pr3216.ll Message-ID: <200901200106.n0K16jOJ015655@zion.cs.uiuc.edu> Author: djg Date: Mon Jan 19 19:06:45 2009 New Revision: 62557 URL: http://llvm.org/viewvc/llvm-project?rev=62557&view=rev Log: Fix a dagcombine to not generate loads of non-round integer types, as its comment says, even in the case where it will be generating extending loads. This fixes PR3216. Added: llvm/trunk/test/CodeGen/X86/pr3216.ll Modified: llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp Modified: llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp?rev=62557&r1=62556&r2=62557&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp Mon Jan 19 19:06:45 2009 @@ -3343,7 +3343,7 @@ // Do not generate loads of non-round integer types since these can // be expensive (and would be wrong if the type is not byte sized). - if (isa(N0) && N0.hasOneUse() && VT.isRound() && + if (isa(N0) && N0.hasOneUse() && EVT.isRound() && cast(N0)->getMemoryVT().getSizeInBits() > EVTBits && // Do not change the width of a volatile load. !cast(N0)->isVolatile()) { Added: llvm/trunk/test/CodeGen/X86/pr3216.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/pr3216.ll?rev=62557&view=auto ============================================================================== --- llvm/trunk/test/CodeGen/X86/pr3216.ll (added) +++ llvm/trunk/test/CodeGen/X86/pr3216.ll Mon Jan 19 19:06:45 2009 @@ -0,0 +1,14 @@ +; RUN: llvm-as < %s | llc -march=x86 | grep {sar. \$5} + + at foo = global i8 127 + +define i32 @main() nounwind { +entry: + %tmp = load i8* @foo + %bf.lo = lshr i8 %tmp, 5 + %bf.lo.cleared = and i8 %bf.lo, 7 + %0 = shl i8 %bf.lo.cleared, 5 + %bf.val.sext = ashr i8 %0, 5 + %conv = sext i8 %bf.val.sext to i32 + ret i32 %conv +} From gohman at apple.com Mon Jan 19 19:07:33 2009 From: gohman at apple.com (Dan Gohman) Date: Tue, 20 Jan 2009 01:07:33 -0000 Subject: [llvm-commits] [llvm] r62558 - /llvm/trunk/lib/Target/README.txt Message-ID: <200901200107.n0K17Ykh015685@zion.cs.uiuc.edu> Author: djg Date: Mon Jan 19 19:07:33 2009 New Revision: 62558 URL: http://llvm.org/viewvc/llvm-project?rev=62558&view=rev Log: Add a README entry noticed while investigating PR3216. 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=62558&r1=62557&r2=62558&view=diff ============================================================================== --- llvm/trunk/lib/Target/README.txt (original) +++ llvm/trunk/lib/Target/README.txt Mon Jan 19 19:07:33 2009 @@ -1651,3 +1651,25 @@ //===---------------------------------------------------------------------===// +This code: + +define inreg i32 @foo(i8* inreg %p) nounwind { + %tmp0 = load i8* %p + %tmp1 = ashr i8 %tmp0, 5 + %tmp2 = sext i8 %tmp1 to i32 + ret i32 %tmp2 +} + +could be dagcombine'd to a sign-extending load with a shift. +For example, on x86 this currently gets this: + + movb (%eax), %al + sarb $5, %al + movsbl %al, %eax + +while it could get this: + + movsbl (%eax), %eax + sarl $5, %eax + +//===---------------------------------------------------------------------===// From isanbard at gmail.com Mon Jan 19 19:09:41 2009 From: isanbard at gmail.com (Bill Wendling) Date: Tue, 20 Jan 2009 01:09:41 -0000 Subject: [llvm-commits] [llvm] r62559 - /llvm/tags/Apple/llvmCore-2092/ Message-ID: <200901200109.n0K19fAc015750@zion.cs.uiuc.edu> Author: void Date: Mon Jan 19 19:09:41 2009 New Revision: 62559 URL: http://llvm.org/viewvc/llvm-project?rev=62559&view=rev Log: Updating tag. Removed: llvm/tags/Apple/llvmCore-2092/ From isanbard at gmail.com Mon Jan 19 19:10:28 2009 From: isanbard at gmail.com (Bill Wendling) Date: Tue, 20 Jan 2009 01:10:28 -0000 Subject: [llvm-commits] [llvm] r62560 - /llvm/tags/Apple/llvmCore-2092/ Message-ID: <200901200110.n0K1AS1E015792@zion.cs.uiuc.edu> Author: void Date: Mon Jan 19 19:10:28 2009 New Revision: 62560 URL: http://llvm.org/viewvc/llvm-project?rev=62560&view=rev Log: Creating tag llvmCore-2092. Added: llvm/tags/Apple/llvmCore-2092/ - copied from r62559, llvm/trunk/ From sabre at nondot.org Mon Jan 19 19:15:41 2009 From: sabre at nondot.org (Chris Lattner) Date: Tue, 20 Jan 2009 01:15:41 -0000 Subject: [llvm-commits] [llvm] r62561 - in /llvm/trunk: lib/Transforms/Utils/SimplifyCFG.cpp test/Transforms/SimplifyCFG/2009-01-19-UnconditionalTrappingConstantExpr.ll Message-ID: <200901200115.n0K1FfaV015986@zion.cs.uiuc.edu> Author: lattner Date: Mon Jan 19 19:15:41 2009 New Revision: 62561 URL: http://llvm.org/viewvc/llvm-project?rev=62561&view=rev Log: another fix for PR3354 Modified: llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp llvm/trunk/test/Transforms/SimplifyCFG/2009-01-19-UnconditionalTrappingConstantExpr.ll Modified: llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp?rev=62561&r1=62560&r2=62561&view=diff ============================================================================== --- llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp (original) +++ llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp Mon Jan 19 19:15:41 2009 @@ -1559,6 +1559,11 @@ // fold the conditions into logical ops and one cond br. if (&BB->front() != BI) return false; + + + if (ConstantExpr *CE = dyn_cast(BI->getCondition())) + if (CE->canTrap()) + return false; int PBIOp, BIOp; if (PBI->getSuccessor(0) == BI->getSuccessor(0)) Modified: llvm/trunk/test/Transforms/SimplifyCFG/2009-01-19-UnconditionalTrappingConstantExpr.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/SimplifyCFG/2009-01-19-UnconditionalTrappingConstantExpr.ll?rev=62561&r1=62560&r2=62561&view=diff ============================================================================== --- llvm/trunk/test/Transforms/SimplifyCFG/2009-01-19-UnconditionalTrappingConstantExpr.ll (original) +++ llvm/trunk/test/Transforms/SimplifyCFG/2009-01-19-UnconditionalTrappingConstantExpr.ll Mon Jan 19 19:15:41 2009 @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis | grep {br i1 } | count 2 +; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis | grep {br i1 } | count 4 ; PR3354 ; Do not merge bb1 into the entry block, it might trap. @@ -18,3 +18,14 @@ unwind } +define i32 @test2(i32 %tmp21, i32 %tmp24, i1 %tmp34) { + br i1 %tmp34, label %bb5, label %bb6 + +bb5: ; preds = %bb4 + br i1 icmp sgt (i32 sdiv (i32 32767, i32 0), i32 0), label %bb6, label %bb7 +bb6: + ret i32 42 +bb7: + unwind +} + From dalej at apple.com Mon Jan 19 19:18:15 2009 From: dalej at apple.com (Dale Johannesen) Date: Tue, 20 Jan 2009 01:18:15 -0000 Subject: [llvm-commits] [llvm-gcc-4.2] r62563 - /llvm-gcc-4.2/tags/Apple/llvmgcc42-9999/ Message-ID: <200901200118.n0K1IFGp016152@zion.cs.uiuc.edu> Author: johannes Date: Mon Jan 19 19:18:14 2009 New Revision: 62563 URL: http://llvm.org/viewvc/llvm-project?rev=62563&view=rev Log: Creating llvmgcc42-9999 branch Added: llvm-gcc-4.2/tags/Apple/llvmgcc42-9999/ - copied from r62562, llvm-gcc-4.2/trunk/ From isanbard at gmail.com Mon Jan 19 19:23:38 2009 From: isanbard at gmail.com (Bill Wendling) Date: Tue, 20 Jan 2009 01:23:38 -0000 Subject: [llvm-commits] [llvm-gcc-4.2] r62564 - /llvm-gcc-4.2/tags/Apple/llvmgcc42-9999/ Message-ID: <200901200123.n0K1NcFW016335@zion.cs.uiuc.edu> Author: void Date: Mon Jan 19 19:23:38 2009 New Revision: 62564 URL: http://llvm.org/viewvc/llvm-project?rev=62564&view=rev Log: Oops. Removed: llvm-gcc-4.2/tags/Apple/llvmgcc42-9999/ From nicholas at mxc.ca Mon Jan 19 19:41:38 2009 From: nicholas at mxc.ca (Nick Lewycky) Date: Mon, 19 Jan 2009 17:41:38 -0800 Subject: [llvm-commits] llvm-gcc build broken In-Reply-To: <200901191828.34146.baldrick@free.fr> References: <200901191828.34146.baldrick@free.fr> Message-ID: <49752BD2.6080101@mxc.ca> Duncan Sands wrote: > When building llvm-gcc on x86-32 linux at top of tree I get: After wiping my llvm-gcc/build directory, I'm seeing this on both x86-32 and x86-64 Linux. Nick > gcc/xgcc -Bgcc/ -Bi686-pc-linux-gnu/bin/ -Bi686-pc-linux-gnu/lib/ -isystem i686-pc-linux-gnu/include -isystem i686-pc-linux-gnu/sys-include -c -DHAVE_CONFIG_H -O2 -g -O2 -I. -I../../../gcc-4.2.llvm/libiberty/../include -W-Wall -pedantic -Wwrite-strings -Wstrict-prototypes -Wc++-compat ../../../gcc-4.2.llvm/libiberty/cplus-dem.c -o cplus-dem.o > ../../../gcc-4.2.llvm/libiberty/cplus-dem.c:55: warning: function declaration isn't a prototype > ../../../gcc-4.2.llvm/libiberty/cplus-dem.c:55: error: conflicting types for 'malloc' > ../../../gcc-4.2.llvm/libiberty/cplus-dem.c:56: warning: function declaration isn't a prototype > ../../../gcc-4.2.llvm/libiberty/cplus-dem.c: In function 'code_for_qualifier': > ../../../gcc-4.2.llvm/libiberty/cplus-dem.c:582: warning: implicit declaration of function 'abort' > ../../../gcc-4.2.llvm/libiberty/cplus-dem.c:582: warning: incompatible implicit declaration of built-in function 'abort' > ../../../gcc-4.2.llvm/libiberty/cplus-dem.c: In function 'qualifier_string': > ../../../gcc-4.2.llvm/libiberty/cplus-dem.c:622: warning: incompatible implicit declaration of built-in function 'abort' > ../../../gcc-4.2.llvm/libiberty/cplus-dem.c: In function 'squangle_mop_up': > ../../../gcc-4.2.llvm/libiberty/cplus-dem.c:1082: warning: implicit declaration of function 'free' > ../../../gcc-4.2.llvm/libiberty/cplus-dem.c: In function 'demangle_qualified': > ../../../gcc-4.2.llvm/libiberty/cplus-dem.c:3177: warning: implicit declaration of function 'atoi' > _______________________________________________ > llvm-commits mailing list > llvm-commits at cs.uiuc.edu > http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits > From isanbard at gmail.com Tue Jan 20 00:10:43 2009 From: isanbard at gmail.com (Bill Wendling) Date: Tue, 20 Jan 2009 06:10:43 -0000 Subject: [llvm-commits] [llvm] r62571 - /llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp Message-ID: <200901200610.n0K6Ahe2025435@zion.cs.uiuc.edu> Author: void Date: Tue Jan 20 00:10:42 2009 New Revision: 62571 URL: http://llvm.org/viewvc/llvm-project?rev=62571&view=rev Log: Shift types need to match. 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=62571&r1=62570&r2=62571&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp Tue Jan 20 00:10:42 2009 @@ -2958,11 +2958,12 @@ /// /// where Op is the hexidecimal representation of floating point value. static SDValue -GetExponent(SelectionDAG &DAG, SDValue Op) { +GetExponent(SelectionDAG &DAG, SDValue Op, const TargetLowering &TLI) { SDValue t1 = DAG.getNode(ISD::SRL, MVT::i32, Op, - DAG.getConstant(23, MVT::i32)); + DAG.getConstant(23, TLI.getShiftAmountTy())); SDValue t2 = DAG.getNode(ISD::SUB, MVT::i32, t1, DAG.getConstant(127, MVT::i32)); + // SDValue t3 = DAG.getNode(ISD::BIT_CONVERT, MVT::i32, t2); return DAG.getNode(ISD::UINT_TO_FP, MVT::f32, t2); } @@ -3029,7 +3030,7 @@ // IntegerPartOfX <<= 23; IntegerPartOfX = DAG.getNode(ISD::SHL, MVT::i32, IntegerPartOfX, - DAG.getConstant(23, MVT::i32)); + DAG.getConstant(23, TLI.getShiftAmountTy())); if (LimitFloatPrecision <= 6) { // For floating-point precision of 6: @@ -3140,7 +3141,7 @@ SDValue Op1 = DAG.getNode(ISD::BIT_CONVERT, MVT::i32, Op); // Scale the exponent by log(2) [0.69314718f]. - SDValue Exp = GetExponent(DAG, Op1); + SDValue Exp = GetExponent(DAG, Op1, TLI); SDValue LogOfExponent = DAG.getNode(ISD::FMUL, MVT::f32, Exp, getF32Constant(DAG, 0x3f317218)); @@ -3246,7 +3247,7 @@ SDValue Op1 = DAG.getNode(ISD::BIT_CONVERT, MVT::i32, Op); // Get the exponent. - SDValue LogOfExponent = GetExponent(DAG, Op1); + SDValue LogOfExponent = GetExponent(DAG, Op1, TLI); // Get the significand and build it into a floating-point number with // exponent of 1. @@ -3351,7 +3352,7 @@ SDValue Op1 = DAG.getNode(ISD::BIT_CONVERT, MVT::i32, Op); // Scale the exponent by log10(2) [0.30102999f]. - SDValue Exp = GetExponent(DAG, Op1); + SDValue Exp = GetExponent(DAG, Op1, TLI); SDValue LogOfExponent = DAG.getNode(ISD::FMUL, MVT::f32, Exp, getF32Constant(DAG, 0x3e9a209a)); @@ -3455,7 +3456,7 @@ // IntegerPartOfX <<= 23; IntegerPartOfX = DAG.getNode(ISD::SHL, MVT::i32, IntegerPartOfX, - DAG.getConstant(23, MVT::i32)); + DAG.getConstant(23, TLI.getShiftAmountTy())); if (LimitFloatPrecision <= 6) { // For floating-point precision of 6: @@ -3584,7 +3585,7 @@ // IntegerPartOfX <<= 23; IntegerPartOfX = DAG.getNode(ISD::SHL, MVT::i32, IntegerPartOfX, - DAG.getConstant(23, MVT::i32)); + DAG.getConstant(23, TLI.getShiftAmountTy())); if (LimitFloatPrecision <= 6) { // For floating-point precision of 6: From isanbard at gmail.com Tue Jan 20 00:24:00 2009 From: isanbard at gmail.com (Bill Wendling) Date: Tue, 20 Jan 2009 06:24:00 -0000 Subject: [llvm-commits] [llvm] r62572 - /llvm/trunk/test/CodeGen/X86/limited-prec.ll Message-ID: <200901200624.n0K6O0sv025809@zion.cs.uiuc.edu> Author: void Date: Tue Jan 20 00:23:59 2009 New Revision: 62572 URL: http://llvm.org/viewvc/llvm-project?rev=62572&view=rev Log: Testcase for limited precision stuff. Added: llvm/trunk/test/CodeGen/X86/limited-prec.ll Added: llvm/trunk/test/CodeGen/X86/limited-prec.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/limited-prec.ll?rev=62572&view=auto ============================================================================== --- llvm/trunk/test/CodeGen/X86/limited-prec.ll (added) +++ llvm/trunk/test/CodeGen/X86/limited-prec.ll Tue Jan 20 00:23:59 2009 @@ -0,0 +1,133 @@ +; RUN: llvm-as < %s | llc -limit-float-precision=6 -march=x86 | \ +; RUN: not grep exp | not grep log | not grep pow +; RUN: llvm-as < %s | llc -limit-float-precision=12 -march=x86 | \ +; RUN: not grep exp | not grep log | not grep pow +; RUN: llvm-as < %s | llc -limit-float-precision=18 -march=x86 | \ +; RUN: not grep exp | not grep log | not grep pow +target triple = "i386-apple-darwin9.5" + +define float @f1(float %x) nounwind noinline { +entry: + %x_addr = alloca float ; [#uses=2] + %retval = alloca float ; [#uses=2] + %0 = alloca float ; [#uses=2] + %"alloca point" = bitcast i32 0 to i32 ; [#uses=0] + store float %x, float* %x_addr + %1 = load float* %x_addr, align 4 ; [#uses=1] + %2 = call float @llvm.exp.f32(float %1) ; [#uses=1] + store float %2, float* %0, align 4 + %3 = load float* %0, align 4 ; [#uses=1] + store float %3, float* %retval, align 4 + br label %return + +return: ; preds = %entry + %retval1 = load float* %retval ; [#uses=1] + ret float %retval1 +} + +declare float @llvm.exp.f32(float) nounwind readonly + +define float @f2(float %x) nounwind noinline { +entry: + %x_addr = alloca float ; [#uses=2] + %retval = alloca float ; [#uses=2] + %0 = alloca float ; [#uses=2] + %"alloca point" = bitcast i32 0 to i32 ; [#uses=0] + store float %x, float* %x_addr + %1 = load float* %x_addr, align 4 ; [#uses=1] + %2 = call float @llvm.exp2.f32(float %1) ; [#uses=1] + store float %2, float* %0, align 4 + %3 = load float* %0, align 4 ; [#uses=1] + store float %3, float* %retval, align 4 + br label %return + +return: ; preds = %entry + %retval1 = load float* %retval ; [#uses=1] + ret float %retval1 +} + +declare float @llvm.exp2.f32(float) nounwind readonly + +define float @f3(float %x) nounwind noinline { +entry: + %x_addr = alloca float ; [#uses=2] + %retval = alloca float ; [#uses=2] + %0 = alloca float ; [#uses=2] + %"alloca point" = bitcast i32 0 to i32 ; [#uses=0] + store float %x, float* %x_addr + %1 = load float* %x_addr, align 4 ; [#uses=1] + %2 = call float @llvm.pow.f32(float 1.000000e+01, float %1) ; [#uses=1] + store float %2, float* %0, align 4 + %3 = load float* %0, align 4 ; [#uses=1] + store float %3, float* %retval, align 4 + br label %return + +return: ; preds = %entry + %retval1 = load float* %retval ; [#uses=1] + ret float %retval1 +} + +declare float @llvm.pow.f32(float, float) nounwind readonly + +define float @f4(float %x) nounwind noinline { +entry: + %x_addr = alloca float ; [#uses=2] + %retval = alloca float ; [#uses=2] + %0 = alloca float ; [#uses=2] + %"alloca point" = bitcast i32 0 to i32 ; [#uses=0] + store float %x, float* %x_addr + %1 = load float* %x_addr, align 4 ; [#uses=1] + %2 = call float @llvm.log.f32(float %1) ; [#uses=1] + store float %2, float* %0, align 4 + %3 = load float* %0, align 4 ; [#uses=1] + store float %3, float* %retval, align 4 + br label %return + +return: ; preds = %entry + %retval1 = load float* %retval ; [#uses=1] + ret float %retval1 +} + +declare float @llvm.log.f32(float) nounwind readonly + +define float @f5(float %x) nounwind noinline { +entry: + %x_addr = alloca float ; [#uses=2] + %retval = alloca float ; [#uses=2] + %0 = alloca float ; [#uses=2] + %"alloca point" = bitcast i32 0 to i32 ; [#uses=0] + store float %x, float* %x_addr + %1 = load float* %x_addr, align 4 ; [#uses=1] + %2 = call float @llvm.log2.f32(float %1) ; [#uses=1] + store float %2, float* %0, align 4 + %3 = load float* %0, align 4 ; [#uses=1] + store float %3, float* %retval, align 4 + br label %return + +return: ; preds = %entry + %retval1 = load float* %retval ; [#uses=1] + ret float %retval1 +} + +declare float @llvm.log2.f32(float) nounwind readonly + +define float @f6(float %x) nounwind noinline { +entry: + %x_addr = alloca float ; [#uses=2] + %retval = alloca float ; [#uses=2] + %0 = alloca float ; [#uses=2] + %"alloca point" = bitcast i32 0 to i32 ; [#uses=0] + store float %x, float* %x_addr + %1 = load float* %x_addr, align 4 ; [#uses=1] + %2 = call float @llvm.log10.f32(float %1) ; [#uses=1] + store float %2, float* %0, align 4 + %3 = load float* %0, align 4 ; [#uses=1] + store float %3, float* %retval, align 4 + br label %return + +return: ; preds = %entry + %retval1 = load float* %retval ; [#uses=1] + ret float %retval1 +} + +declare float @llvm.log10.f32(float) nounwind readonly From evan.cheng at apple.com Tue Jan 20 00:44:16 2009 From: evan.cheng at apple.com (Evan Cheng) Date: Tue, 20 Jan 2009 06:44:16 -0000 Subject: [llvm-commits] [llvm] r62573 - in /llvm/trunk/lib/CodeGen: SimpleRegisterCoalescing.cpp SimpleRegisterCoalescing.h Message-ID: <200901200644.n0K6iHT9026470@zion.cs.uiuc.edu> Author: evancheng Date: Tue Jan 20 00:44:16 2009 New Revision: 62573 URL: http://llvm.org/viewvc/llvm-project?rev=62573&view=rev Log: Refactor code. No functionality change. Modified: llvm/trunk/lib/CodeGen/SimpleRegisterCoalescing.cpp llvm/trunk/lib/CodeGen/SimpleRegisterCoalescing.h Modified: llvm/trunk/lib/CodeGen/SimpleRegisterCoalescing.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SimpleRegisterCoalescing.cpp?rev=62573&r1=62572&r2=62573&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SimpleRegisterCoalescing.cpp (original) +++ llvm/trunk/lib/CodeGen/SimpleRegisterCoalescing.cpp Tue Jan 20 00:44:16 2009 @@ -1040,6 +1040,75 @@ } +/// CanJoinExtractSubRegToPhysReg - Return true if it's possible to coalesce +/// an extract_subreg where dst is a physical register, e.g. +/// cl = EXTRACT_SUBREG reg1024, 1 +bool +SimpleRegisterCoalescing::CanJoinExtractSubRegToPhysReg(MachineInstr *CopyMI, + unsigned DstReg, unsigned SrcReg, + unsigned SubIdx, unsigned &RealDstReg) { + if (CopyMI->getOperand(1).getSubReg()) { + DOUT << "\tSrc of extract_subreg already coalesced with reg" + << " of a super-class.\n"; + return false; // Not coalescable. + } + + const TargetRegisterClass *RC = mri_->getRegClass(SrcReg); + RealDstReg = getMatchingSuperReg(DstReg, SubIdx, RC, tri_); + assert(RealDstReg && "Invalid extract_subreg instruction!"); + + // For this type of EXTRACT_SUBREG, conservatively + // check if the live interval of the source register interfere with the + // actual super physical register we are trying to coalesce with. + LiveInterval &RHS = li_->getInterval(SrcReg); + if (li_->hasInterval(RealDstReg) && + RHS.overlaps(li_->getInterval(RealDstReg))) { + DOUT << "Interfere with register "; + DEBUG(li_->getInterval(RealDstReg).print(DOUT, tri_)); + return false; // Not coalescable + } + for (const unsigned* SR = tri_->getSubRegisters(RealDstReg); *SR; ++SR) + if (li_->hasInterval(*SR) && RHS.overlaps(li_->getInterval(*SR))) { + DOUT << "Interfere with sub-register "; + DEBUG(li_->getInterval(*SR).print(DOUT, tri_)); + return false; // Not coalescable + } + return true; +} + +/// CanJoinInsertSubRegToPhysReg - Return true if it's possible to coalesce +/// an insert_subreg where src is a physical register, e.g. +/// reg1024 = INSERT_SUBREG reg1024, c1, 0 +bool +SimpleRegisterCoalescing::CanJoinInsertSubRegToPhysReg(MachineInstr *CopyMI, + unsigned DstReg, unsigned SrcReg, + unsigned SubIdx, unsigned &RealSrcReg) { + if (CopyMI->getOperand(1).getSubReg()) { + DOUT << "\tSrc of insert_subreg already coalesced with reg" + << " of a super-class.\n"; + return false; // Not coalescable. + } + const TargetRegisterClass *RC = mri_->getRegClass(DstReg); + RealSrcReg = getMatchingSuperReg(SrcReg, SubIdx, RC, tri_); + assert(RealSrcReg && "Invalid extract_subreg instruction!"); + + LiveInterval &RHS = li_->getInterval(DstReg); + if (li_->hasInterval(RealSrcReg) && + RHS.overlaps(li_->getInterval(RealSrcReg))) { + DOUT << "Interfere with register "; + DEBUG(li_->getInterval(RealSrcReg).print(DOUT, tri_)); + return false; // Not coalescable + } + for (const unsigned* SR = tri_->getSubRegisters(RealSrcReg); *SR; ++SR) + if (li_->hasInterval(*SR) && RHS.overlaps(li_->getInterval(*SR))) { + DOUT << "Interfere with sub-register "; + DEBUG(li_->getInterval(*SR).print(DOUT, tri_)); + return false; // Not coalescable + } + return true; +} + + /// JoinCopy - Attempt to join intervals corresponding to SrcReg/DstReg, /// which are the src/dst of the copy instruction CopyMI. This returns true /// if the copy was successfully coalesced away. If it is not currently @@ -1135,43 +1204,15 @@ DstReg = tri_->getSubReg(DstReg, SubIdx); SubIdx = 0; } else if ((DstIsPhys && isExtSubReg) || (SrcIsPhys && isInsSubReg)) { - // If this is a extract_subreg where dst is a physical register, e.g. - // cl = EXTRACT_SUBREG reg1024, 1 - // then create and update the actual physical register allocated to RHS. - // Ditto for - // reg1024 = INSERT_SUBREG r1024, cl, 1 - if (CopyMI->getOperand(1).getSubReg()) { - DOUT << "\tSrc of extract_ / insert_subreg already coalesced with reg" - << " of a super-class.\n"; - return false; // Not coalescable. - } - const TargetRegisterClass *RC = - mri_->getRegClass(isExtSubReg ? SrcReg : DstReg); if (isExtSubReg) { - RealDstReg = getMatchingSuperReg(DstReg, SubIdx, RC, tri_); - assert(RealDstReg && "Invalid extract_subreg instruction!"); + if (!CanJoinExtractSubRegToPhysReg(CopyMI, DstReg, SrcReg, SubIdx, + RealDstReg)) + return false; // Not coalescable } else { - RealSrcReg = getMatchingSuperReg(SrcReg, SubIdx, RC, tri_); - assert(RealSrcReg && "Invalid extract_subreg instruction!"); - } - - // For this type of EXTRACT_SUBREG, conservatively - // check if the live interval of the source register interfere with the - // actual super physical register we are trying to coalesce with. - unsigned PhysReg = isExtSubReg ? RealDstReg : RealSrcReg; - LiveInterval &RHS = li_->getInterval(isExtSubReg ? SrcReg : DstReg); - if (li_->hasInterval(PhysReg) && - RHS.overlaps(li_->getInterval(PhysReg))) { - DOUT << "Interfere with register "; - DEBUG(li_->getInterval(PhysReg).print(DOUT, tri_)); - return false; // Not coalescable - } - for (const unsigned* SR = tri_->getSubRegisters(PhysReg); *SR; ++SR) - if (li_->hasInterval(*SR) && RHS.overlaps(li_->getInterval(*SR))) { - DOUT << "Interfere with sub-register "; - DEBUG(li_->getInterval(*SR).print(DOUT, tri_)); + if (!CanJoinInsertSubRegToPhysReg(CopyMI, DstReg, SrcReg, SubIdx, + RealSrcReg)) return false; // Not coalescable - } + } SubIdx = 0; } else { unsigned OldSubIdx = isExtSubReg ? CopyMI->getOperand(0).getSubReg() Modified: llvm/trunk/lib/CodeGen/SimpleRegisterCoalescing.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SimpleRegisterCoalescing.h?rev=62573&r1=62572&r2=62573&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SimpleRegisterCoalescing.h (original) +++ llvm/trunk/lib/CodeGen/SimpleRegisterCoalescing.h Tue Jan 20 00:44:16 2009 @@ -232,6 +232,20 @@ bool HasIncompatibleSubRegDefUse(MachineInstr *CopyMI, unsigned VirtReg, unsigned PhysReg); + /// CanJoinExtractSubRegToPhysReg - Return true if it's possible to coalesce + /// an extract_subreg where dst is a physical register, e.g. + /// cl = EXTRACT_SUBREG reg1024, 1 + bool CanJoinExtractSubRegToPhysReg(MachineInstr *CopyMI, + unsigned DstReg, unsigned SrcReg, + unsigned SubIdx, unsigned &RealDstReg); + + /// CanJoinInsertSubRegToPhysReg - Return true if it's possible to coalesce + /// an insert_subreg where src is a physical register, e.g. + /// reg1024 = INSERT_SUBREG reg1024, c1, 0 + bool CanJoinInsertSubRegToPhysReg(MachineInstr *CopyMI, + unsigned DstReg, unsigned SrcReg, + unsigned SubIdx, unsigned &RealDstReg); + /// RangeIsDefinedByCopyFromReg - Return true if the specified live range of /// the specified live interval is defined by a copy from the specified /// register. From baldrick at free.fr Tue Jan 20 02:06:53 2009 From: baldrick at free.fr (Duncan Sands) Date: Tue, 20 Jan 2009 09:06:53 +0100 Subject: [llvm-commits] [llvm] r62533 - in /llvm/trunk: lib/CodeGen/SelectionDAG/DAGCombiner.cpp lib/CodeGen/SelectionDAG/SelectionDAG.cpp test/CodeGen/X86/pr3018.ll In-Reply-To: <200901192144.n0JLiNcY008949@zion.cs.uiuc.edu> References: <200901192144.n0JLiNcY008949@zion.cs.uiuc.edu> Message-ID: <200901200906.53943.baldrick@free.fr> Hi Dan, > Fix SelectionDAG::ReplaceAllUsesWith to behave correctly when > uses are added to the From node while it is processing From's > use list, because of automatic local CSE. The fix is to avoid > visiting any new uses. > > Fix a few places in the DAGCombiner that assumed that after > a RAUW call, the From node has no users and may be deleted. this might cause problems for legalize types - not sure. There's a bunch of logic there to deal with similar problems, but I'm not sure it is valid now that there is this new mechanism. I will do some thinking/testing. Also, can you please document this behavior somewhere. Thanks, Duncan. From baldrick at free.fr Tue Jan 20 02:11:43 2009 From: baldrick at free.fr (Duncan Sands) Date: Tue, 20 Jan 2009 09:11:43 +0100 Subject: [llvm-commits] [llvm] r62545 - in /llvm/trunk: include/llvm/Analysis/DebugInfo.h lib/Analysis/DebugInfo.cpp lib/CodeGen/AsmPrinter/DwarfWriter.cpp lib/CodeGen/SelectionDAG/FastISel.cpp lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp In-Reply-To: <200901192321.n0JNLnaw012245@zion.cs.uiuc.edu> References: <200901192321.n0JNLnaw012245@zion.cs.uiuc.edu> Message-ID: <200901200911.43772.baldrick@free.fr> Hi Devang, > @@ -117,6 +118,8 @@ > std::string getFilename() const { return getStringField(3); } > std::string getDirectory() const { return getStringField(4); } > std::string getProducer() const { return getStringField(5); } > + /// Verify - Verify that a compile unit is well formed. > + bool Verify() const; missing blank line between getProducer and Verify. Ciao, Duncan. From baldrick at free.fr Tue Jan 20 03:05:20 2009 From: baldrick at free.fr (Duncan Sands) Date: Tue, 20 Jan 2009 09:05:20 -0000 Subject: [llvm-commits] [llvm] r62576 - /llvm/trunk/include/llvm/CodeGen/ScheduleDAGInstrs.h Message-ID: <200901200905.n0K95Ko6006962@zion.cs.uiuc.edu> Author: baldrick Date: Tue Jan 20 03:05:19 2009 New Revision: 62576 URL: http://llvm.org/viewvc/llvm-project?rev=62576&view=rev Log: If a vector is empty, you're not allowed to access any elements, even if it is only to take the address. Test: break-anti-dependencies.ll with ENABLE_EXPENSIVE_CHECKS. Modified: llvm/trunk/include/llvm/CodeGen/ScheduleDAGInstrs.h Modified: llvm/trunk/include/llvm/CodeGen/ScheduleDAGInstrs.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/ScheduleDAGInstrs.h?rev=62576&r1=62575&r2=62576&view=diff ============================================================================== --- llvm/trunk/include/llvm/CodeGen/ScheduleDAGInstrs.h (original) +++ llvm/trunk/include/llvm/CodeGen/ScheduleDAGInstrs.h Tue Jan 20 03:05:19 2009 @@ -49,10 +49,11 @@ /// SUnit *NewSUnit(MachineInstr *MI) { #ifndef NDEBUG - const SUnit *Addr = &SUnits[0]; + const SUnit *Addr = SUnits.empty() ? 0 : &SUnits[0]; #endif SUnits.push_back(SUnit(MI, (unsigned)SUnits.size())); - assert(Addr == &SUnits[0] && "SUnits std::vector reallocated on the fly!"); + assert((Addr == 0 || Addr == &SUnits[0]) && + "SUnits std::vector reallocated on the fly!"); SUnits.back().OrigNode = &SUnits.back(); return &SUnits.back(); } From isanbard at gmail.com Tue Jan 20 04:28:44 2009 From: isanbard at gmail.com (Bill Wendling) Date: Tue, 20 Jan 2009 10:28:44 -0000 Subject: [llvm-commits] [llvm] r62578 - /llvm/trunk/test/Transforms/SimplifyCFG/2009-01-19-UnconditionalTrappingConstantExpr.ll Message-ID: <200901201028.n0KASjev011316@zion.cs.uiuc.edu> Author: void Date: Tue Jan 20 04:28:39 2009 New Revision: 62578 URL: http://llvm.org/viewvc/llvm-project?rev=62578&view=rev Log: Temporarily XFAIL until this can be looked at. r62557 is what caused it to start failing. Modified: llvm/trunk/test/Transforms/SimplifyCFG/2009-01-19-UnconditionalTrappingConstantExpr.ll Modified: llvm/trunk/test/Transforms/SimplifyCFG/2009-01-19-UnconditionalTrappingConstantExpr.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/SimplifyCFG/2009-01-19-UnconditionalTrappingConstantExpr.ll?rev=62578&r1=62577&r2=62578&view=diff ============================================================================== --- llvm/trunk/test/Transforms/SimplifyCFG/2009-01-19-UnconditionalTrappingConstantExpr.ll (original) +++ llvm/trunk/test/Transforms/SimplifyCFG/2009-01-19-UnconditionalTrappingConstantExpr.ll Tue Jan 20 04:28:39 2009 @@ -1,4 +1,5 @@ ; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis | grep {br i1 } | count 4 +; XFAIL: * ; PR3354 ; Do not merge bb1 into the entry block, it might trap. From baldrick at free.fr Tue Jan 20 04:51:46 2009 From: baldrick at free.fr (Duncan Sands) Date: Tue, 20 Jan 2009 10:51:46 -0000 Subject: [llvm-commits] [llvm-gcc-4.2] r62579 - /llvm-gcc-4.2/trunk/gcc/stub-c.c Message-ID: <200901201051.n0KAplVs012086@zion.cs.uiuc.edu> Author: baldrick Date: Tue Jan 20 04:51:29 2009 New Revision: 62579 URL: http://llvm.org/viewvc/llvm-project?rev=62579&view=rev Log: Remove a no longer needed function. Modified: llvm-gcc-4.2/trunk/gcc/stub-c.c Modified: llvm-gcc-4.2/trunk/gcc/stub-c.c URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/stub-c.c?rev=62579&r1=62578&r2=62579&view=diff ============================================================================== --- llvm-gcc-4.2/trunk/gcc/stub-c.c (original) +++ llvm-gcc-4.2/trunk/gcc/stub-c.c Tue Jan 20 04:51:29 2009 @@ -180,11 +180,3 @@ { gcc_assert(0); } - -/* APPLE LOCAL begin radar 6300081 */ -tree -build_generic_block_struct_type (void) -{ - gcc_assert(0); -} -/* APPLE LOCAL end radar 6300081 */ From alenhar2 at cs.uiuc.edu Tue Jan 20 11:27:03 2009 From: alenhar2 at cs.uiuc.edu (Andrew Lenharth) Date: Tue, 20 Jan 2009 17:27:03 -0000 Subject: [llvm-commits] [llvm-gcc-4.2] r62583 - /llvm-gcc-4.2/trunk/gcc/config/alpha/llvm-alpha.cpp Message-ID: <200901201727.n0KHR38L025645@zion.cs.uiuc.edu> Author: alenhar2 Date: Tue Jan 20 11:27:03 2009 New Revision: 62583 URL: http://llvm.org/viewvc/llvm-project?rev=62583&view=rev Log: some alpha patches for a change. Modified: llvm-gcc-4.2/trunk/gcc/config/alpha/llvm-alpha.cpp Modified: llvm-gcc-4.2/trunk/gcc/config/alpha/llvm-alpha.cpp URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config/alpha/llvm-alpha.cpp?rev=62583&r1=62582&r2=62583&view=diff ============================================================================== --- llvm-gcc-4.2/trunk/gcc/config/alpha/llvm-alpha.cpp (original) +++ llvm-gcc-4.2/trunk/gcc/config/alpha/llvm-alpha.cpp Tue Jan 20 11:27:03 2009 @@ -112,6 +112,60 @@ Result = Builder.CreateTrunc(Result, Type::Int64Ty); return true; } + case ALPHA_BUILTIN_CMPBGE: { + Value *Arg0 = Ops[0]; + Value *Arg1 = Ops[1]; + Value* cmps[8]; + for (unsigned x = 0; x < 8; ++x) { + Value* LHS = Builder.CreateLShr(Arg0, ConstantInt::get(Type::Int64Ty, x*8)); + LHS = Builder.CreateTrunc(LHS, Type::Int8Ty); + Value* RHS = Builder.CreateLShr(Arg1, ConstantInt::get(Type::Int64Ty, x*8)); + RHS = Builder.CreateTrunc(RHS, Type::Int8Ty); + Value* cmps = Builder.CreateICmpUGE(LHS, RHS); + cmps = Builder.CreateIsNotNull(cmps); + cmps = Builder.CreateZExt(cmps, Type::Int64Ty); + cmps = Builder.CreateShl(cmps, ConstantInt::get(Type::Int64Ty, x)); + if (x == 0) + Result = cmps; + else + Result = Builder.CreateOr(Result,cmps); + } + return true; + } + case ALPHA_BUILTIN_EXTBL: + case ALPHA_BUILTIN_EXTWL: + case ALPHA_BUILTIN_EXTLL: + case ALPHA_BUILTIN_EXTQL: { + unsigned long long mask = 0; + switch (FnCode) { + case ALPHA_BUILTIN_EXTBL: mask = 0x00000000000000FFULL; break; + case ALPHA_BUILTIN_EXTWL: mask = 0x000000000000FFFFULL; break; + case ALPHA_BUILTIN_EXTLL: mask = 0x00000000FFFFFFFFULL; break; + case ALPHA_BUILTIN_EXTQL: mask = 0xFFFFFFFFFFFFFFFFULL; break; + }; + Value *Arg0 = Ops[0]; + Value *Arg1 = Builder.CreateAnd(Ops[1], ConstantInt::get(Type::Int64Ty, 7)); + Arg0 = Builder.CreateLShr(Arg0, Arg1); + Result = Builder.CreateAnd(Arg0, ConstantInt::get(Type::Int64Ty, mask)); + return true; + } + case ALPHA_BUILTIN_EXTWH: + case ALPHA_BUILTIN_EXTLH: + case ALPHA_BUILTIN_EXTQH: { + unsigned long long mask = 0; + switch (FnCode) { + case ALPHA_BUILTIN_EXTWH: mask = 0x000000000000FFFFULL; break; + case ALPHA_BUILTIN_EXTLH: mask = 0x00000000FFFFFFFFULL; break; + case ALPHA_BUILTIN_EXTQH: mask = 0xFFFFFFFFFFFFFFFFULL; break; + }; + Value *Arg0 = Ops[0]; + Value *Arg1 = Builder.CreateAnd(Ops[1], ConstantInt::get(Type::Int64Ty, 7)); + Arg1 = Builder.CreateSub(ConstantInt::get(Type::Int64Ty, 64), Arg1); + Arg0 = Builder.CreateShl(Arg0, Arg1); + Result = Builder.CreateAnd(Arg0, ConstantInt::get(Type::Int64Ty, mask)); + return true; + } + default: break; } From evan.cheng at apple.com Tue Jan 20 11:30:40 2009 From: evan.cheng at apple.com (Evan Cheng) Date: Tue, 20 Jan 2009 17:30:40 -0000 Subject: [llvm-commits] [llvm] r62584 - /llvm/trunk/include/llvm/CodeGen/MachineInstr.h Message-ID: <200901201730.n0KHUeAB025760@zion.cs.uiuc.edu> Author: evancheng Date: Tue Jan 20 11:30:40 2009 New Revision: 62584 URL: http://llvm.org/viewvc/llvm-project?rev=62584&view=rev Log: Spacing Modified: llvm/trunk/include/llvm/CodeGen/MachineInstr.h Modified: llvm/trunk/include/llvm/CodeGen/MachineInstr.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/MachineInstr.h?rev=62584&r1=62583&r2=62584&view=diff ============================================================================== --- llvm/trunk/include/llvm/CodeGen/MachineInstr.h (original) +++ llvm/trunk/include/llvm/CodeGen/MachineInstr.h Tue Jan 20 11:30:40 2009 @@ -208,7 +208,7 @@ /// findRegisterDefOperand - Wrapper for findRegisterDefOperandIdx, it returns /// a pointer to the MachineOperand rather than an index. - MachineOperand *findRegisterDefOperand(unsigned Reg,bool isDead = false, + MachineOperand *findRegisterDefOperand(unsigned Reg, bool isDead = false, const TargetRegisterInfo *TRI = NULL) { int Idx = findRegisterDefOperandIdx(Reg, isDead, TRI); return (Idx == -1) ? NULL : &getOperand(Idx); From baldrick at free.fr Tue Jan 20 12:08:39 2009 From: baldrick at free.fr (Duncan Sands) Date: Tue, 20 Jan 2009 18:08:39 -0000 Subject: [llvm-commits] [llvm] r62587 - /llvm/trunk/test/FrontendC/2009-01-20-k8.c Message-ID: <200901201808.n0KI8dXr026934@zion.cs.uiuc.edu> Author: baldrick Date: Tue Jan 20 12:08:39 2009 New Revision: 62587 URL: http://llvm.org/viewvc/llvm-project?rev=62587&view=rev Log: Check that the "don't barf on k8" fix is not accidentally reverted again. Added: llvm/trunk/test/FrontendC/2009-01-20-k8.c Added: llvm/trunk/test/FrontendC/2009-01-20-k8.c URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/FrontendC/2009-01-20-k8.c?rev=62587&view=auto ============================================================================== --- llvm/trunk/test/FrontendC/2009-01-20-k8.c (added) +++ llvm/trunk/test/FrontendC/2009-01-20-k8.c Tue Jan 20 12:08:39 2009 @@ -0,0 +1,2 @@ +// RUN: %llvmgcc %s -S -march=k8 +long double x; From baldrick at free.fr Tue Jan 20 12:10:20 2009 From: baldrick at free.fr (Duncan Sands) Date: Tue, 20 Jan 2009 18:10:20 -0000 Subject: [llvm-commits] [llvm-gcc-4.2] r62588 - /llvm-gcc-4.2/trunk/gcc/config/i386/i386.c Message-ID: <200901201810.n0KIALF4026996@zion.cs.uiuc.edu> Author: baldrick Date: Tue Jan 20 12:10:20 2009 New Revision: 62588 URL: http://llvm.org/viewvc/llvm-project?rev=62588&view=rev Log: Revert an accidental revert of a fix: without this, trying to use target variants such as k8 on x86-64 linux doesn't work properly. There was a Fortran test for this, but since the Fortran build was broken for several months on this target no-one noticed. I've added a C test. Modified: llvm-gcc-4.2/trunk/gcc/config/i386/i386.c Modified: llvm-gcc-4.2/trunk/gcc/config/i386/i386.c URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config/i386/i386.c?rev=62588&r1=62587&r2=62588&view=diff ============================================================================== --- llvm-gcc-4.2/trunk/gcc/config/i386/i386.c (original) +++ llvm-gcc-4.2/trunk/gcc/config/i386/i386.c Tue Jan 20 12:10:20 2009 @@ -2020,13 +2020,15 @@ error ("-mstackrealign not supported in the 64bit mode"); /* APPLE LOCAL end radar 4877693 */ + target_flags |= TARGET_SUBTARGET64_DEFAULT & ~target_flags_explicit; + /* Enable by default the SSE and MMX builtins. Do allow the user to explicitly disable any of these. In particular, disabling SSE and MMX for kernel code is extremely useful. */ if (!ix86_arch_specified) target_flags - |= ((MASK_SSE2 | MASK_SSE | MASK_MMX | MASK_128BIT_LONG_DOUBLE - | TARGET_SUBTARGET64_DEFAULT) & ~target_flags_explicit); + |= ((MASK_SSE2 | MASK_SSE | MASK_MMX | MASK_128BIT_LONG_DOUBLE) + & ~target_flags_explicit); /* APPLE LOCAL begin mainline candidate */ /* Disable the red zone for kernel compilation. ??? Why aren't we using -mcmodel=kernel? */ From dpatel at apple.com Tue Jan 20 12:13:03 2009 From: dpatel at apple.com (Devang Patel) Date: Tue, 20 Jan 2009 18:13:03 -0000 Subject: [llvm-commits] [llvm] r62589 - in /llvm/trunk: include/llvm/Analysis/DebugInfo.h lib/CodeGen/AsmPrinter/DwarfWriter.cpp Message-ID: <200901201813.n0KID4XL027112@zion.cs.uiuc.edu> Author: dpatel Date: Tue Jan 20 12:13:03 2009 New Revision: 62589 URL: http://llvm.org/viewvc/llvm-project?rev=62589&view=rev Log: Enable debug info for composite types. Modified: llvm/trunk/include/llvm/Analysis/DebugInfo.h llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp Modified: llvm/trunk/include/llvm/Analysis/DebugInfo.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Analysis/DebugInfo.h?rev=62589&r1=62588&r2=62589&view=diff ============================================================================== --- llvm/trunk/include/llvm/Analysis/DebugInfo.h (original) +++ llvm/trunk/include/llvm/Analysis/DebugInfo.h Tue Jan 20 12:13:03 2009 @@ -118,6 +118,7 @@ std::string getFilename() const { return getStringField(3); } std::string getDirectory() const { return getStringField(4); } std::string getProducer() const { return getStringField(5); } + /// Verify - Verify that a compile unit is well formed. bool Verify() const; }; Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp?rev=62589&r1=62588&r2=62589&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp (original) +++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp Tue Jan 20 12:13:03 2009 @@ -1743,9 +1743,6 @@ void ConstructTypeDIE(CompileUnit *DW_Unit, DIE &Buffer, DICompositeType CTy) { - /// FIXME - Enable this asap. - return; - // Get core information. const std::string &Name = CTy.getName(); uint64_t Size = CTy.getSizeInBits() >> 3; @@ -1859,7 +1856,6 @@ AddUInt(&Buffer, DW_AT_GNU_vector, DW_FORM_flag, 1); DIArray Elements = CTy->getTypeArray(); - // FIXME - Enable this. AddType(DW_Unit, &Buffer, CTy->getTypeDerivedFrom()); // Construct an anonymous type for index type. From sabre at nondot.org Tue Jan 20 12:22:57 2009 From: sabre at nondot.org (Chris Lattner) Date: Tue, 20 Jan 2009 18:22:57 -0000 Subject: [llvm-commits] [llvm] r62590 - /llvm/trunk/lib/Analysis/ValueTracking.cpp Message-ID: <200901201822.n0KIMvrS027479@zion.cs.uiuc.edu> Author: lattner Date: Tue Jan 20 12:22:57 2009 New Revision: 62590 URL: http://llvm.org/viewvc/llvm-project?rev=62590&view=rev Log: Eliminate use of uint32_t to improve compatibility with cygwin Modified: llvm/trunk/lib/Analysis/ValueTracking.cpp Modified: llvm/trunk/lib/Analysis/ValueTracking.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/ValueTracking.cpp?rev=62590&r1=62589&r2=62590&view=diff ============================================================================== --- llvm/trunk/lib/Analysis/ValueTracking.cpp (original) +++ llvm/trunk/lib/Analysis/ValueTracking.cpp Tue Jan 20 12:22:57 2009 @@ -50,7 +50,7 @@ TargetData *TD, unsigned Depth) { assert(V && "No Value?"); assert(Depth <= 6 && "Limit Search Depth"); - uint32_t BitWidth = Mask.getBitWidth(); + unsigned BitWidth = Mask.getBitWidth(); assert((V->getType()->isInteger() || isa(V->getType())) && "Not integer or pointer type!"); assert((!TD || TD->getTypeSizeInBits(V->getType()) == BitWidth) && @@ -215,7 +215,7 @@ // Note that we handle pointer operands here because of inttoptr/ptrtoint // which fall through here. const Type *SrcTy = I->getOperand(0)->getType(); - uint32_t SrcBitWidth = TD ? + unsigned SrcBitWidth = TD ? TD->getTypeSizeInBits(SrcTy) : SrcTy->getPrimitiveSizeInBits(); APInt MaskIn(Mask); @@ -243,7 +243,7 @@ case Instruction::SExt: { // Compute the bits in the result that are not present in the input. const IntegerType *SrcTy = cast(I->getOperand(0)->getType()); - uint32_t SrcBitWidth = SrcTy->getBitWidth(); + unsigned SrcBitWidth = SrcTy->getBitWidth(); APInt MaskIn(Mask); MaskIn.trunc(SrcBitWidth); @@ -403,7 +403,7 @@ ComputeMaskedBits(I->getOperand(1), AllOnes, KnownZero2, KnownOne2, TD, Depth+1); - uint32_t Leaders = std::max(KnownZero.countLeadingOnes(), + unsigned Leaders = std::max(KnownZero.countLeadingOnes(), KnownZero2.countLeadingOnes()); KnownOne.clear(); KnownZero = APInt::getHighBitsSet(BitWidth, Leaders) & Mask; @@ -465,8 +465,8 @@ ComputeMaskedBits(Index, LocalMask, LocalKnownZero, LocalKnownOne, TD, Depth+1); TrailZ = std::min(TrailZ, - CountTrailingZeros_64(TypeSize) + - LocalKnownZero.countTrailingOnes()); + unsigned(CountTrailingZeros_64(TypeSize) + + LocalKnownZero.countTrailingOnes())); } } From sabre at nondot.org Tue Jan 20 12:23:14 2009 From: sabre at nondot.org (Chris Lattner) Date: Tue, 20 Jan 2009 18:23:14 -0000 Subject: [llvm-commits] [llvm] r62591 - /llvm/trunk/include/llvm/ADT/APInt.h Message-ID: <200901201823.n0KINFED027499@zion.cs.uiuc.edu> Author: lattner Date: Tue Jan 20 12:23:14 2009 New Revision: 62591 URL: http://llvm.org/viewvc/llvm-project?rev=62591&view=rev Log: eliminate use of uint32_t to improve compatibility with cygwin Modified: llvm/trunk/include/llvm/ADT/APInt.h Modified: llvm/trunk/include/llvm/ADT/APInt.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ADT/APInt.h?rev=62591&r1=62590&r2=62591&view=diff ============================================================================== --- llvm/trunk/include/llvm/ADT/APInt.h (original) +++ llvm/trunk/include/llvm/ADT/APInt.h Tue Jan 20 12:23:14 2009 @@ -69,7 +69,7 @@ /// /// @brief Class for arbitrary precision integers. class APInt { - uint32_t BitWidth; ///< The number of bits in this APInt. + unsigned BitWidth; ///< The number of bits in this APInt. /// This union is used to store the integer value. When the /// integer bit-width <= 64, it uses VAL, otherwise it uses pVal. @@ -89,7 +89,7 @@ /// This constructor is used only internally for speed of construction of /// temporaries. It is unsafe for general use so it is not public. /// @brief Fast internal constructor - APInt(uint64_t* val, uint32_t bits) : BitWidth(bits), pVal(val) { } + APInt(uint64_t* val, unsigned bits) : BitWidth(bits), pVal(val) { } /// @returns true if the number of bits <= 64, false otherwise. /// @brief Determine if this APInt just has one word to store value. @@ -99,14 +99,14 @@ /// @returns the word position for the specified bit position. /// @brief Determine which word a bit is in. - static uint32_t whichWord(uint32_t bitPosition) { + static unsigned whichWord(unsigned bitPosition) { return bitPosition / APINT_BITS_PER_WORD; } /// @returns the bit position in a word for the specified bit position /// in the APInt. /// @brief Determine which bit in a word a bit is in. - static uint32_t whichBit(uint32_t bitPosition) { + static unsigned whichBit(unsigned bitPosition) { return bitPosition % APINT_BITS_PER_WORD; } @@ -115,7 +115,7 @@ /// corresponding word. /// @returns a uint64_t with only bit at "whichBit(bitPosition)" set /// @brief Get a single bit mask. - static uint64_t maskBit(uint32_t bitPosition) { + static uint64_t maskBit(unsigned bitPosition) { return 1ULL << whichBit(bitPosition); } @@ -126,7 +126,7 @@ /// @brief Clear unused high order bits APInt& clearUnusedBits() { // Compute how many bits are used in the final word - uint32_t wordBits = BitWidth % APINT_BITS_PER_WORD; + unsigned wordBits = BitWidth % APINT_BITS_PER_WORD; if (wordBits == 0) // If all bits are used, we want to leave the value alone. This also // avoids the undefined behavior of >> when the shift is the same size as @@ -144,13 +144,13 @@ /// @returns the corresponding word for the specified bit position. /// @brief Get the word corresponding to a bit position - uint64_t getWord(uint32_t bitPosition) const { + uint64_t getWord(unsigned bitPosition) const { return isSingleWord() ? VAL : pVal[whichWord(bitPosition)]; } /// This is used by the constructors that take string arguments. /// @brief Convert a char array into an APInt - void fromString(uint32_t numBits, const char *strStart, uint32_t slen, + void fromString(unsigned numBits, const char *strStart, unsigned slen, uint8_t radix); /// This is used by the toString method to divide by the radix. It simply @@ -158,18 +158,18 @@ /// has specific constraints on its inputs. If those constraints are not met /// then it provides a simpler form of divide. /// @brief An internal division function for dividing APInts. - static void divide(const APInt LHS, uint32_t lhsWords, - const APInt &RHS, uint32_t rhsWords, + static void divide(const APInt LHS, unsigned lhsWords, + const APInt &RHS, unsigned rhsWords, APInt *Quotient, APInt *Remainder); /// out-of-line slow case for inline constructor - void initSlowCase(uint32_t numBits, uint64_t val, bool isSigned); + void initSlowCase(unsigned numBits, uint64_t val, bool isSigned); /// out-of-line slow case for inline copy constructor void initSlowCase(const APInt& that); /// out-of-line slow case for shl - APInt shlSlowCase(uint32_t shiftAmt) const; + APInt shlSlowCase(unsigned shiftAmt) const; /// out-of-line slow case for operator& APInt AndSlowCase(const APInt& RHS) const; @@ -190,13 +190,13 @@ bool EqualSlowCase(uint64_t Val) const; /// out-of-line slow case for countLeadingZeros - uint32_t countLeadingZerosSlowCase() const; + unsigned countLeadingZerosSlowCase() const; /// out-of-line slow case for countTrailingOnes - uint32_t countTrailingOnesSlowCase() const; + unsigned countTrailingOnesSlowCase() const; /// out-of-line slow case for countPopulation - uint32_t countPopulationSlowCase() const; + unsigned countPopulationSlowCase() const; public: /// @name Constructors @@ -209,7 +209,7 @@ /// @param val the initial value of the APInt /// @param isSigned how to treat signedness of val /// @brief Create a new APInt of numBits width, initialized as val. - APInt(uint32_t numBits, uint64_t val, bool isSigned = false) + APInt(unsigned numBits, uint64_t val, bool isSigned = false) : BitWidth(numBits), VAL(0) { assert(BitWidth && "bitwidth too small"); if (isSingleWord()) @@ -225,7 +225,7 @@ /// @param numWords the number of words in bigVal /// @param bigVal a sequence of words to form the initial value of the APInt /// @brief Construct an APInt of numBits width, initialized as bigVal[]. - APInt(uint32_t numBits, uint32_t numWords, const uint64_t bigVal[]); + APInt(unsigned numBits, unsigned numWords, const uint64_t bigVal[]); /// This constructor interprets the slen characters starting at StrStart as /// a string in the given radix. The interpretation stops when the first @@ -237,7 +237,7 @@ /// @param slen the maximum number of characters to interpret /// @param radix the radix to use for the conversion /// @brief Construct an APInt from a string representation. - APInt(uint32_t numBits, const char strStart[], uint32_t slen, uint8_t radix); + APInt(unsigned numBits, const char strStart[], unsigned slen, uint8_t radix); /// Simply makes *this a copy of that. /// @brief Copy Constructor. @@ -331,7 +331,7 @@ } /// @brief Check if this APInt has an N-bits unsigned integer value. - bool isIntN(uint32_t N) const { + bool isIntN(unsigned N) const { assert(N && "N == 0 ???"); if (N >= getBitWidth()) return true; @@ -344,7 +344,7 @@ } /// @brief Check if this APInt has an N-bits signed integer value. - bool isSignedIntN(uint32_t N) const { + bool isSignedIntN(unsigned N) const { assert(N && "N == 0 ???"); return getMinSignedBits() <= N; } @@ -373,53 +373,53 @@ /// @name Value Generators /// @{ /// @brief Gets maximum unsigned value of APInt for specific bit width. - static APInt getMaxValue(uint32_t numBits) { + static APInt getMaxValue(unsigned numBits) { return APInt(numBits, 0).set(); } /// @brief Gets maximum signed value of APInt for a specific bit width. - static APInt getSignedMaxValue(uint32_t numBits) { + static APInt getSignedMaxValue(unsigned numBits) { return APInt(numBits, 0).set().clear(numBits - 1); } /// @brief Gets minimum unsigned value of APInt for a specific bit width. - static APInt getMinValue(uint32_t numBits) { + static APInt getMinValue(unsigned numBits) { return APInt(numBits, 0); } /// @brief Gets minimum signed value of APInt for a specific bit width. - static APInt getSignedMinValue(uint32_t numBits) { + static APInt getSignedMinValue(unsigned numBits) { return APInt(numBits, 0).set(numBits - 1); } /// getSignBit - This is just a wrapper function of getSignedMinValue(), and /// it helps code readability when we want to get a SignBit. /// @brief Get the SignBit for a specific bit width. - static APInt getSignBit(uint32_t BitWidth) { + static APInt getSignBit(unsigned BitWidth) { return getSignedMinValue(BitWidth); } /// @returns the all-ones value for an APInt of the specified bit-width. /// @brief Get the all-ones value. - static APInt getAllOnesValue(uint32_t numBits) { + static APInt getAllOnesValue(unsigned numBits) { return APInt(numBits, 0).set(); } /// @returns the '0' value for an APInt of the specified bit-width. /// @brief Get the '0' value. - static APInt getNullValue(uint32_t numBits) { + static APInt getNullValue(unsigned numBits) { return APInt(numBits, 0); } /// Get an APInt with the same BitWidth as this APInt, just zero mask /// the low bits and right shift to the least significant bit. /// @returns the high "numBits" bits of this APInt. - APInt getHiBits(uint32_t numBits) const; + APInt getHiBits(unsigned numBits) const; /// Get an APInt with the same BitWidth as this APInt, just zero mask /// the high bits. /// @returns the low "numBits" bits of this APInt. - APInt getLoBits(uint32_t numBits) const; + APInt getLoBits(unsigned numBits) const; /// Constructs an APInt value that has a contiguous range of bits set. The /// bits from loBit (inclusive) to hiBit (exclusive) will be set. All other @@ -431,7 +431,7 @@ /// @param hiBit the index of the highest bit set. /// @returns An APInt value with the requested bits set. /// @brief Get a value with a block of bits set. - static APInt getBitsSet(uint32_t numBits, uint32_t loBit, uint32_t hiBit) { + static APInt getBitsSet(unsigned numBits, unsigned loBit, unsigned hiBit) { assert(hiBit <= numBits && "hiBit out of range"); assert(loBit < numBits && "loBit out of range"); if (hiBit < loBit) @@ -444,12 +444,12 @@ /// @param numBits the bitwidth of the result /// @param hiBitsSet the number of high-order bits set in the result. /// @brief Get a value with high bits set - static APInt getHighBitsSet(uint32_t numBits, uint32_t hiBitsSet) { + static APInt getHighBitsSet(unsigned numBits, unsigned hiBitsSet) { assert(hiBitsSet <= numBits && "Too many bits to set!"); // Handle a degenerate case, to avoid shifting by word size if (hiBitsSet == 0) return APInt(numBits, 0); - uint32_t shiftAmt = numBits - hiBitsSet; + unsigned shiftAmt = numBits - hiBitsSet; // For small values, return quickly if (numBits <= APINT_BITS_PER_WORD) return APInt(numBits, ~0ULL << shiftAmt); @@ -460,7 +460,7 @@ /// @param numBits the bitwidth of the result /// @param loBitsSet the number of low-order bits set in the result. /// @brief Get a value with low bits set - static APInt getLowBitsSet(uint32_t numBits, uint32_t loBitsSet) { + static APInt getLowBitsSet(unsigned numBits, unsigned loBitsSet) { assert(loBitsSet <= numBits && "Too many bits to set!"); // Handle a degenerate case, to avoid shifting by word size if (loBitsSet == 0) @@ -594,7 +594,7 @@ /// Shifts *this left by shiftAmt and assigns the result to *this. /// @returns *this after shifting left by shiftAmt /// @brief Left-shift assignment function. - APInt& operator<<=(uint32_t shiftAmt) { + APInt& operator<<=(unsigned shiftAmt) { *this = shl(shiftAmt); return *this; } @@ -669,15 +669,15 @@ /// Arithmetic right-shift this APInt by shiftAmt. /// @brief Arithmetic right-shift function. - APInt ashr(uint32_t shiftAmt) const; + APInt ashr(unsigned shiftAmt) const; /// Logical right-shift this APInt by shiftAmt. /// @brief Logical right-shift function. - APInt lshr(uint32_t shiftAmt) const; + APInt lshr(unsigned shiftAmt) const; /// Left-shift this APInt by shiftAmt. /// @brief Left-shift function. - APInt shl(uint32_t shiftAmt) const { + APInt shl(unsigned shiftAmt) const { assert(shiftAmt <= BitWidth && "Invalid shift amount"); if (isSingleWord()) { if (shiftAmt == BitWidth) @@ -688,10 +688,10 @@ } /// @brief Rotate left by rotateAmt. - APInt rotl(uint32_t rotateAmt) const; + APInt rotl(unsigned rotateAmt) const; /// @brief Rotate right by rotateAmt. - APInt rotr(uint32_t rotateAmt) const; + APInt rotr(unsigned rotateAmt) const; /// Arithmetic right-shift this APInt by shiftAmt. /// @brief Arithmetic right-shift function. @@ -781,7 +781,7 @@ /// @returns the bit value at bitPosition /// @brief Array-indexing support. - bool operator[](uint32_t bitPosition) const; + bool operator[](unsigned bitPosition) const; /// @} /// @name Comparison Operators @@ -910,30 +910,30 @@ /// Truncate the APInt to a specified width. It is an error to specify a width /// that is greater than or equal to the current width. /// @brief Truncate to new width. - APInt &trunc(uint32_t width); + APInt &trunc(unsigned width); /// This operation sign extends the APInt to a new width. If the high order /// bit is set, the fill on the left will be done with 1 bits, otherwise zero. /// It is an error to specify a width that is less than or equal to the /// current width. /// @brief Sign extend to a new width. - APInt &sext(uint32_t width); + APInt &sext(unsigned width); /// This operation zero extends the APInt to a new width. The high order bits /// are filled with 0 bits. It is an error to specify a width that is less /// than or equal to the current width. /// @brief Zero extend to a new width. - APInt &zext(uint32_t width); + APInt &zext(unsigned width); /// Make this APInt have the bit width given by \p width. The value is sign /// extended, truncated, or left alone to make it that width. /// @brief Sign extend or truncate to width - APInt &sextOrTrunc(uint32_t width); + APInt &sextOrTrunc(unsigned width); /// Make this APInt have the bit width given by \p width. The value is zero /// extended, truncated, or left alone to make it that width. /// @brief Zero extend or truncate to width - APInt &zextOrTrunc(uint32_t width); + APInt &zextOrTrunc(unsigned width); /// @} /// @name Bit Manipulation Operators @@ -946,7 +946,7 @@ } // Set all the bits in all the words. - for (uint32_t i = 0; i < getNumWords(); ++i) + for (unsigned i = 0; i < getNumWords(); ++i) pVal[i] = -1ULL; // Clear the unused ones return clearUnusedBits(); @@ -954,7 +954,7 @@ /// Set the given bit to 1 whose position is given as "bitPosition". /// @brief Set a given bit to 1. - APInt& set(uint32_t bitPosition); + APInt& set(unsigned bitPosition); /// @brief Set every bit to 0. APInt& clear() { @@ -967,7 +967,7 @@ /// Set the given bit to 0 whose position is given as "bitPosition". /// @brief Set a given bit to 0. - APInt& clear(uint32_t bitPosition); + APInt& clear(unsigned bitPosition); /// @brief Toggle every bit to its opposite value. APInt& flip() { @@ -975,7 +975,7 @@ VAL ^= -1ULL; return clearUnusedBits(); } - for (uint32_t i = 0; i < getNumWords(); ++i) + for (unsigned i = 0; i < getNumWords(); ++i) pVal[i] ^= -1ULL; return clearUnusedBits(); } @@ -983,21 +983,21 @@ /// Toggle a given bit to its opposite value whose position is given /// as "bitPosition". /// @brief Toggles a given bit to its opposite value. - APInt& flip(uint32_t bitPosition); + APInt& flip(unsigned bitPosition); /// @} /// @name Value Characterization Functions /// @{ /// @returns the total number of bits. - uint32_t getBitWidth() const { + unsigned getBitWidth() const { return BitWidth; } /// Here one word's bitwidth equals to that of uint64_t. /// @returns the number of words to hold the integer value of this APInt. /// @brief Get the number of words. - uint32_t getNumWords() const { + unsigned getNumWords() const { return (BitWidth + APINT_BITS_PER_WORD - 1) / APINT_BITS_PER_WORD; } @@ -1005,14 +1005,14 @@ /// bit width minus the number of leading zeros. This is used in several /// computations to see how "wide" the value is. /// @brief Compute the number of active bits in the value - uint32_t getActiveBits() const { + unsigned getActiveBits() const { return BitWidth - countLeadingZeros(); } /// This function returns the number of active words in the value of this /// APInt. This is used in conjunction with getActiveData to extract the raw /// value of the APInt. - uint32_t getActiveWords() const { + unsigned getActiveWords() const { return whichWord(getActiveBits()-1) + 1; } @@ -1023,7 +1023,7 @@ /// example, -1 can be written as 0b1 or 0xFFFFFFFFFF. 0b1 is shorter and so /// for -1, this function will always return 1. /// @brief Get the minimum bit size for this signed APInt - uint32_t getMinSignedBits() const { + unsigned getMinSignedBits() const { if (isNegative()) return BitWidth - countLeadingOnes() + 1; return getActiveBits()+1; @@ -1055,7 +1055,7 @@ /// This method determines how many bits are required to hold the APInt /// equivalent of the string given by \p str of length \p slen. /// @brief Get bits required for string value. - static uint32_t getBitsNeeded(const char* str, uint32_t slen, uint8_t radix); + static unsigned getBitsNeeded(const char* str, unsigned slen, uint8_t radix); /// countLeadingZeros - This function is an APInt version of the /// countLeadingZeros_{32,64} functions in MathExtras.h. It counts the number @@ -1063,9 +1063,9 @@ /// @returns BitWidth if the value is zero. /// @returns the number of zeros from the most significant bit to the first /// one bits. - uint32_t countLeadingZeros() const { + unsigned countLeadingZeros() const { if (isSingleWord()) { - uint32_t unusedBits = APINT_BITS_PER_WORD - BitWidth; + unsigned unusedBits = APINT_BITS_PER_WORD - BitWidth; return CountLeadingZeros_64(VAL) - unusedBits; } return countLeadingZerosSlowCase(); @@ -1077,7 +1077,7 @@ /// @returns 0 if the high order bit is not set /// @returns the number of 1 bits from the most significant to the least /// @brief Count the number of leading one bits. - uint32_t countLeadingOnes() const; + unsigned countLeadingOnes() const; /// countTrailingZeros - This function is an APInt version of the /// countTrailingZeros_{32,64} functions in MathExtras.h. It counts @@ -1086,7 +1086,7 @@ /// @returns the number of zeros from the least significant bit to the first /// one bit. /// @brief Count the number of trailing zero bits. - uint32_t countTrailingZeros() const; + unsigned countTrailingZeros() const; /// countTrailingOnes - This function is an APInt version of the /// countTrailingOnes_{32,64} functions in MathExtras.h. It counts @@ -1095,7 +1095,7 @@ /// @returns the number of ones from the least significant bit to the first /// zero bit. /// @brief Count the number of trailing one bits. - uint32_t countTrailingOnes() const { + unsigned countTrailingOnes() const { if (isSingleWord()) return CountTrailingOnes_64(VAL); return countTrailingOnesSlowCase(); @@ -1107,7 +1107,7 @@ /// @returns 0 if the value is zero. /// @returns the number of set bits. /// @brief Count the number of bits set. - uint32_t countPopulation() const { + unsigned countPopulation() const { if (isSingleWord()) return CountPopulation_64(VAL); return countPopulationSlowCase(); @@ -1175,10 +1175,10 @@ /// @brief Converts APInt bits to a double float bitsToFloat() const { union { - uint32_t I; + unsigned I; float F; } T; - T.I = uint32_t((isSingleWord() ? VAL : pVal[0])); + T.I = unsigned((isSingleWord() ? VAL : pVal[0])); return T.F; } @@ -1205,7 +1205,7 @@ /// @brief Converts a float to APInt bits. APInt& floatToBits(float V) { union { - uint32_t I; + unsigned I; float F; } T; T.F = V; @@ -1221,7 +1221,7 @@ /// @{ /// @returns the floor log base 2 of this APInt. - uint32_t logBase2() const { + unsigned logBase2() const { return BitWidth - 1 - countLeadingZeros(); } @@ -1413,25 +1413,25 @@ } /// @brief Check if the specified APInt has a N-bits unsigned integer value. -inline bool isIntN(uint32_t N, const APInt& APIVal) { +inline bool isIntN(unsigned N, const APInt& APIVal) { return APIVal.isIntN(N); } /// @brief Check if the specified APInt has a N-bits signed integer value. -inline bool isSignedIntN(uint32_t N, const APInt& APIVal) { +inline bool isSignedIntN(unsigned N, const APInt& APIVal) { return APIVal.isSignedIntN(N); } /// @returns true if the argument APInt value is a sequence of ones /// starting at the least significant bit with the remainder zero. -inline bool isMask(uint32_t numBits, const APInt& APIVal) { +inline bool isMask(unsigned numBits, const APInt& APIVal) { return numBits <= APIVal.getBitWidth() && APIVal == APInt::getLowBitsSet(APIVal.getBitWidth(), numBits); } /// @returns true if the argument APInt value contains a sequence of ones /// with the remainder zero. -inline bool isShiftedMask(uint32_t numBits, const APInt& APIVal) { +inline bool isShiftedMask(unsigned numBits, const APInt& APIVal) { return isMask(numBits, (APIVal - APInt(numBits,1)) | APIVal); } @@ -1441,7 +1441,7 @@ } /// @returns the floor log base 2 of the specified APInt value. -inline uint32_t logBase2(const APInt& APIVal) { +inline unsigned logBase2(const APInt& APIVal) { return APIVal.logBase2(); } @@ -1476,29 +1476,29 @@ /// RoundDoubleToAPInt - This function convert a double value to an APInt value. /// @brief Converts the given double value into a APInt. -APInt RoundDoubleToAPInt(double Double, uint32_t width); +APInt RoundDoubleToAPInt(double Double, unsigned width); /// RoundFloatToAPInt - Converts a float value into an APInt value. /// @brief Converts a float value into a APInt. -inline APInt RoundFloatToAPInt(float Float, uint32_t width) { +inline APInt RoundFloatToAPInt(float Float, unsigned width) { return RoundDoubleToAPInt(double(Float), width); } /// Arithmetic right-shift the APInt by shiftAmt. /// @brief Arithmetic right-shift function. -inline APInt ashr(const APInt& LHS, uint32_t shiftAmt) { +inline APInt ashr(const APInt& LHS, unsigned shiftAmt) { return LHS.ashr(shiftAmt); } /// Logical right-shift the APInt by shiftAmt. /// @brief Logical right-shift function. -inline APInt lshr(const APInt& LHS, uint32_t shiftAmt) { +inline APInt lshr(const APInt& LHS, unsigned shiftAmt) { return LHS.lshr(shiftAmt); } /// Left-shift the APInt by shiftAmt. /// @brief Left-shift function. -inline APInt shl(const APInt& LHS, uint32_t shiftAmt) { +inline APInt shl(const APInt& LHS, unsigned shiftAmt) { return LHS.shl(shiftAmt); } From sabre at nondot.org Tue Jan 20 12:25:03 2009 From: sabre at nondot.org (Chris Lattner) Date: Tue, 20 Jan 2009 18:25:03 -0000 Subject: [llvm-commits] [llvm] r62592 - /llvm/trunk/lib/Support/GraphWriter.cpp Message-ID: <200901201825.n0KIP3In027555@zion.cs.uiuc.edu> Author: lattner Date: Tue Jan 20 12:25:03 2009 New Revision: 62592 URL: http://llvm.org/viewvc/llvm-project?rev=62592&view=rev Log: improve compatibility with various versions of graphviz, patch by Patrick Boettcher! Modified: llvm/trunk/lib/Support/GraphWriter.cpp Modified: llvm/trunk/lib/Support/GraphWriter.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/GraphWriter.cpp?rev=62592&r1=62591&r2=62592&view=diff ============================================================================== --- llvm/trunk/lib/Support/GraphWriter.cpp (original) +++ llvm/trunk/lib/Support/GraphWriter.cpp Tue Jan 20 12:25:03 2009 @@ -57,8 +57,8 @@ sys::Path gv(LLVM_PATH_GV); args.clear(); args.push_back(gv.c_str()); - args.push_back("--spartan"); args.push_back(PSFilename.c_str()); + args.push_back("-spartan"); args.push_back(0); ErrMsg.clear(); From dalej at apple.com Tue Jan 20 12:35:05 2009 From: dalej at apple.com (Dale Johannesen) Date: Tue, 20 Jan 2009 18:35:05 -0000 Subject: [llvm-commits] [llvm] r62593 - in /llvm/trunk: include/llvm/ADT/APFloat.h lib/Support/APFloat.cpp Message-ID: <200901201835.n0KIZ5XD027933@zion.cs.uiuc.edu> Author: johannes Date: Tue Jan 20 12:35:05 2009 New Revision: 62593 URL: http://llvm.org/viewvc/llvm-project?rev=62593&view=rev Log: Add an IEEE remainder function, which is not fully implemented yet and not used. This is mainly to clarify that APFloat::mod implements C fmod, not remainder. Modified: llvm/trunk/include/llvm/ADT/APFloat.h llvm/trunk/lib/Support/APFloat.cpp Modified: llvm/trunk/include/llvm/ADT/APFloat.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ADT/APFloat.h?rev=62593&r1=62592&r2=62593&view=diff ============================================================================== --- llvm/trunk/include/llvm/ADT/APFloat.h (original) +++ llvm/trunk/include/llvm/ADT/APFloat.h Tue Jan 20 12:35:05 2009 @@ -207,6 +207,9 @@ opStatus subtract(const APFloat &, roundingMode); opStatus multiply(const APFloat &, roundingMode); opStatus divide(const APFloat &, roundingMode); + /* IEEE remainder. */ + opStatus remainder(const APFloat &); + /* C fmod, or llvm frem. */ opStatus mod(const APFloat &, roundingMode); opStatus fusedMultiplyAdd(const APFloat &, const APFloat &, roundingMode); Modified: llvm/trunk/lib/Support/APFloat.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/APFloat.cpp?rev=62593&r1=62592&r2=62593&view=diff ============================================================================== --- llvm/trunk/lib/Support/APFloat.cpp (original) +++ llvm/trunk/lib/Support/APFloat.cpp Tue Jan 20 12:35:05 2009 @@ -1514,7 +1514,45 @@ return fs; } -/* Normalized remainder. This is not currently doing TRT. */ +/* Normalized remainder. This is not currently correct in all cases. */ +APFloat::opStatus +APFloat::remainder(const APFloat &rhs) +{ + opStatus fs; + APFloat V = *this; + unsigned int origSign = sign; + + assertArithmeticOK(*semantics); + fs = V.divide(rhs, rmNearestTiesToEven); + if (fs == opDivByZero) + return fs; + + int parts = partCount(); + integerPart *x = new integerPart[parts]; + bool ignored; + fs = V.convertToInteger(x, parts * integerPartWidth, true, + rmNearestTiesToEven, &ignored); + if (fs==opInvalidOp) + return fs; + + fs = V.convertFromZeroExtendedInteger(x, parts * integerPartWidth, true, + rmNearestTiesToEven); + assert(fs==opOK); // should always work + + fs = V.multiply(rhs, rmNearestTiesToEven); + assert(fs==opOK || fs==opInexact); // should not overflow or underflow + + fs = subtract(V, rmNearestTiesToEven); + assert(fs==opOK || fs==opInexact); // likewise + + if (isZero()) + sign = origSign; // IEEE754 requires this + delete[] x; + return fs; +} + +/* Normalized llvm frem (C fmod). + This is not currently correct in all cases. */ APFloat::opStatus APFloat::mod(const APFloat &rhs, roundingMode rounding_mode) { From dpatel at apple.com Tue Jan 20 12:35:14 2009 From: dpatel at apple.com (Devang Patel) Date: Tue, 20 Jan 2009 18:35:14 -0000 Subject: [llvm-commits] [llvm] r62594 - /llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp Message-ID: <200901201835.n0KIZEfN027948@zion.cs.uiuc.edu> Author: dpatel Date: Tue Jan 20 12:35:14 2009 New Revision: 62594 URL: http://llvm.org/viewvc/llvm-project?rev=62594&view=rev Log: Enable debug info for enums. Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp?rev=62594&r1=62593&r2=62594&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp (original) +++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp Tue Jan 20 12:35:14 2009 @@ -1752,13 +1752,18 @@ case DW_TAG_array_type: ConstructArrayTypeDIE(DW_Unit, Buffer, &CTy); break; - //FIXME - Enable this. - // case DW_TAG_enumeration_type: - // DIArray Elements = CTy.getTypeArray(); - // // Add enumerators to enumeration type. - // for (unsigned i = 0, N = Elements.getNumElements(); i < N; ++i) - // ConstructEnumTypeDIE(Buffer, &Elements.getElement(i)); - // break; + case DW_TAG_enumeration_type: + { + DIArray Elements = CTy.getTypeArray(); + // Add enumerators to enumeration type. + for (unsigned i = 0, N = Elements.getNumElements(); i < N; ++i) { + DIE *ElemDie = NULL; + DIEnumerator Enum(Elements.getElement(i).getGV()); + ElemDie = ConstructEnumTypeDIE(DW_Unit, &Enum); + Buffer.AddChild(ElemDie); + } + } + break; case DW_TAG_subroutine_type: { // Add prototype flag. @@ -1874,14 +1879,13 @@ /// ConstructEnumTypeDIE - Construct enum type DIE from /// DIEnumerator. - void ConstructEnumTypeDIE(CompileUnit *DW_Unit, - DIE &Buffer, DIEnumerator *ETy) { + DIE *ConstructEnumTypeDIE(CompileUnit *DW_Unit, DIEnumerator *ETy) { DIE *Enumerator = new DIE(DW_TAG_enumerator); AddString(Enumerator, DW_AT_name, DW_FORM_string, ETy->getName()); int64_t Value = ETy->getEnumValue(); AddSInt(Enumerator, DW_AT_const_value, DW_FORM_sdata, Value); - Buffer.AddChild(Enumerator); + return Enumerator; } /// CreateGlobalVariableDIE - Create new DIE using GV. From isanbard at gmail.com Tue Jan 20 12:52:09 2009 From: isanbard at gmail.com (Bill Wendling) Date: Tue, 20 Jan 2009 18:52:09 -0000 Subject: [llvm-commits] [llvm-gcc-4.2] r62595 - in /llvm-gcc-4.2/trunk/gcc: c-common.c c-common.h c.opt config/i386/darwin.h config/rs6000/darwin.h Message-ID: <200901201852.n0KIq9qG028451@zion.cs.uiuc.edu> Author: void Date: Tue Jan 20 12:52:09 2009 New Revision: 62595 URL: http://llvm.org/viewvc/llvm-project?rev=62595&view=rev Log: Fix build on Linux. Patch by Rafael. Modified: llvm-gcc-4.2/trunk/gcc/c-common.c llvm-gcc-4.2/trunk/gcc/c-common.h llvm-gcc-4.2/trunk/gcc/c.opt llvm-gcc-4.2/trunk/gcc/config/i386/darwin.h llvm-gcc-4.2/trunk/gcc/config/rs6000/darwin.h Modified: llvm-gcc-4.2/trunk/gcc/c-common.c URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/c-common.c?rev=62595&r1=62594&r2=62595&view=diff ============================================================================== --- llvm-gcc-4.2/trunk/gcc/c-common.c (original) +++ llvm-gcc-4.2/trunk/gcc/c-common.c Tue Jan 20 12:52:09 2009 @@ -294,21 +294,7 @@ int warn_unknown_pragmas; /* Tri state variable. */ -/* Warn about format/argument anomalies in calls to formatted I/O functions - (*printf, *scanf, strftime, strfmon, etc.). */ - -/* APPLE LOCAL begin default to Wformat-security 5764921 */ -/* LLVM LOCAL begin initialize via config/darwin.h */ -#ifndef WARN_FORMAT_INIT -#define WARN_FORMAT_INIT 0 -#endif -#ifndef WARN_FORMAT_SECURITY_INIT -#define WARN_FORMAT_SECURITY_INIT 0 -#endif -int warn_format = WARN_FORMAT_INIT; -int warn_format_security = WARN_FORMAT_SECURITY_INIT; -/* LLVM LOCAL end initialize via config/darwin.h */ -/* APPLE LOCAL end default to Wformat-security 5764921 */ +/* LLVM LOCAL no definition of warn_format or warn_format_security. */ /* Warn about using __null (as NULL in C++) as sentinel. For code compiled with GCC this doesn't matter as __null is guaranteed to have the right Modified: llvm-gcc-4.2/trunk/gcc/c-common.h URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/c-common.h?rev=62595&r1=62594&r2=62595&view=diff ============================================================================== --- llvm-gcc-4.2/trunk/gcc/c-common.h (original) +++ llvm-gcc-4.2/trunk/gcc/c-common.h Tue Jan 20 12:52:09 2009 @@ -461,16 +461,7 @@ extern int warn_unknown_pragmas; /* Tri state variable. */ -/* Warn about format/argument anomalies in calls to formatted I/O functions - (*printf, *scanf, strftime, strfmon, etc.). */ - -extern int warn_format; - -/* LLVM LOCAL begin */ -/* Warn about possible security problems with format functions */ - -extern int warn_format_security; -/* LLVM LOCAL end */ +/* LLVM LOCAL no decl of warn_format or warn_format_security. */ /* APPLE LOCAL begin disable_typechecking_for_spec_flag */ /* This makes type conflicts a warning, instead of an error, Modified: llvm-gcc-4.2/trunk/gcc/c.opt URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/c.opt?rev=62595&r1=62594&r2=62595&view=diff ============================================================================== --- llvm-gcc-4.2/trunk/gcc/c.opt (original) +++ llvm-gcc-4.2/trunk/gcc/c.opt Tue Jan 20 12:52:09 2009 @@ -224,9 +224,11 @@ C ObjC C++ ObjC++ Var(warn_float_equal) Warn if testing floating point numbers for equality +; LLVM LOCAL begin keep "Var(warn_format) Warning" Wformat -C ObjC C++ ObjC++ +C ObjC C++ ObjC++ Var(warn_format) Warning Warn about printf/scanf/strftime/strfmon format string anomalies +; LLVM LOCAL end keep "Var(warn_format) Warning" Wformat-extra-args C ObjC C++ ObjC++ Var(warn_format_extra_args) @@ -237,11 +239,11 @@ Warn about format strings that are not literals ; APPLE LOCAL begin default to Wformat-security 5764921 -; LLVM LOCAL begin don't initialize this +; LLVM LOCAL begin keep "Var(warn_format_security)" Wformat-security -C ObjC C++ ObjC++ +C ObjC C++ ObjC++ Var(warn_format_security) Warn about possible security problems with format functions -; LLVM LOCAL end don't initialize this +; LLVM LOCAL endkeep "Var(warn_format_security)" ; APPLE LOCAL end default to Wformat-security 5764921 Wformat-y2k Modified: llvm-gcc-4.2/trunk/gcc/config/i386/darwin.h URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config/i386/darwin.h?rev=62595&r1=62594&r2=62595&view=diff ============================================================================== --- llvm-gcc-4.2/trunk/gcc/config/i386/darwin.h (original) +++ llvm-gcc-4.2/trunk/gcc/config/i386/darwin.h Tue Jan 20 12:52:09 2009 @@ -100,6 +100,9 @@ "/* APPLE LOCAL ARM 5683689 */"\ %{!mmacosx-version-min=*: %{!miphoneos-version-min=*: %(darwin_cc1_minversion)}} \ "/* APPLE LOCAL ignore -mcpu=G4 -mcpu=G5 */"\ + "/* LLVM LOCAL enable format security warnings */" \ + %{!Wno-format:-Wformat} \ + %{!Wno-format-security:-Wformat-security} \ % Author: dpatel Date: Tue Jan 20 12:55:39 2009 New Revision: 62596 URL: http://llvm.org/viewvc/llvm-project?rev=62596&view=rev Log: Fix global variable's address in a DIE. Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp?rev=62596&r1=62595&r2=62596&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp (original) +++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp Tue Jan 20 12:55:39 2009 @@ -2791,7 +2791,7 @@ DIEBlock *Block = new DIEBlock(); AddUInt(Block, 0, DW_FORM_data1, DW_OP_addr); AddObjectLabel(Block, 0, DW_FORM_udata, - Asm->getGlobalLinkName(DI_GV.getGV())); + Asm->getGlobalLinkName(DI_GV.getGlobal())); AddBlock(VariableDie, DW_AT_location, 0, Block); //Add to map. From dpatel at apple.com Tue Jan 20 13:08:39 2009 From: dpatel at apple.com (Devang Patel) Date: Tue, 20 Jan 2009 19:08:39 -0000 Subject: [llvm-commits] [llvm] r62598 - /llvm/trunk/include/llvm/Analysis/DebugInfo.h Message-ID: <200901201908.n0KJ8den028966@zion.cs.uiuc.edu> Author: dpatel Date: Tue Jan 20 13:08:39 2009 New Revision: 62598 URL: http://llvm.org/viewvc/llvm-project?rev=62598&view=rev Log: zap white spaces. Modified: llvm/trunk/include/llvm/Analysis/DebugInfo.h Modified: llvm/trunk/include/llvm/Analysis/DebugInfo.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Analysis/DebugInfo.h?rev=62598&r1=62597&r2=62598&view=diff ============================================================================== --- llvm/trunk/include/llvm/Analysis/DebugInfo.h (original) +++ llvm/trunk/include/llvm/Analysis/DebugInfo.h Tue Jan 20 13:08:39 2009 @@ -30,7 +30,7 @@ class DbgStopPointInst; class DbgDeclareInst; class Instruction; - + class DIDescriptor { public: enum { @@ -40,29 +40,29 @@ Version4 = 4 << 16, // Constant for version 4. VersionMask = 0xffff0000 // Mask for version number. }; - + protected: GlobalVariable *GV; - + /// DIDescriptor constructor. If the specified GV is non-null, this checks /// to make sure that the tag in the descriptor matches 'RequiredTag'. If /// not, the debug info is corrupt and we ignore it. DIDescriptor(GlobalVariable *GV, unsigned RequiredTag); - + std::string getStringField(unsigned Elt) const; unsigned getUnsignedField(unsigned Elt) const { return (unsigned)getUInt64Field(Elt); } uint64_t getUInt64Field(unsigned Elt) const; DIDescriptor getDescriptorField(unsigned Elt) const; - + template DescTy getFieldAs(unsigned Elt) const { return DescTy(getDescriptorField(Elt).getGV()); } - + GlobalVariable *getGlobalVariableField(unsigned Elt) const; - + public: explicit DIDescriptor() : GV(0) {} explicit DIDescriptor(GlobalVariable *gv) : GV(gv) {} @@ -74,18 +74,18 @@ unsigned getVersion() const { return getUnsignedField(0) & VersionMask; } - + unsigned getTag() const { return getUnsignedField(0) & ~VersionMask; } - + }; - + /// DIAnchor - A wrapper for various anchor descriptors. class DIAnchor : public DIDescriptor { public: explicit DIAnchor(GlobalVariable *GV = 0); - + unsigned getAnchorTag() const { return getUnsignedField(1); } }; @@ -93,27 +93,27 @@ class DISubrange : public DIDescriptor { public: explicit DISubrange(GlobalVariable *GV = 0); - + int64_t getLo() const { return (int64_t)getUInt64Field(1); } int64_t getHi() const { return (int64_t)getUInt64Field(2); } }; - + /// DIArray - This descriptor holds an array of descriptors. class DIArray : public DIDescriptor { public: explicit DIArray(GlobalVariable *GV = 0) : DIDescriptor(GV) {} - + unsigned getNumElements() const; DIDescriptor getElement(unsigned Idx) const { return getDescriptorField(Idx); } }; - + /// DICompileUnit - A wrapper for a compile unit. class DICompileUnit : public DIDescriptor { public: explicit DICompileUnit(GlobalVariable *GV = 0); - + unsigned getLanguage() const { return getUnsignedField(2); } std::string getFilename() const { return getStringField(3); } std::string getDirectory() const { return getStringField(4); } @@ -129,11 +129,11 @@ class DIEnumerator : public DIDescriptor { public: explicit DIEnumerator(GlobalVariable *GV = 0); - + std::string getName() const { return getStringField(1); } uint64_t getEnumValue() const { return getUInt64Field(2); } }; - + /// DIType - This is a wrapper for a type. /// FIXME: Types should be factored much better so that CV qualifiers and /// others do not require a huge and empty descriptor full of zeros. @@ -187,17 +187,17 @@ return ""; } }; - + /// DIBasicType - A basic type, like 'int' or 'float'. class DIBasicType : public DIType { public: explicit DIBasicType(GlobalVariable *GV); - + unsigned getEncoding() const { return getUnsignedField(9); } std::string getFilename() const { return getStringField(10); } std::string getDirectory() const { return getStringField(11); } }; - + /// DIDerivedType - A simple derived type, like a const qualified type, /// a typedef, a pointer or reference, etc. class DIDerivedType : public DIType { @@ -206,20 +206,19 @@ : DIType(GV, true, true) {} public: explicit DIDerivedType(GlobalVariable *GV); - + DIType getTypeDerivedFrom() const { return getFieldAs(9); } std::string getFilename() const { return getStringField(10); } std::string getDirectory() const { return getStringField(11); } }; - /// DICompositeType - This descriptor holds a type that can refer to multiple /// other types, like a function or struct. /// FIXME: Why is this a DIDerivedType?? class DICompositeType : public DIDerivedType { public: explicit DICompositeType(GlobalVariable *GV); - + DIArray getTypeArray() const { return getFieldAs(10); } std::string getFilename() const { return getStringField(11); } std::string getDirectory() const { return getStringField(12); } @@ -227,7 +226,7 @@ /// Verify - Verify that a composite type descriptor is well formed. bool Verify() const; }; - + /// DIGlobal - This is a common class for global variables and subprograms. class DIGlobal : public DIDescriptor { protected: @@ -253,11 +252,10 @@ std::string getName() const { return getStringField(3); } std::string getDisplayName() const { return getStringField(4); } std::string getLinkageName() const { return getStringField(5); } - DICompileUnit getCompileUnit() const{ return getFieldAs(6); } unsigned getLineNumber() const { return getUnsignedField(7); } DIType getType() const { return getFieldAs(8); } - + /// isLocalToUnit - Return true if this subprogram is local to the current /// compile unit, like 'static' in C. unsigned isLocalToUnit() const { return getUnsignedField(9); } @@ -273,8 +271,7 @@ return ""; } }; - - + /// DISubprogram - This is a wrapper for a subprogram (e.g. a function). class DISubprogram : public DIGlobal { public: @@ -286,12 +283,12 @@ /// Verify - Verify that a subprogram descriptor is well formed. bool Verify() const; }; - + /// DIGlobalVariable - This is a wrapper for a global variable. class DIGlobalVariable : public DIGlobal { public: explicit DIGlobalVariable(GlobalVariable *GV = 0); - + GlobalVariable *getGlobal() const { return getGlobalVariableField(11); } std::string getFilename() const { return getStringField(12); } std::string getDirectory() const { return getStringField(13); } @@ -299,31 +296,28 @@ /// Verify - Verify that a global variable descriptor is well formed. bool Verify() const; }; - - + /// DIVariable - This is a wrapper for a variable (e.g. parameter, local, /// global etc). class DIVariable : public DIDescriptor { public: explicit DIVariable(GlobalVariable *GV = 0); - + DIDescriptor getContext() const { return getDescriptorField(1); } std::string getName() const { return getStringField(2); } - DICompileUnit getCompileUnit() const{ return getFieldAs(3); } unsigned getLineNumber() const { return getUnsignedField(4); } DIType getType() const { return getFieldAs(5); } std::string getFilename() const { return getStringField(6); } std::string getDirectory() const { return getStringField(7); } - + /// isVariable - Return true if the specified tag is legal for DIVariable. static bool isVariable(unsigned Tag); /// Verify - Verify that a variable descriptor is well formed. bool Verify() const; }; - - + /// DIBlock - This is a wrapper for a block (e.g. a function, scope, etc). class DIBlock : public DIDescriptor { public: @@ -331,7 +325,7 @@ DIDescriptor getContext() const { return getDescriptorField(1); } }; - + /// DIFactory - This object assists with the construction of the various /// descriptors. class DIFactory { @@ -346,12 +340,12 @@ Function *DeclareFn; // llvm.dbg.declare StringMap StringCache; DenseMap SimpleConstantCache; - + DIFactory(const DIFactory &); // DO NOT IMPLEMENT void operator=(const DIFactory&); // DO NOT IMPLEMENT public: explicit DIFactory(Module &m); - + /// GetOrCreateCompileUnitAnchor - Return the anchor for compile units, /// creating a new one if there isn't already one in the module. DIAnchor GetOrCreateCompileUnitAnchor(); @@ -371,8 +365,7 @@ /// GetOrCreateSubrange - Create a descriptor for a value range. This /// implicitly uniques the values returned. DISubrange GetOrCreateSubrange(int64_t Lo, int64_t Hi); - - + /// CreateCompileUnit - Create a new descriptor for the specified compile /// unit. DICompileUnit CreateCompileUnit(unsigned LangID, @@ -382,7 +375,7 @@ /// CreateEnumerator - Create a single enumerator value. DIEnumerator CreateEnumerator(const std::string &Name, uint64_t Val); - + /// CreateBasicType - Create a basic type like int, float, etc. DIBasicType CreateBasicType(DIDescriptor Context, const std::string &Name, DICompileUnit CompileUnit, unsigned LineNumber, @@ -391,7 +384,7 @@ unsigned Encoding, const std::string *FileName = 0, const std::string *Directory = 0); - + /// CreateDerivedType - Create a derived type like const qualified type, /// pointer, typedef, etc. DIDerivedType CreateDerivedType(unsigned Tag, DIDescriptor Context, @@ -416,7 +409,7 @@ DIArray Elements, const std::string *FileName = 0, const std::string *Directory = 0); - + /// CreateSubprogram - Create a new descriptor for the specified subprogram. /// See comments in DISubprogram for descriptions of these fields. DISubprogram CreateSubprogram(DIDescriptor Context, const std::string &Name, @@ -438,8 +431,7 @@ bool isDefinition, llvm::GlobalVariable *GV, const std::string *FileName = 0, const std::string *Directory = 0); - - + /// CreateVariable - Create a new descriptor for the specified variable. DIVariable CreateVariable(unsigned Tag, DIDescriptor Context, const std::string &Name, @@ -447,16 +439,16 @@ DIType Type, const std::string *FileName = 0, const std::string *Directory = 0); - + /// CreateBlock - This creates a descriptor for a lexical block with the /// specified parent context. DIBlock CreateBlock(DIDescriptor Context); - + /// InsertStopPoint - Create a new llvm.dbg.stoppoint intrinsic invocation, /// inserting it at the end of the specified basic block. void InsertStopPoint(DICompileUnit CU, unsigned LineNo, unsigned ColNo, BasicBlock *BB); - + /// InsertSubprogramStart - Create a new llvm.dbg.func.start intrinsic to /// mark the start of the specified subprogram. void InsertSubprogramStart(DISubprogram SP, BasicBlock *BB); @@ -464,23 +456,23 @@ /// InsertRegionStart - Insert a new llvm.dbg.region.start intrinsic call to /// mark the start of a region for the specified scoping descriptor. void InsertRegionStart(DIDescriptor D, BasicBlock *BB); - + /// InsertRegionEnd - Insert a new llvm.dbg.region.end intrinsic call to /// mark the end of a region for the specified scoping descriptor. void InsertRegionEnd(DIDescriptor D, BasicBlock *BB); - + /// InsertDeclare - Insert a new llvm.dbg.declare intrinsic call. void InsertDeclare(llvm::Value *Storage, DIVariable D, BasicBlock *BB); - + private: Constant *GetTagConstant(unsigned TAG); Constant *GetStringConstant(const std::string &String); DIAnchor GetOrCreateAnchor(unsigned TAG, const char *Name); - + /// getCastToEmpty - Return the descriptor as a Constant* with type '{}*'. Constant *getCastToEmpty(DIDescriptor D); }; - + /// Finds the stoppoint coressponding to this instruction, that is the /// stoppoint that dominates this instruction const DbgStopPointInst *findStopPoint(const Instruction *Inst); From evan.cheng at apple.com Tue Jan 20 13:12:24 2009 From: evan.cheng at apple.com (Evan Cheng) Date: Tue, 20 Jan 2009 19:12:24 -0000 Subject: [llvm-commits] [llvm] r62600 - in /llvm/trunk: include/llvm/Target/ lib/CodeGen/ lib/CodeGen/SelectionDAG/ lib/Target/ARM/ lib/Target/Alpha/ lib/Target/CellSPU/ lib/Target/IA64/ lib/Target/Mips/ lib/Target/PIC16/ lib/Target/PowerPC/ lib/Target/Sparc/ lib/Target/X86/ lib/Target/XCore/ Message-ID: <200901201912.n0KJCPV5029147@zion.cs.uiuc.edu> Author: evancheng Date: Tue Jan 20 13:12:24 2009 New Revision: 62600 URL: http://llvm.org/viewvc/llvm-project?rev=62600&view=rev Log: Change TargetInstrInfo::isMoveInstr to return source and destination sub-register indices as well. Modified: llvm/trunk/include/llvm/Target/TargetInstrInfo.h llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp llvm/trunk/lib/CodeGen/RegAllocBigBlock.cpp llvm/trunk/lib/CodeGen/RegAllocLinearScan.cpp llvm/trunk/lib/CodeGen/RegAllocLocal.cpp llvm/trunk/lib/CodeGen/RegAllocPBQP.cpp llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp llvm/trunk/lib/CodeGen/SimpleRegisterCoalescing.cpp llvm/trunk/lib/CodeGen/VirtRegMap.cpp llvm/trunk/lib/Target/ARM/ARMInstrInfo.cpp llvm/trunk/lib/Target/ARM/ARMInstrInfo.h llvm/trunk/lib/Target/Alpha/AlphaInstrInfo.cpp llvm/trunk/lib/Target/Alpha/AlphaInstrInfo.h llvm/trunk/lib/Target/CellSPU/SPUInstrInfo.cpp llvm/trunk/lib/Target/CellSPU/SPUInstrInfo.h llvm/trunk/lib/Target/IA64/IA64InstrInfo.cpp llvm/trunk/lib/Target/IA64/IA64InstrInfo.h llvm/trunk/lib/Target/Mips/MipsInstrInfo.cpp llvm/trunk/lib/Target/Mips/MipsInstrInfo.h llvm/trunk/lib/Target/PIC16/PIC16InstrInfo.cpp llvm/trunk/lib/Target/PIC16/PIC16InstrInfo.h llvm/trunk/lib/Target/PowerPC/PPCInstrInfo.cpp llvm/trunk/lib/Target/PowerPC/PPCInstrInfo.h llvm/trunk/lib/Target/Sparc/SparcInstrInfo.cpp llvm/trunk/lib/Target/Sparc/SparcInstrInfo.h llvm/trunk/lib/Target/X86/X86FastISel.cpp llvm/trunk/lib/Target/X86/X86InstrInfo.cpp llvm/trunk/lib/Target/X86/X86InstrInfo.h llvm/trunk/lib/Target/XCore/XCoreAsmPrinter.cpp llvm/trunk/lib/Target/XCore/XCoreInstrInfo.cpp llvm/trunk/lib/Target/XCore/XCoreInstrInfo.h Modified: llvm/trunk/include/llvm/Target/TargetInstrInfo.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/TargetInstrInfo.h?rev=62600&r1=62599&r2=62600&view=diff ============================================================================== --- llvm/trunk/include/llvm/Target/TargetInstrInfo.h (original) +++ llvm/trunk/include/llvm/Target/TargetInstrInfo.h Tue Jan 20 13:12:24 2009 @@ -88,11 +88,11 @@ } public: - /// Return true if the instruction is a register to register move - /// and leave the source and dest operands in the passed parameters. + /// Return true if the instruction is a register to register move and return + /// the source and dest operands and their sub-register indices by reference. virtual bool isMoveInstr(const MachineInstr& MI, - unsigned& sourceReg, - unsigned& destReg) const { + unsigned& SrcReg, unsigned& DstReg, + unsigned& SrcSubIdx, unsigned& DstSubIdx) const { return false; } Modified: llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp?rev=62600&r1=62599&r2=62600&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp (original) +++ llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp Tue Jan 20 13:12:24 2009 @@ -298,8 +298,8 @@ if (index == end) break; MachineInstr *MI = getInstructionFromIndex(index); - unsigned SrcReg, DstReg; - if (tii_->isMoveInstr(*MI, SrcReg, DstReg)) + unsigned SrcReg, DstReg, SrcSubReg, DstSubReg; + if (tii_->isMoveInstr(*MI, SrcReg, DstReg, SrcSubReg, DstSubReg)) if (SrcReg == li.reg || DstReg == li.reg) continue; for (unsigned i = 0; i != MI->getNumOperands(); ++i) { @@ -396,10 +396,10 @@ defIndex = getUseIndex(MIIdx); VNInfo *ValNo; MachineInstr *CopyMI = NULL; - unsigned SrcReg, DstReg; + unsigned SrcReg, DstReg, SrcSubReg, DstSubReg; if (mi->getOpcode() == TargetInstrInfo::EXTRACT_SUBREG || mi->getOpcode() == TargetInstrInfo::INSERT_SUBREG || - tii_->isMoveInstr(*mi, SrcReg, DstReg)) + tii_->isMoveInstr(*mi, SrcReg, DstReg, SrcSubReg, DstSubReg)) CopyMI = mi; // Earlyclobbers move back one. ValNo = interval.getNextValue(defIndex, CopyMI, VNInfoAllocator); @@ -551,10 +551,10 @@ VNInfo *ValNo; MachineInstr *CopyMI = NULL; - unsigned SrcReg, DstReg; + unsigned SrcReg, DstReg, SrcSubReg, DstSubReg; if (mi->getOpcode() == TargetInstrInfo::EXTRACT_SUBREG || mi->getOpcode() == TargetInstrInfo::INSERT_SUBREG || - tii_->isMoveInstr(*mi, SrcReg, DstReg)) + tii_->isMoveInstr(*mi, SrcReg, DstReg, SrcSubReg, DstSubReg)) CopyMI = mi; ValNo = interval.getNextValue(defIndex, CopyMI, VNInfoAllocator); @@ -653,10 +653,10 @@ getOrCreateInterval(MO.getReg())); else if (allocatableRegs_[MO.getReg()]) { MachineInstr *CopyMI = NULL; - unsigned SrcReg, DstReg; + unsigned SrcReg, DstReg, SrcSubReg, DstSubReg; if (MI->getOpcode() == TargetInstrInfo::EXTRACT_SUBREG || MI->getOpcode() == TargetInstrInfo::INSERT_SUBREG || - tii_->isMoveInstr(*MI, SrcReg, DstReg)) + tii_->isMoveInstr(*MI, SrcReg, DstReg, SrcSubReg, DstSubReg)) CopyMI = MI; handlePhysicalRegisterDef(MBB, MI, MIIdx, MO, getOrCreateInterval(MO.getReg()), CopyMI); @@ -844,8 +844,8 @@ } else if (VNI->copy->getOpcode() == TargetInstrInfo::INSERT_SUBREG) return VNI->copy->getOperand(2).getReg(); - unsigned SrcReg, DstReg; - if (tii_->isMoveInstr(*VNI->copy, SrcReg, DstReg)) + unsigned SrcReg, DstReg, SrcSubReg, DstSubReg; + if (tii_->isMoveInstr(*VNI->copy, SrcReg, DstReg, SrcSubReg, DstSubReg)) return SrcReg; assert(0 && "Unrecognized copy instruction!"); return 0; Modified: llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp?rev=62600&r1=62599&r2=62600&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp (original) +++ llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp Tue Jan 20 13:12:24 2009 @@ -846,9 +846,9 @@ VNInfo* NewVN = LI->getNextValue(DefIdx, 0, Alloc); // If the def is a move, set the copy field. - unsigned source, dest; - if (TII->isMoveInstr(*DI, source, dest)) - if (dest == LI->reg) + unsigned SrcReg, DstReg, SrcSubIdx, DstSubIdx; + if (TII->isMoveInstr(*DI, SrcReg, DstReg, SrcSubIdx, DstSubIdx)) + if (DstReg == LI->reg) NewVN->copy = &*DI; NewVNs[&*DI] = NewVN; Modified: llvm/trunk/lib/CodeGen/RegAllocBigBlock.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/RegAllocBigBlock.cpp?rev=62600&r1=62599&r2=62600&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/RegAllocBigBlock.cpp (original) +++ llvm/trunk/lib/CodeGen/RegAllocBigBlock.cpp Tue Jan 20 13:12:24 2009 @@ -823,8 +823,9 @@ } // Finally, if this is a noop copy instruction, zap it. - unsigned SrcReg, DstReg; - if (TII.isMoveInstr(*MI, SrcReg, DstReg) && SrcReg == DstReg) + unsigned SrcReg, DstReg, SrcSubReg, DstSubReg; + if (TII.isMoveInstr(*MI, SrcReg, DstReg, SrcSubReg, DstSubReg) && + SrcReg == DstReg) MBB.erase(MI); } Modified: llvm/trunk/lib/CodeGen/RegAllocLinearScan.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/RegAllocLinearScan.cpp?rev=62600&r1=62599&r2=62600&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/RegAllocLinearScan.cpp (original) +++ llvm/trunk/lib/CodeGen/RegAllocLinearScan.cpp Tue Jan 20 13:12:24 2009 @@ -253,8 +253,9 @@ if (!vni->def || vni->def == ~1U || vni->def == ~0U) return Reg; MachineInstr *CopyMI = li_->getInstructionFromIndex(vni->def); - unsigned SrcReg, DstReg; - if (!CopyMI || !tii_->isMoveInstr(*CopyMI, SrcReg, DstReg)) + unsigned SrcReg, DstReg, SrcSubReg, DstSubReg; + if (!CopyMI || + !tii_->isMoveInstr(*CopyMI, SrcReg, DstReg, SrcSubReg, DstSubReg)) return Reg; if (TargetRegisterInfo::isVirtualRegister(SrcReg)) { if (!vrm_->isAssignedReg(SrcReg)) @@ -695,8 +696,9 @@ VNInfo *vni = cur->begin()->valno; if (vni->def && vni->def != ~1U && vni->def != ~0U) { MachineInstr *CopyMI = li_->getInstructionFromIndex(vni->def); - unsigned SrcReg, DstReg; - if (CopyMI && tii_->isMoveInstr(*CopyMI, SrcReg, DstReg)) { + unsigned SrcReg, DstReg, SrcSubReg, DstSubReg; + if (CopyMI && + tii_->isMoveInstr(*CopyMI, SrcReg, DstReg, SrcSubReg, DstSubReg)) { unsigned Reg = 0; if (TargetRegisterInfo::isPhysicalRegister(SrcReg)) Reg = SrcReg; Modified: llvm/trunk/lib/CodeGen/RegAllocLocal.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/RegAllocLocal.cpp?rev=62600&r1=62599&r2=62600&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/RegAllocLocal.cpp (original) +++ llvm/trunk/lib/CodeGen/RegAllocLocal.cpp Tue Jan 20 13:12:24 2009 @@ -960,8 +960,9 @@ } // Finally, if this is a noop copy instruction, zap it. - unsigned SrcReg, DstReg; - if (TII->isMoveInstr(*MI, SrcReg, DstReg) && SrcReg == DstReg) + unsigned SrcReg, DstReg, SrcSubReg, DstSubReg; + if (TII->isMoveInstr(*MI, SrcReg, DstReg, SrcSubReg, DstSubReg) && + SrcReg == DstReg) MBB.erase(MI); } Modified: llvm/trunk/lib/CodeGen/RegAllocPBQP.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/RegAllocPBQP.cpp?rev=62600&r1=62599&r2=62600&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/RegAllocPBQP.cpp (original) +++ llvm/trunk/lib/CodeGen/RegAllocPBQP.cpp Tue Jan 20 13:12:24 2009 @@ -359,10 +359,10 @@ iItr != iEnd; ++iItr) { const MachineInstr *instr = &*iItr; - unsigned srcReg, dstReg; + unsigned srcReg, dstReg, srcSubReg, dstSubReg; // If this isn't a copy then continue to the next instruction. - if (!tii->isMoveInstr(*instr, srcReg, dstReg)) + if (!tii->isMoveInstr(*instr, srcReg, dstReg, srcSubReg, dstSubReg)) continue; // If the registers are already the same our job is nice and easy. Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp?rev=62600&r1=62599&r2=62600&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp Tue Jan 20 13:12:24 2009 @@ -189,9 +189,9 @@ // don't coalesce. Also, only coalesce away a virtual register to virtual // register copy. bool Coalesced = false; - unsigned SrcReg, DstReg; + unsigned SrcReg, DstReg, SrcSubReg, DstSubReg; if (NumUses == 1 && - TII.isMoveInstr(*UseMI, SrcReg, DstReg) && + TII.isMoveInstr(*UseMI, SrcReg, DstReg, SrcSubReg, DstSubReg) && TargetRegisterInfo::isVirtualRegister(DstReg)) { VirtReg = DstReg; Coalesced = true; Modified: llvm/trunk/lib/CodeGen/SimpleRegisterCoalescing.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SimpleRegisterCoalescing.cpp?rev=62600&r1=62599&r2=62600&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SimpleRegisterCoalescing.cpp (original) +++ llvm/trunk/lib/CodeGen/SimpleRegisterCoalescing.cpp Tue Jan 20 13:12:24 2009 @@ -386,8 +386,8 @@ else BKills.push_back(li_->getUseIndex(UseIdx)+1); } - unsigned SrcReg, DstReg; - if (!tii_->isMoveInstr(*UseMI, SrcReg, DstReg)) + unsigned SrcReg, DstReg, SrcSubIdx, DstSubIdx; + if (!tii_->isMoveInstr(*UseMI, SrcReg, DstReg, SrcSubIdx, DstSubIdx)) continue; if (DstReg == IntB.reg) { // This copy will become a noop. If it's defining a new val#, @@ -563,8 +563,9 @@ if (OldSubIdx) UseDstReg = tri_->getSubReg(DstReg, OldSubIdx); - unsigned CopySrcReg, CopyDstReg; - if (tii_->isMoveInstr(*UseMI, CopySrcReg, CopyDstReg) && + unsigned CopySrcReg, CopyDstReg, CopySrcSubIdx, CopyDstSubIdx; + if (tii_->isMoveInstr(*UseMI, CopySrcReg, CopyDstReg, + CopySrcSubIdx, CopyDstSubIdx) && CopySrcReg != CopyDstReg && CopySrcReg == SrcReg && CopyDstReg != UseDstReg) { // If the use is a copy and it won't be coalesced away, and its source @@ -595,9 +596,10 @@ // After updating the operand, check if the machine instruction has // become a copy. If so, update its val# information. const TargetInstrDesc &TID = UseMI->getDesc(); - unsigned CopySrcReg, CopyDstReg; + unsigned CopySrcReg, CopyDstReg, CopySrcSubIdx, CopyDstSubIdx; if (TID.getNumDefs() == 1 && TID.getNumOperands() > 2 && - tii_->isMoveInstr(*UseMI, CopySrcReg, CopyDstReg) && + tii_->isMoveInstr(*UseMI, CopySrcReg, CopyDstReg, + CopySrcSubIdx, CopyDstSubIdx) && CopySrcReg != CopyDstReg && (TargetRegisterInfo::isVirtualRegister(CopyDstReg) || allocatableRegs_[CopyDstReg])) { @@ -818,8 +820,8 @@ // of last use. LastUse->setIsKill(); removeRange(li, li_->getDefIndex(LastUseIdx), LR->end, li_, tri_); - unsigned SrcReg, DstReg; - if (tii_->isMoveInstr(*LastUseMI, SrcReg, DstReg) && + unsigned SrcReg, DstReg, SrcSubIdx, DstSubIdx; + if (tii_->isMoveInstr(*LastUseMI, SrcReg, DstReg, SrcSubIdx, DstSubIdx) && DstReg == li.reg) { // Last use is itself an identity code. int DeadIdx = LastUseMI->findRegisterDefOperandIdx(li.reg, false, tri_); @@ -873,8 +875,8 @@ if (ULR == li.end() || ULR->valno != LR->valno) continue; // If the use is not a use, then it's not safe to coalesce the move. - unsigned SrcReg, DstReg; - if (!tii_->isMoveInstr(*UseMI, SrcReg, DstReg)) { + unsigned SrcReg, DstReg, SrcSubIdx, DstSubIdx; + if (!tii_->isMoveInstr(*UseMI, SrcReg, DstReg, SrcSubIdx, DstSubIdx)) { if (UseMI->getOpcode() == TargetInstrInfo::INSERT_SUBREG && UseMI->getOperand(1).getReg() == li.reg) continue; @@ -911,8 +913,9 @@ if (ULR == li.end() || ULR->valno != VNI) continue; // If the use is a copy, turn it into an identity copy. - unsigned SrcReg, DstReg; - if (tii_->isMoveInstr(*MI, SrcReg, DstReg) && SrcReg == li.reg) { + unsigned SrcReg, DstReg, SrcSubIdx, DstSubIdx; + if (tii_->isMoveInstr(*MI, SrcReg, DstReg, SrcSubIdx, DstSubIdx) && + SrcReg == li.reg) { // Each use MI may have multiple uses of this register. Change them all. for (unsigned i = 0, e = MI->getNumOperands(); i != e; ++i) { MachineOperand &MO = MI->getOperand(i); @@ -1123,8 +1126,7 @@ DOUT << li_->getInstructionIndex(CopyMI) << '\t' << *CopyMI; - unsigned SrcReg; - unsigned DstReg; + unsigned SrcReg, DstReg, SrcSubIdx, DstSubIdx; bool isExtSubReg = CopyMI->getOpcode() == TargetInstrInfo::EXTRACT_SUBREG; bool isInsSubReg = CopyMI->getOpcode() == TargetInstrInfo::INSERT_SUBREG; unsigned SubIdx = 0; @@ -1139,7 +1141,7 @@ } DstReg = CopyMI->getOperand(0).getReg(); SrcReg = CopyMI->getOperand(2).getReg(); - } else if (!tii_->isMoveInstr(*CopyMI, SrcReg, DstReg)) { + } else if (!tii_->isMoveInstr(*CopyMI, SrcReg, DstReg, SrcSubIdx, DstSubIdx)){ assert(0 && "Unrecognized copy instruction!"); return false; } @@ -1428,10 +1430,11 @@ if (!vni->def || vni->def == ~1U || vni->def == ~0U) continue; MachineInstr *CopyMI = li_->getInstructionFromIndex(vni->def); - unsigned NewSrcReg, NewDstReg; + unsigned NewSrcReg, NewDstReg, NewSrcSubIdx, NewDstSubIdx; if (CopyMI && JoinedCopies.count(CopyMI) == 0 && - tii_->isMoveInstr(*CopyMI, NewSrcReg, NewDstReg)) { + tii_->isMoveInstr(*CopyMI, NewSrcReg, NewDstReg, + NewSrcSubIdx, NewDstSubIdx)) { unsigned LoopDepth = loopInfo->getLoopDepth(CopyMBB); JoinQueue->push(CopyRec(CopyMI, LoopDepth, isBackEdgeCopy(CopyMI, DstReg))); @@ -1570,8 +1573,9 @@ // It's a sub-register live interval, we may not have precise information. // Re-compute it. MachineInstr *DefMI = li_->getInstructionFromIndex(LR->start); - unsigned SrcReg, DstReg; - if (DefMI && tii_->isMoveInstr(*DefMI, SrcReg, DstReg) && + unsigned SrcReg, DstReg, SrcSubIdx, DstSubIdx; + if (DefMI && + tii_->isMoveInstr(*DefMI, SrcReg, DstReg, SrcSubIdx, DstSubIdx) && DstReg == li.reg && SrcReg == Reg) { // Cache computed info. LR->valno->def = LR->start; @@ -2070,14 +2074,14 @@ MachineInstr *Inst = MII++; // If this isn't a copy nor a extract_subreg, we can't join intervals. - unsigned SrcReg, DstReg; + unsigned SrcReg, DstReg, SrcSubIdx, DstSubIdx; if (Inst->getOpcode() == TargetInstrInfo::EXTRACT_SUBREG) { DstReg = Inst->getOperand(0).getReg(); SrcReg = Inst->getOperand(1).getReg(); } else if (Inst->getOpcode() == TargetInstrInfo::INSERT_SUBREG) { DstReg = Inst->getOperand(0).getReg(); SrcReg = Inst->getOperand(2).getReg(); - } else if (!tii_->isMoveInstr(*Inst, SrcReg, DstReg)) + } else if (!tii_->isMoveInstr(*Inst, SrcReg, DstReg, SrcSubIdx, DstSubIdx)) continue; bool SrcIsPhys = TargetRegisterInfo::isPhysicalRegister(SrcReg); @@ -2243,8 +2247,9 @@ E = mri_->use_end(); I != E; ++I) { MachineOperand &Use = I.getOperand(); MachineInstr *UseMI = Use.getParent(); - unsigned SrcReg, DstReg; - if (tii_->isMoveInstr(*UseMI, SrcReg, DstReg) && SrcReg == DstReg) + unsigned SrcReg, DstReg, SrcSubIdx, DstSubIdx; + if (tii_->isMoveInstr(*UseMI, SrcReg, DstReg, SrcSubIdx, DstSubIdx) && + SrcReg == DstReg) // Ignore identity copies. continue; unsigned Idx = li_->getInstructionIndex(UseMI); @@ -2269,8 +2274,9 @@ return NULL; // Ignore identity copies. - unsigned SrcReg, DstReg; - if (!(tii_->isMoveInstr(*MI, SrcReg, DstReg) && SrcReg == DstReg)) + unsigned SrcReg, DstReg, SrcSubIdx, DstSubIdx; + if (!(tii_->isMoveInstr(*MI, SrcReg, DstReg, SrcSubIdx, DstSubIdx) && + SrcReg == DstReg)) for (unsigned i = 0, NumOps = MI->getNumOperands(); i != NumOps; ++i) { MachineOperand &Use = MI->getOperand(i); if (Use.isReg() && Use.isUse() && Use.getReg() && @@ -2389,10 +2395,10 @@ for (MachineBasicBlock::iterator mii = mbb->begin(), mie = mbb->end(); mii != mie; ) { MachineInstr *MI = mii; - unsigned SrcReg, DstReg; + unsigned SrcReg, DstReg, SrcSubIdx, DstSubIdx; if (JoinedCopies.count(MI)) { // Delete all coalesced copies. - if (!tii_->isMoveInstr(*MI, SrcReg, DstReg)) { + if (!tii_->isMoveInstr(*MI, SrcReg, DstReg, SrcSubIdx, DstSubIdx)) { assert((MI->getOpcode() == TargetInstrInfo::EXTRACT_SUBREG || MI->getOpcode() == TargetInstrInfo::INSERT_SUBREG) && "Unrecognized copy instruction"); @@ -2441,7 +2447,7 @@ } // If the move will be an identity move delete it - bool isMove = tii_->isMoveInstr(*MI, SrcReg, DstReg); + bool isMove= tii_->isMoveInstr(*MI, SrcReg, DstReg, SrcSubIdx, DstSubIdx); if (isMove && SrcReg == DstReg) { if (li_->hasInterval(SrcReg)) { LiveInterval &RegInt = li_->getInterval(SrcReg); Modified: llvm/trunk/lib/CodeGen/VirtRegMap.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/VirtRegMap.cpp?rev=62600&r1=62599&r2=62600&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/VirtRegMap.cpp (original) +++ llvm/trunk/lib/CodeGen/VirtRegMap.cpp Tue Jan 20 13:12:24 2009 @@ -1753,8 +1753,8 @@ if (!TargetRegisterInfo::isVirtualRegister(VirtReg)) { // Check to see if this is a noop copy. If so, eliminate the // instruction before considering the dest reg to be changed. - unsigned Src, Dst; - if (TII->isMoveInstr(MI, Src, Dst) && Src == Dst) { + unsigned Src, Dst, SrcSR, DstSR; + if (TII->isMoveInstr(MI, Src, Dst, SrcSR, DstSR) && Src == Dst) { ++NumDCE; DOUT << "Removing now-noop copy: " << MI; SmallVector KillRegs; @@ -1840,8 +1840,8 @@ // Check to see if this is a noop copy. If so, eliminate the // instruction before considering the dest reg to be changed. { - unsigned Src, Dst; - if (TII->isMoveInstr(MI, Src, Dst) && Src == Dst) { + unsigned Src, Dst, SrcSR, DstSR; + if (TII->isMoveInstr(MI, Src, Dst, SrcSR, DstSR) && Src == Dst) { ++NumDCE; DOUT << "Removing now-noop copy: " << MI; InvalidateKills(MI, RegKills, KillOps); Modified: llvm/trunk/lib/Target/ARM/ARMInstrInfo.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMInstrInfo.cpp?rev=62600&r1=62599&r2=62600&view=diff ============================================================================== --- llvm/trunk/lib/Target/ARM/ARMInstrInfo.cpp (original) +++ llvm/trunk/lib/Target/ARM/ARMInstrInfo.cpp Tue Jan 20 13:12:24 2009 @@ -51,7 +51,10 @@ /// leave the source and dest operands in the passed parameters. /// bool ARMInstrInfo::isMoveInstr(const MachineInstr &MI, - unsigned &SrcReg, unsigned &DstReg) const { + unsigned &SrcReg, unsigned &DstReg, + unsigned& SrcSubIdx, unsigned& DstSubIdx) const { + SrcSubIdx = DstSubIdx = 0; // No sub-registers. + unsigned oc = MI.getOpcode(); switch (oc) { default: Modified: llvm/trunk/lib/Target/ARM/ARMInstrInfo.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMInstrInfo.h?rev=62600&r1=62599&r2=62600&view=diff ============================================================================== --- llvm/trunk/lib/Target/ARM/ARMInstrInfo.h (original) +++ llvm/trunk/lib/Target/ARM/ARMInstrInfo.h Tue Jan 20 13:12:24 2009 @@ -155,11 +155,12 @@ /// This is used for addressing modes. virtual const TargetRegisterClass *getPointerRegClass() const; - /// Return true if the instruction is a register to register move and - /// leave the source and dest operands in the passed parameters. - /// + /// Return true if the instruction is a register to register move and return + /// the source and dest operands and their sub-register indices by reference. virtual bool isMoveInstr(const MachineInstr &MI, - unsigned &SrcReg, unsigned &DstReg) const; + unsigned &SrcReg, unsigned &DstReg, + unsigned &SrcSubIdx, unsigned &DstSubIdx) const; + virtual unsigned isLoadFromStackSlot(const MachineInstr *MI, int &FrameIndex) const; virtual unsigned isStoreToStackSlot(const MachineInstr *MI, Modified: llvm/trunk/lib/Target/Alpha/AlphaInstrInfo.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Alpha/AlphaInstrInfo.cpp?rev=62600&r1=62599&r2=62600&view=diff ============================================================================== --- llvm/trunk/lib/Target/Alpha/AlphaInstrInfo.cpp (original) +++ llvm/trunk/lib/Target/Alpha/AlphaInstrInfo.cpp Tue Jan 20 13:12:24 2009 @@ -25,8 +25,8 @@ bool AlphaInstrInfo::isMoveInstr(const MachineInstr& MI, - unsigned& sourceReg, - unsigned& destReg) const { + unsigned& sourceReg, unsigned& destReg, + unsigned& SrcSR, unsigned& DstSR) const { unsigned oc = MI.getOpcode(); if (oc == Alpha::BISr || oc == Alpha::CPYSS || @@ -43,6 +43,7 @@ if (MI.getOperand(1).getReg() == MI.getOperand(2).getReg()) { sourceReg = MI.getOperand(1).getReg(); destReg = MI.getOperand(0).getReg(); + SrcSR = DstSR = 0; return true; } } Modified: llvm/trunk/lib/Target/Alpha/AlphaInstrInfo.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Alpha/AlphaInstrInfo.h?rev=62600&r1=62599&r2=62600&view=diff ============================================================================== --- llvm/trunk/lib/Target/Alpha/AlphaInstrInfo.h (original) +++ llvm/trunk/lib/Target/Alpha/AlphaInstrInfo.h Tue Jan 20 13:12:24 2009 @@ -30,11 +30,11 @@ /// virtual const AlphaRegisterInfo &getRegisterInfo() const { return RI; } - /// Return true if the instruction is a register to register move and - /// leave the source and dest operands in the passed parameters. - /// + /// Return true if the instruction is a register to register move and return + /// the source and dest operands and their sub-register indices by reference. virtual bool isMoveInstr(const MachineInstr &MI, - unsigned &SrcReg, unsigned &DstReg) const; + unsigned &SrcReg, unsigned &DstReg, + unsigned &SrcSubIdx, unsigned &DstSubIdx) const; virtual unsigned isLoadFromStackSlot(const MachineInstr *MI, int &FrameIndex) const; Modified: llvm/trunk/lib/Target/CellSPU/SPUInstrInfo.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/CellSPU/SPUInstrInfo.cpp?rev=62600&r1=62599&r2=62600&view=diff ============================================================================== --- llvm/trunk/lib/Target/CellSPU/SPUInstrInfo.cpp (original) +++ llvm/trunk/lib/Target/CellSPU/SPUInstrInfo.cpp Tue Jan 20 13:12:24 2009 @@ -64,7 +64,10 @@ bool SPUInstrInfo::isMoveInstr(const MachineInstr& MI, unsigned& sourceReg, - unsigned& destReg) const { + unsigned& destReg, + unsigned& SrcSR, unsigned& DstSR) const { + SrcSR = DstSR = 0; // No sub-registers. + // Primarily, ORI and OR are generated by copyRegToReg. But, there are other // cases where we can safely say that what's being done is really a move // (see how PowerPC does this -- it's the model for this code too.) Modified: llvm/trunk/lib/Target/CellSPU/SPUInstrInfo.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/CellSPU/SPUInstrInfo.h?rev=62600&r1=62599&r2=62600&view=diff ============================================================================== --- llvm/trunk/lib/Target/CellSPU/SPUInstrInfo.h (original) +++ llvm/trunk/lib/Target/CellSPU/SPUInstrInfo.h Tue Jan 20 13:12:24 2009 @@ -49,12 +49,11 @@ /// This is used for addressing modes. virtual const TargetRegisterClass *getPointerRegClass() const; - // Return true if the instruction is a register to register move and - // leave the source and dest operands in the passed parameters. - // - virtual bool isMoveInstr(const MachineInstr& MI, - unsigned& sourceReg, - unsigned& destReg) const; + /// Return true if the instruction is a register to register move and return + /// the source and dest operands and their sub-register indices by reference. + virtual bool isMoveInstr(const MachineInstr &MI, + unsigned &SrcReg, unsigned &DstReg, + unsigned &SrcSubIdx, unsigned &DstSubIdx) const; unsigned isLoadFromStackSlot(const MachineInstr *MI, int &FrameIndex) const; Modified: llvm/trunk/lib/Target/IA64/IA64InstrInfo.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/IA64/IA64InstrInfo.cpp?rev=62600&r1=62599&r2=62600&view=diff ============================================================================== --- llvm/trunk/lib/Target/IA64/IA64InstrInfo.cpp (original) +++ llvm/trunk/lib/Target/IA64/IA64InstrInfo.cpp Tue Jan 20 13:12:24 2009 @@ -26,8 +26,11 @@ bool IA64InstrInfo::isMoveInstr(const MachineInstr& MI, - unsigned& sourceReg, - unsigned& destReg) const { + unsigned& sourceReg, + unsigned& destReg, + unsigned& SrcSR, unsigned& DstSR) const { + SrcSR = DstSR = 0; // No sub-registers. + unsigned oc = MI.getOpcode(); if (oc == IA64::MOV || oc == IA64::FMOV) { // TODO: this doesn't detect predicate moves Modified: llvm/trunk/lib/Target/IA64/IA64InstrInfo.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/IA64/IA64InstrInfo.h?rev=62600&r1=62599&r2=62600&view=diff ============================================================================== --- llvm/trunk/lib/Target/IA64/IA64InstrInfo.h (original) +++ llvm/trunk/lib/Target/IA64/IA64InstrInfo.h Tue Jan 20 13:12:24 2009 @@ -30,13 +30,11 @@ /// virtual const IA64RegisterInfo &getRegisterInfo() const { return RI; } - // - // Return true if the instruction is a register to register move and - // leave the source and dest operands in the passed parameters. - // - virtual bool isMoveInstr(const MachineInstr& MI, - unsigned& sourceReg, - unsigned& destReg) const; + /// Return true if the instruction is a register to register move and return + /// the source and dest operands and their sub-register indices by reference. + virtual bool isMoveInstr(const MachineInstr &MI, + unsigned &SrcReg, unsigned &DstReg, + unsigned &SrcSubIdx, unsigned &DstSubIdx) const; virtual unsigned InsertBranch(MachineBasicBlock &MBB, MachineBasicBlock *TBB, MachineBasicBlock *FBB, const SmallVectorImpl &Cond) const; Modified: llvm/trunk/lib/Target/Mips/MipsInstrInfo.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/MipsInstrInfo.cpp?rev=62600&r1=62599&r2=62600&view=diff ============================================================================== --- llvm/trunk/lib/Target/Mips/MipsInstrInfo.cpp (original) +++ llvm/trunk/lib/Target/Mips/MipsInstrInfo.cpp Tue Jan 20 13:12:24 2009 @@ -30,8 +30,11 @@ /// Return true if the instruction is a register to register move and /// leave the source and dest operands in the passed parameters. bool MipsInstrInfo:: -isMoveInstr(const MachineInstr &MI, unsigned &SrcReg, unsigned &DstReg) const +isMoveInstr(const MachineInstr &MI, unsigned &SrcReg, unsigned &DstReg, + unsigned &SrcSubIdx, unsigned &DstSubIdx) const { + SrcSubIdx = DstSubIdx = 0; // No sub-registers. + // addu $dst, $src, $zero || addu $dst, $zero, $src // or $dst, $src, $zero || or $dst, $zero, $src if ((MI.getOpcode() == Mips::ADDu) || (MI.getOpcode() == Mips::OR)) { Modified: llvm/trunk/lib/Target/Mips/MipsInstrInfo.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/MipsInstrInfo.h?rev=62600&r1=62599&r2=62600&view=diff ============================================================================== --- llvm/trunk/lib/Target/Mips/MipsInstrInfo.h (original) +++ llvm/trunk/lib/Target/Mips/MipsInstrInfo.h Tue Jan 20 13:12:24 2009 @@ -141,11 +141,11 @@ /// virtual const MipsRegisterInfo &getRegisterInfo() const { return RI; } - /// Return true if the instruction is a register to register move and - /// leave the source and dest operands in the passed parameters. - /// + /// Return true if the instruction is a register to register move and return + /// the source and dest operands and their sub-register indices by reference. virtual bool isMoveInstr(const MachineInstr &MI, - unsigned &SrcReg, unsigned &DstReg) const; + unsigned &SrcReg, unsigned &DstReg, + unsigned &SrcSubIdx, unsigned &DstSubIdx) const; /// isLoadFromStackSlot - If the specified machine instruction is a direct /// load from a stack slot, return the virtual or physical register number of Modified: llvm/trunk/lib/Target/PIC16/PIC16InstrInfo.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PIC16/PIC16InstrInfo.cpp?rev=62600&r1=62599&r2=62600&view=diff ============================================================================== --- llvm/trunk/lib/Target/PIC16/PIC16InstrInfo.cpp (original) +++ llvm/trunk/lib/Target/PIC16/PIC16InstrInfo.cpp Tue Jan 20 13:12:24 2009 @@ -138,8 +138,9 @@ } bool PIC16InstrInfo::isMoveInstr(const MachineInstr &MI, - unsigned &SrcReg, - unsigned &DestReg) const { + unsigned &SrcReg, unsigned &DestReg, + unsigned &SrcSubIdx, unsigned &DstSubIdx) const { + SrcSubIdx = DstSubIdx = 0; // No sub-registers. if (MI.getOpcode() == PIC16::copy_fsr || MI.getOpcode() == PIC16::copy_w) { Modified: llvm/trunk/lib/Target/PIC16/PIC16InstrInfo.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PIC16/PIC16InstrInfo.h?rev=62600&r1=62599&r2=62600&view=diff ============================================================================== --- llvm/trunk/lib/Target/PIC16/PIC16InstrInfo.h (original) +++ llvm/trunk/lib/Target/PIC16/PIC16InstrInfo.h Tue Jan 20 13:12:24 2009 @@ -61,8 +61,8 @@ const TargetRegisterClass *DestRC, const TargetRegisterClass *SrcRC) const; virtual bool isMoveInstr(const MachineInstr &MI, - unsigned &SrcReg, - unsigned &DestReg) const; + unsigned &SrcReg, unsigned &DstReg, + unsigned &SrcSubIdx, unsigned &DstSubIdx) const; }; Modified: llvm/trunk/lib/Target/PowerPC/PPCInstrInfo.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/PPCInstrInfo.cpp?rev=62600&r1=62599&r2=62600&view=diff ============================================================================== --- llvm/trunk/lib/Target/PowerPC/PPCInstrInfo.cpp (original) +++ llvm/trunk/lib/Target/PowerPC/PPCInstrInfo.cpp Tue Jan 20 13:12:24 2009 @@ -42,7 +42,11 @@ bool PPCInstrInfo::isMoveInstr(const MachineInstr& MI, unsigned& sourceReg, - unsigned& destReg) const { + unsigned& destReg, + unsigned& sourceSubIdx, + unsigned& destSubIdx) const { + sourceSubIdx = destSubIdx = 0; // No sub-registers. + unsigned oc = MI.getOpcode(); if (oc == PPC::OR || oc == PPC::OR8 || oc == PPC::VOR || oc == PPC::OR4To8 || oc == PPC::OR8To4) { // or r1, r2, r2 Modified: llvm/trunk/lib/Target/PowerPC/PPCInstrInfo.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/PPCInstrInfo.h?rev=62600&r1=62599&r2=62600&view=diff ============================================================================== --- llvm/trunk/lib/Target/PowerPC/PPCInstrInfo.h (original) +++ llvm/trunk/lib/Target/PowerPC/PPCInstrInfo.h Tue Jan 20 13:12:24 2009 @@ -86,12 +86,11 @@ /// This is used for addressing modes. virtual const TargetRegisterClass *getPointerRegClass() const; - // Return true if the instruction is a register to register move and - // leave the source and dest operands in the passed parameters. - // - virtual bool isMoveInstr(const MachineInstr& MI, - unsigned& sourceReg, - unsigned& destReg) const; + /// Return true if the instruction is a register to register move and return + /// the source and dest operands and their sub-register indices by reference. + virtual bool isMoveInstr(const MachineInstr &MI, + unsigned &SrcReg, unsigned &DstReg, + unsigned &SrcSubIdx, unsigned &DstSubIdx) const; unsigned isLoadFromStackSlot(const MachineInstr *MI, int &FrameIndex) const; Modified: llvm/trunk/lib/Target/Sparc/SparcInstrInfo.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Sparc/SparcInstrInfo.cpp?rev=62600&r1=62599&r2=62600&view=diff ============================================================================== --- llvm/trunk/lib/Target/Sparc/SparcInstrInfo.cpp (original) +++ llvm/trunk/lib/Target/Sparc/SparcInstrInfo.cpp Tue Jan 20 13:12:24 2009 @@ -33,7 +33,10 @@ /// leave the source and dest operands in the passed parameters. /// bool SparcInstrInfo::isMoveInstr(const MachineInstr &MI, - unsigned &SrcReg, unsigned &DstReg) const { + unsigned &SrcReg, unsigned &DstReg, + unsigned &SrcSR, unsigned &DstSR) const { + SrcSR = DstSR = 0; // No sub-registers. + // We look for 3 kinds of patterns here: // or with G0 or 0 // add with G0 or 0 Modified: llvm/trunk/lib/Target/Sparc/SparcInstrInfo.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Sparc/SparcInstrInfo.h?rev=62600&r1=62599&r2=62600&view=diff ============================================================================== --- llvm/trunk/lib/Target/Sparc/SparcInstrInfo.h (original) +++ llvm/trunk/lib/Target/Sparc/SparcInstrInfo.h Tue Jan 20 13:12:24 2009 @@ -43,11 +43,11 @@ /// virtual const SparcRegisterInfo &getRegisterInfo() const { return RI; } - /// Return true if the instruction is a register to register move and - /// leave the source and dest operands in the passed parameters. - /// + /// Return true if the instruction is a register to register move and return + /// the source and dest operands and their sub-register indices by reference. virtual bool isMoveInstr(const MachineInstr &MI, - unsigned &SrcReg, unsigned &DstReg) const; + unsigned &SrcReg, unsigned &DstReg, + unsigned &SrcSubIdx, unsigned &DstSubIdx) const; /// isLoadFromStackSlot - If the specified machine instruction is a direct /// load from a stack slot, return the virtual or physical register number of Modified: llvm/trunk/lib/Target/X86/X86FastISel.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86FastISel.cpp?rev=62600&r1=62599&r2=62600&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/X86FastISel.cpp (original) +++ llvm/trunk/lib/Target/X86/X86FastISel.cpp Tue Jan 20 13:12:24 2009 @@ -783,9 +783,9 @@ const MachineInstr &MI = *RI; if (MI.modifiesRegister(Reg)) { - unsigned Src, Dst; + unsigned Src, Dst, SrcSR, DstSR; - if (getInstrInfo()->isMoveInstr(MI, Src, Dst)) { + if (getInstrInfo()->isMoveInstr(MI, Src, Dst, SrcSR, DstSR)) { Reg = Src; continue; } Modified: llvm/trunk/lib/Target/X86/X86InstrInfo.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86InstrInfo.cpp?rev=62600&r1=62599&r2=62600&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/X86InstrInfo.cpp (original) +++ llvm/trunk/lib/Target/X86/X86InstrInfo.cpp Tue Jan 20 13:12:24 2009 @@ -663,8 +663,8 @@ } bool X86InstrInfo::isMoveInstr(const MachineInstr& MI, - unsigned& sourceReg, - unsigned& destReg) const { + unsigned &SrcReg, unsigned &DstReg, + unsigned &SrcSubIdx, unsigned &DstSubIdx) const { switch (MI.getOpcode()) { default: return false; @@ -697,8 +697,10 @@ MI.getOperand(0).isReg() && MI.getOperand(1).isReg() && "invalid register-register move instruction"); - sourceReg = MI.getOperand(1).getReg(); - destReg = MI.getOperand(0).getReg(); + SrcReg = MI.getOperand(1).getReg(); + DstReg = MI.getOperand(0).getReg(); + SrcSubIdx = MI.getOperand(1).getSubReg(); + DstSubIdx = MI.getOperand(0).getSubReg(); return true; } } Modified: llvm/trunk/lib/Target/X86/X86InstrInfo.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86InstrInfo.h?rev=62600&r1=62599&r2=62600&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/X86InstrInfo.h (original) +++ llvm/trunk/lib/Target/X86/X86InstrInfo.h Tue Jan 20 13:12:24 2009 @@ -285,11 +285,12 @@ /// virtual const X86RegisterInfo &getRegisterInfo() const { return RI; } - // Return true if the instruction is a register to register move and - // leave the source and dest operands in the passed parameters. - // - bool isMoveInstr(const MachineInstr& MI, unsigned& sourceReg, - unsigned& destReg) const; + /// Return true if the instruction is a register to register move and return + /// the source and dest operands and their sub-register indices by reference. + virtual bool isMoveInstr(const MachineInstr &MI, + unsigned &SrcReg, unsigned &DstReg, + unsigned &SrcSubIdx, unsigned &DstSubIdx) const; + unsigned isLoadFromStackSlot(const MachineInstr *MI, int &FrameIndex) const; unsigned isStoreToStackSlot(const MachineInstr *MI, int &FrameIndex) const; Modified: llvm/trunk/lib/Target/XCore/XCoreAsmPrinter.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/XCore/XCoreAsmPrinter.cpp?rev=62600&r1=62599&r2=62600&view=diff ============================================================================== --- llvm/trunk/lib/Target/XCore/XCoreAsmPrinter.cpp (original) +++ llvm/trunk/lib/Target/XCore/XCoreAsmPrinter.cpp Tue Jan 20 13:12:24 2009 @@ -402,8 +402,8 @@ ++EmittedInsts; // Check for mov mnemonic - unsigned src, dst; - if (TM.getInstrInfo()->isMoveInstr(*MI, src, dst)) { + unsigned src, dst, srcSR, dstSR; + if (TM.getInstrInfo()->isMoveInstr(*MI, src, dst, srcSR, dstSR)) { O << "\tmov "; O << TM.getRegisterInfo()->get(dst).AsmName; O << ", "; Modified: llvm/trunk/lib/Target/XCore/XCoreInstrInfo.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/XCore/XCoreInstrInfo.cpp?rev=62600&r1=62599&r2=62600&view=diff ============================================================================== --- llvm/trunk/lib/Target/XCore/XCoreInstrInfo.cpp (original) +++ llvm/trunk/lib/Target/XCore/XCoreInstrInfo.cpp Tue Jan 20 13:12:24 2009 @@ -49,7 +49,10 @@ /// leave the source and dest operands in the passed parameters. /// bool XCoreInstrInfo::isMoveInstr(const MachineInstr &MI, - unsigned &SrcReg, unsigned &DstReg) const { + unsigned &SrcReg, unsigned &DstReg, + unsigned &SrcSR, unsigned &DstSR) const { + SrcSR = DstSR = 0; // No sub-registers. + // We look for 4 kinds of patterns here: // add dst, src, 0 // sub dst, src, 0 Modified: llvm/trunk/lib/Target/XCore/XCoreInstrInfo.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/XCore/XCoreInstrInfo.h?rev=62600&r1=62599&r2=62600&view=diff ============================================================================== --- llvm/trunk/lib/Target/XCore/XCoreInstrInfo.h (original) +++ llvm/trunk/lib/Target/XCore/XCoreInstrInfo.h Tue Jan 20 13:12:24 2009 @@ -30,11 +30,11 @@ /// virtual const TargetRegisterInfo &getRegisterInfo() const { return RI; } - /// Return true if the instruction is a register to register move and - /// leave the source and dest operands in the passed parameters. - /// + /// Return true if the instruction is a register to register move and return + /// the source and dest operands and their sub-register indices by reference. virtual bool isMoveInstr(const MachineInstr &MI, - unsigned &SrcReg, unsigned &DstReg) const; + unsigned &SrcReg, unsigned &DstReg, + unsigned &SrcSubIdx, unsigned &DstSubIdx) const; /// isLoadFromStackSlot - If the specified machine instruction is a direct /// load from a stack slot, return the virtual or physical register number of From isanbard at gmail.com Tue Jan 20 13:17:19 2009 From: isanbard at gmail.com (Bill Wendling) Date: Tue, 20 Jan 2009 11:17:19 -0800 Subject: [llvm-commits] [llvm-gcc-4.2] r62588 - /llvm-gcc-4.2/trunk/gcc/config/i386/i386.c In-Reply-To: <200901201810.n0KIALF4026996@zion.cs.uiuc.edu> References: <200901201810.n0KIALF4026996@zion.cs.uiuc.edu> Message-ID: <16e5fdf90901201117s4d088e07q1166c85edf552775@mail.gmail.com> If this was caused by my merge, please put LLVM LOCAL markers here so that this doesn't happen again. Thanks! -bw On Tue, Jan 20, 2009 at 10:10 AM, Duncan Sands wrote: > Author: baldrick > Date: Tue Jan 20 12:10:20 2009 > New Revision: 62588 > > URL: http://llvm.org/viewvc/llvm-project?rev=62588&view=rev > Log: > Revert an accidental revert of a fix: without > this, trying to use target variants such as > k8 on x86-64 linux doesn't work properly. There > was a Fortran test for this, but since the > Fortran build was broken for several months on > this target no-one noticed. I've added a C > test. > > Modified: > llvm-gcc-4.2/trunk/gcc/config/i386/i386.c > > Modified: llvm-gcc-4.2/trunk/gcc/config/i386/i386.c > URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config/i386/i386.c?rev=62588&r1=62587&r2=62588&view=diff > > ============================================================================== > --- llvm-gcc-4.2/trunk/gcc/config/i386/i386.c (original) > +++ llvm-gcc-4.2/trunk/gcc/config/i386/i386.c Tue Jan 20 12:10:20 2009 > @@ -2020,13 +2020,15 @@ > error ("-mstackrealign not supported in the 64bit mode"); > /* APPLE LOCAL end radar 4877693 */ > > + target_flags |= TARGET_SUBTARGET64_DEFAULT & ~target_flags_explicit; > + > /* Enable by default the SSE and MMX builtins. Do allow the user to > explicitly disable any of these. In particular, disabling SSE and > MMX for kernel code is extremely useful. */ > if (!ix86_arch_specified) > target_flags > - |= ((MASK_SSE2 | MASK_SSE | MASK_MMX | MASK_128BIT_LONG_DOUBLE > - | TARGET_SUBTARGET64_DEFAULT) & ~target_flags_explicit); > + |= ((MASK_SSE2 | MASK_SSE | MASK_MMX | MASK_128BIT_LONG_DOUBLE) > + & ~target_flags_explicit); > /* APPLE LOCAL begin mainline candidate */ > /* Disable the red zone for kernel compilation. > ??? Why aren't we using -mcmodel=kernel? */ > > > _______________________________________________ > llvm-commits mailing list > llvm-commits at cs.uiuc.edu > http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits > From alexei.svitkine at gmail.com Tue Jan 20 12:38:16 2009 From: alexei.svitkine at gmail.com (Alexei Svitkine) Date: Tue, 20 Jan 2009 13:38:16 -0500 Subject: [llvm-commits] [llvm] r62553 - in /llvm/trunk: autoconf/configure.ac lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp Message-ID: <62d9ffc00901201038g733c93eep95339270e6ad36ea@mail.gmail.com> I just realised I made a small typo in the patch. Line 152 of ExternalFunctions.cpp should be: *FloatPtr = AV.FloatVal; instead of: *FloatPtr = AV.DoubleVal; Someone please fix this. Thanks! -Alexei From dpatel at apple.com Tue Jan 20 13:22:03 2009 From: dpatel at apple.com (Devang Patel) Date: Tue, 20 Jan 2009 19:22:03 -0000 Subject: [llvm-commits] [llvm] r62602 - in /llvm/trunk: include/llvm/Analysis/DebugInfo.h include/llvm/CodeGen/MachineModuleInfo.h include/llvm/Support/Dwarf.h lib/Analysis/DebugInfo.cpp lib/CodeGen/AsmPrinter/DwarfWriter.cpp Message-ID: <200901201922.n0KJM3aB029464@zion.cs.uiuc.edu> Author: dpatel Date: Tue Jan 20 13:22:03 2009 New Revision: 62602 URL: http://llvm.org/viewvc/llvm-project?rev=62602&view=rev Log: Need only one set of debug info versions enum. Modified: llvm/trunk/include/llvm/Analysis/DebugInfo.h llvm/trunk/include/llvm/CodeGen/MachineModuleInfo.h llvm/trunk/include/llvm/Support/Dwarf.h llvm/trunk/lib/Analysis/DebugInfo.cpp llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp Modified: llvm/trunk/include/llvm/Analysis/DebugInfo.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Analysis/DebugInfo.h?rev=62602&r1=62601&r2=62602&view=diff ============================================================================== --- llvm/trunk/include/llvm/Analysis/DebugInfo.h (original) +++ llvm/trunk/include/llvm/Analysis/DebugInfo.h Tue Jan 20 13:22:03 2009 @@ -32,15 +32,6 @@ class Instruction; class DIDescriptor { - public: - enum { - Version7 = 7 << 16, // Current version of debug information. - Version6 = 6 << 16, // Constant for version 6. - Version5 = 5 << 16, // Constant for version 5. - Version4 = 4 << 16, // Constant for version 4. - VersionMask = 0xffff0000 // Mask for version number. - }; - protected: GlobalVariable *GV; @@ -72,11 +63,11 @@ GlobalVariable *getGV() const { return GV; } unsigned getVersion() const { - return getUnsignedField(0) & VersionMask; + return getUnsignedField(0) & LLVMDebugVersionMask; } unsigned getTag() const { - return getUnsignedField(0) & ~VersionMask; + return getUnsignedField(0) & ~LLVMDebugVersionMask; } }; Modified: llvm/trunk/include/llvm/CodeGen/MachineModuleInfo.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/MachineModuleInfo.h?rev=62602&r1=62601&r2=62602&view=diff ============================================================================== --- llvm/trunk/include/llvm/CodeGen/MachineModuleInfo.h (original) +++ llvm/trunk/include/llvm/CodeGen/MachineModuleInfo.h Tue Jan 20 13:22:03 2009 @@ -55,17 +55,6 @@ class StructType; //===----------------------------------------------------------------------===// -// Debug info constants. - -enum { - LLVMDebugVersion = (7 << 16), // Current version of debug information. - LLVMDebugVersion6 = (6 << 16), // Constant for version 6. - LLVMDebugVersion5 = (5 << 16), // Constant for version 5. - LLVMDebugVersion4 = (4 << 16), // Constant for version 4. - LLVMDebugVersionMask = 0xffff0000 // Mask for version number. -}; - -//===----------------------------------------------------------------------===// /// SourceLineInfo - This class is used to record source line correspondence. /// class SourceLineInfo { Modified: llvm/trunk/include/llvm/Support/Dwarf.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/Dwarf.h?rev=62602&r1=62601&r2=62602&view=diff ============================================================================== --- llvm/trunk/include/llvm/Support/Dwarf.h (original) +++ llvm/trunk/include/llvm/Support/Dwarf.h Tue Jan 20 13:22:03 2009 @@ -18,6 +18,17 @@ namespace llvm { +//===----------------------------------------------------------------------===// +// Debug info constants. + +enum { +LLVMDebugVersion = (7 << 16), // Current version of debug information. +LLVMDebugVersion6 = (6 << 16), // Constant for version 6. +LLVMDebugVersion5 = (5 << 16), // Constant for version 5. +LLVMDebugVersion4 = (4 << 16), // Constant for version 4. +LLVMDebugVersionMask = 0xffff0000 // Mask for version number. +}; + namespace dwarf { //===----------------------------------------------------------------------===// Modified: llvm/trunk/lib/Analysis/DebugInfo.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/DebugInfo.cpp?rev=62602&r1=62601&r2=62602&view=diff ============================================================================== --- llvm/trunk/lib/Analysis/DebugInfo.cpp (original) +++ llvm/trunk/lib/Analysis/DebugInfo.cpp Tue Jan 20 13:22:03 2009 @@ -291,9 +291,9 @@ } Constant *DIFactory::GetTagConstant(unsigned TAG) { - assert((TAG & DIDescriptor::VersionMask) == 0 && + assert((TAG & LLVMDebugVersionMask) == 0 && "Tag too large for debug encoding!"); - return ConstantInt::get(Type::Int32Ty, TAG | DIDescriptor::Version7); + return ConstantInt::get(Type::Int32Ty, TAG | LLVMDebugVersion); } Constant *DIFactory::GetStringConstant(const std::string &String) { Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp?rev=62602&r1=62601&r2=62602&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp (original) +++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp Tue Jan 20 13:22:03 2009 @@ -1559,7 +1559,7 @@ void AddSourceLine(DIE *Die, const DIVariable *V) { unsigned FileID = 0; unsigned Line = V->getLineNumber(); - if (V->getVersion() < DIDescriptor::Version7) { + if (V->getVersion() <= LLVMDebugVersion6) { // Version6 or earlier. Use compile unit info to get file id. CompileUnit *Unit = FindCompileUnit(V->getCompileUnit()); FileID = Unit->getID(); @@ -1578,7 +1578,7 @@ void AddSourceLine(DIE *Die, const DIGlobal *G) { unsigned FileID = 0; unsigned Line = G->getLineNumber(); - if (G->getVersion() < DIDescriptor::Version7) { + if (G->getVersion() < LLVMDebugVersion6) { // Version6 or earlier. Use compile unit info to get file id. CompileUnit *Unit = FindCompileUnit(G->getCompileUnit()); FileID = Unit->getID(); @@ -1595,7 +1595,7 @@ void AddSourceLine(DIE *Die, const DIType *Ty) { unsigned FileID = 0; unsigned Line = Ty->getLineNumber(); - if (Ty->getVersion() < DIDescriptor::Version7) { + if (Ty->getVersion() <= LLVMDebugVersion6) { // Version6 or earlier. Use compile unit info to get file id. CompileUnit *Unit = FindCompileUnit(Ty->getCompileUnit()); FileID = Unit->getID(); @@ -3046,7 +3046,7 @@ DIDescriptor DI(GV); // Check current version. Allow Version6 for now. unsigned Version = DI.getVersion(); - if (Version != DIDescriptor::Version7 && Version != DIDescriptor::Version6) + if (Version != LLVMDebugVersion && Version != LLVMDebugVersion6) return false; unsigned Tag = DI.getTag(); From dpatel at apple.com Tue Jan 20 13:23:30 2009 From: dpatel at apple.com (Devang Patel) Date: Tue, 20 Jan 2009 19:23:30 -0000 Subject: [llvm-commits] [llvm] r62603 - /llvm/trunk/include/llvm/Support/Dwarf.h Message-ID: <200901201923.n0KJNUYm029543@zion.cs.uiuc.edu> Author: dpatel Date: Tue Jan 20 13:23:29 2009 New Revision: 62603 URL: http://llvm.org/viewvc/llvm-project?rev=62603&view=rev Log: indentation... Modified: llvm/trunk/include/llvm/Support/Dwarf.h Modified: llvm/trunk/include/llvm/Support/Dwarf.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/Dwarf.h?rev=62603&r1=62602&r2=62603&view=diff ============================================================================== --- llvm/trunk/include/llvm/Support/Dwarf.h (original) +++ llvm/trunk/include/llvm/Support/Dwarf.h Tue Jan 20 13:23:29 2009 @@ -22,11 +22,11 @@ // Debug info constants. enum { -LLVMDebugVersion = (7 << 16), // Current version of debug information. -LLVMDebugVersion6 = (6 << 16), // Constant for version 6. -LLVMDebugVersion5 = (5 << 16), // Constant for version 5. -LLVMDebugVersion4 = (4 << 16), // Constant for version 4. -LLVMDebugVersionMask = 0xffff0000 // Mask for version number. + LLVMDebugVersion = (7 << 16), // Current version of debug information. + LLVMDebugVersion6 = (6 << 16), // Constant for version 6. + LLVMDebugVersion5 = (5 << 16), // Constant for version 5. + LLVMDebugVersion4 = (4 << 16), // Constant for version 4. + LLVMDebugVersionMask = 0xffff0000 // Mask for version number. }; namespace dwarf { From evan.cheng at apple.com Tue Jan 20 13:29:54 2009 From: evan.cheng at apple.com (Evan Cheng) Date: Tue, 20 Jan 2009 19:29:54 -0000 Subject: [llvm-commits] [llvm] r62604 - /llvm/trunk/test/CodeGen/X86/pr3154.ll Message-ID: <200901201929.n0KJTs88029738@zion.cs.uiuc.edu> Author: evancheng Date: Tue Jan 20 13:29:54 2009 New Revision: 62604 URL: http://llvm.org/viewvc/llvm-project?rev=62604&view=rev Log: Add test case for PR3154. Added: llvm/trunk/test/CodeGen/X86/pr3154.ll Added: llvm/trunk/test/CodeGen/X86/pr3154.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/pr3154.ll?rev=62604&view=auto ============================================================================== --- llvm/trunk/test/CodeGen/X86/pr3154.ll (added) +++ llvm/trunk/test/CodeGen/X86/pr3154.ll Tue Jan 20 13:29:54 2009 @@ -0,0 +1,104 @@ +; RUN: llvm-as < %s | llc -mtriple=i386-pc-linux-gnu -mattr=+sse2 +; RUN: llvm-as < %s | llc -mtriple=i386-pc-linux-gnu -mattr=+sse2 -relocation-model=pic -disable-fp-elim +; PR3154 + +define void @ff_flac_compute_autocorr_sse2(i32* %data, i32 %len, i32 %lag, double* %autoc) nounwind { +entry: + %c = alloca double, align 8 ; [#uses=2] + %0 = add i32 %len, 2 ; [#uses=1] + %1 = add i32 %0, %lag ; [#uses=1] + %2 = alloca double, i32 %1 ; [#uses=2] + %3 = getelementptr double* %2, i32 %lag ; [#uses=2] + %4 = ptrtoint double* %3 to i32 ; [#uses=1] + %5 = and i32 %4, 8 ; [#uses=1] + %6 = icmp eq i32 %5, 0 ; [#uses=1] + br i1 %6, label %bb19, label %bb + +bb: ; preds = %entry + %.sum = add i32 %lag, 1 ; [#uses=1] + %7 = getelementptr double* %2, i32 %.sum ; [#uses=1] + br label %bb19 + +bb19: ; preds = %bb, %entry + %data15.0 = phi double* [ %7, %bb ], [ %3, %entry ] ; [#uses=5] + %8 = sitofp i32 %len to double ; [#uses=1] + %9 = sub double %8, 1.000000e+00 ; [#uses=1] + %10 = fdiv double 2.000000e+00, %9 ; [#uses=1] + store double %10, double* %c, align 8 + %11 = ashr i32 %len, 1 ; [#uses=3] + %12 = mul i32 %11, -4 ; [#uses=2] + %13 = shl i32 %len, 1 ; [#uses=1] + %14 = and i32 %13, -4 ; [#uses=2] + call void asm sideeffect "movsd $0, %xmm7 \0A\09movapd ff_pd_1, %xmm6 \0A\09movapd ff_pd_2, %xmm5 \0A\09movlhps %xmm7, %xmm7 \0A\09subpd %xmm5, %xmm7 \0A\09addsd %xmm6, %xmm7 \0A\09", "*m,~{dirflag},~{fpsr},~{flags}"(double* %c) nounwind + %15 = and i32 %len, 1 ; [#uses=1] + %toBool = icmp eq i32 %15, 0 ; [#uses=1] + %16 = getelementptr double* %data15.0, i32 %11 ; [#uses=2] + %17 = getelementptr i32* %data, i32 %11 ; [#uses=2] + br i1 %toBool, label %bb22, label %bb20 + +bb20: ; preds = %bb19 + %asmtmp = call { i32, i32 } asm sideeffect "1: \0A\09movapd %xmm7, %xmm1 \0A\09mulpd %xmm1, %xmm1 \0A\09movapd %xmm6, %xmm0 \0A\09subpd %xmm1, %xmm0 \0A\09pshufd $$0x4e, %xmm0, %xmm1 \0A\09cvtpi2pd ($3,$0), %xmm2 \0A\09cvtpi2pd -1*4($3,$1), %xmm3 \0A\09mulpd %xmm0, %xmm2 \0A\09mulpd %xmm1, %xmm3 \0A\09movapd %xmm2, ($2,$0,2) \0A\09movupd %xmm3, -1*8($2,$1,2) \0A\09subpd %xmm5, %xmm7 \0A\09sub $$8, $1 \0A\09add $$8, $0 \0A\09jl 1b \0A\09", "=&r,=&r,r,r,0,1,~{dirflag},~{fpsr},~{flags}"(double* %16, i32* %17, i32 %12, i32 %14) nounwind ; <{ i32, i32 }> [#uses=0] + br label %bb28.preheader + +bb22: ; preds = %bb19 + %asmtmp23 = call { i32, i32 } asm sideeffect "1: \0A\09movapd %xmm7, %xmm1 \0A\09mulpd %xmm1, %xmm1 \0A\09movapd %xmm6, %xmm0 \0A\09subpd %xmm1, %xmm0 \0A\09pshufd $$0x4e, %xmm0, %xmm1 \0A\09cvtpi2pd ($3,$0), %xmm2 \0A\09cvtpi2pd -2*4($3,$1), %xmm3 \0A\09mulpd %xmm0, %xmm2 \0A\09mulpd %xmm1, %xmm3 \0A\09movapd %xmm2, ($2,$0,2) \0A\09movapd %xmm3, -2*8($2,$1,2) \0A\09subpd %xmm5, %xmm7 \0A\09sub $$8, $1 \0A\09add $$8, $0 \0A\09jl 1b \0A\09", "=&r,=&r,r,r,0,1,~{dirflag},~{fpsr},~{flags}"(double* %16, i32* %17, i32 %12, i32 %14) nounwind ; <{ i32, i32 }> [#uses=0] + br label %bb28.preheader + +bb28.preheader: ; preds = %bb22, %bb20 + %18 = icmp sgt i32 %lag, 0 ; [#uses=2] + br i1 %18, label %bb27, label %bb29 + +bb27: ; preds = %bb27, %bb28.preheader + %j4.042 = phi i32 [ 0, %bb28.preheader ], [ %indvar.next45, %bb27 ] ; [#uses=2] + %19 = sub i32 %j4.042, %lag ; [#uses=1] + %20 = getelementptr double* %data15.0, i32 %19 ; [#uses=1] + store double 0.000000e+00, double* %20, align 8 + %indvar.next45 = add i32 %j4.042, 1 ; [#uses=2] + %exitcond = icmp eq i32 %indvar.next45, %lag ; [#uses=1] + br i1 %exitcond, label %bb29, label %bb27 + +bb29: ; preds = %bb27, %bb28.preheader + %21 = getelementptr double* %data15.0, i32 %len ; [#uses=3] + store double 0.000000e+00, double* %21, align 8 + br i1 %18, label %bb.nph, label %bb37 + +bb.nph: ; preds = %bb29 + %22 = mul i32 %len, -8 ; [#uses=2] + %23 = add i32 %lag, -2 ; [#uses=1] + br label %bb30 + +bb30: ; preds = %bb35, %bb.nph + %indvar = phi i32 [ 0, %bb.nph ], [ %indvar.next, %bb35 ] ; [#uses=2] + %j4.141 = shl i32 %indvar, 1 ; [#uses=8] + %24 = icmp eq i32 %23, %j4.141 ; [#uses=1] + %25 = or i32 %j4.141, 1 ; [#uses=2] + br i1 %24, label %bb31, label %bb33 + +bb31: ; preds = %bb30 + %26 = add i32 %j4.141, 2 ; [#uses=2] + %.sum38 = sub i32 %len, %j4.141 ; [#uses=1] + %27 = getelementptr double* %data15.0, i32 %.sum38 ; [#uses=1] + %28 = getelementptr double* %autoc, i32 %j4.141 ; [#uses=1] + %29 = getelementptr double* %autoc, i32 %25 ; [#uses=1] + %30 = getelementptr double* %autoc, i32 %26 ; [#uses=1] + %asmtmp32 = call i32 asm sideeffect "movsd ff_pd_1, %xmm0 \0A\09movsd ff_pd_1, %xmm1 \0A\09movsd ff_pd_1, %xmm2 \0A\091: \0A\09movapd ($4,$0), %xmm3 \0A\09movupd -8($5,$0), %xmm4 \0A\09movapd ($5,$0), %xmm5 \0A\09mulpd %xmm3, %xmm4 \0A\09mulpd %xmm3, %xmm5 \0A\09mulpd -16($5,$0), %xmm3 \0A\09addpd %xmm4, %xmm1 \0A\09addpd %xmm5, %xmm0 \0A\09addpd %xmm3, %xmm2 \0A\09add $$16, $0 \0A\09jl 1b \0A\09movhlps %xmm0, %xmm3 \0A\09movhlps %xmm1, %xmm4 \0A\09movhlps %xmm2, %xmm5 \0A\09addsd %xmm3, %xmm0 \0A\09addsd %xmm4, %xmm1 \0A\09addsd %xmm5, %xmm2 \0A\09movsd %xmm0, $1 \0A\09movsd %xmm1, $2 \0A\09movsd %xmm2, $3 \0A\09", "=&r,=*m,=*m,=*m,r,r,0,~! {dirflag},~{fpsr},~{flags}"(double* %28, double* %29, double* %30, double* %21, double* %27, i32 %22) nounwind ; [#uses=0] + br label %bb35 + +bb33: ; preds = %bb30 + %.sum39 = sub i32 %len, %j4.141 ; [#uses=1] + %31 = getelementptr double* %data15.0, i32 %.sum39 ; [#uses=1] + %32 = getelementptr double* %autoc, i32 %j4.141 ; [#uses=1] + %33 = getelementptr double* %autoc, i32 %25 ; [#uses=1] + %asmtmp34 = call i32 asm sideeffect "movsd ff_pd_1, %xmm0 \0A\09movsd ff_pd_1, %xmm1 \0A\091: \0A\09movapd ($3,$0), %xmm3 \0A\09movupd -8($4,$0), %xmm4 \0A\09mulpd %xmm3, %xmm4 \0A\09mulpd ($4,$0), %xmm3 \0A\09addpd %xmm4, %xmm1 \0A\09addpd %xmm3, %xmm0 \0A\09add $$16, $0 \0A\09jl 1b \0A\09movhlps %xmm0, %xmm3 \0A\09movhlps %xmm1, %xmm4 \0A\09addsd %xmm3, %xmm0 \0A\09addsd %xmm4, %xmm1 \0A\09movsd %xmm0, $1 \0A\09movsd %xmm1, $2 \0A\09", "=&r,=*m,=*m,r,r,0,~{dirflag},~{fpsr},~{flags}"(double* %32, double* %33, double* %21, double* %31, i32 %22) nounwind ; [#uses=0] + %.pre = add i32 %j4.141, 2 ; [#uses=1] + br label %bb35 + +bb35: ; preds = %bb33, %bb31 + %.pre-phi = phi i32 [ %.pre, %bb33 ], [ %26, %bb31 ] ; [#uses=1] + %34 = icmp slt i32 %.pre-phi, %lag ; [#uses=1] + %indvar.next = add i32 %indvar, 1 ; [#uses=1] + br i1 %34, label %bb30, label %bb37 + +bb37: ; preds = %bb35, %bb29 + ret void +} From baldrick at free.fr Tue Jan 20 14:47:33 2009 From: baldrick at free.fr (Duncan Sands) Date: Tue, 20 Jan 2009 20:47:33 -0000 Subject: [llvm-commits] [llvm-gcc-4.2] r62608 - /llvm-gcc-4.2/trunk/gcc/config/i386/i386.c Message-ID: <200901202047.n0KKlXKi032259@zion.cs.uiuc.edu> Author: baldrick Date: Tue Jan 20 14:47:32 2009 New Revision: 62608 URL: http://llvm.org/viewvc/llvm-project?rev=62608&view=rev Log: Add LLVM LOCAL tags to avoid having this be stomped on again. Modified: llvm-gcc-4.2/trunk/gcc/config/i386/i386.c Modified: llvm-gcc-4.2/trunk/gcc/config/i386/i386.c URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config/i386/i386.c?rev=62608&r1=62607&r2=62608&view=diff ============================================================================== --- llvm-gcc-4.2/trunk/gcc/config/i386/i386.c (original) +++ llvm-gcc-4.2/trunk/gcc/config/i386/i386.c Tue Jan 20 14:47:32 2009 @@ -2020,15 +2020,19 @@ error ("-mstackrealign not supported in the 64bit mode"); /* APPLE LOCAL end radar 4877693 */ + /* LLVM LOCAL begin */ target_flags |= TARGET_SUBTARGET64_DEFAULT & ~target_flags_explicit; + /* LLVM LOCAL end */ /* Enable by default the SSE and MMX builtins. Do allow the user to explicitly disable any of these. In particular, disabling SSE and MMX for kernel code is extremely useful. */ if (!ix86_arch_specified) + /* LLVM LOCAL begin */ target_flags |= ((MASK_SSE2 | MASK_SSE | MASK_MMX | MASK_128BIT_LONG_DOUBLE) & ~target_flags_explicit); + /* LLVM LOCAL end */ /* APPLE LOCAL begin mainline candidate */ /* Disable the red zone for kernel compilation. ??? Why aren't we using -mcmodel=kernel? */ From dpatel at apple.com Tue Jan 20 15:02:02 2009 From: dpatel at apple.com (Devang Patel) Date: Tue, 20 Jan 2009 21:02:02 -0000 Subject: [llvm-commits] [llvm] r62610 - /llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp Message-ID: <200901202102.n0KL224h032725@zion.cs.uiuc.edu> Author: dpatel Date: Tue Jan 20 15:02:02 2009 New Revision: 62610 URL: http://llvm.org/viewvc/llvm-project?rev=62610&view=rev Log: Fix struct member's debug info. Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp?rev=62610&r1=62609&r2=62610&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp (original) +++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp Tue Jan 20 15:02:02 2009 @@ -1802,13 +1802,9 @@ else if (Element.getTag() == dwarf::DW_TAG_variable) // ??? ElemDie = CreateGlobalVariableDIE(DW_Unit, DIGlobalVariable(Element.getGV())); - else { - DIDerivedType DT = DIDerivedType(Element.getGV()); - assert (DT.isDerivedType(DT.getTag()) - && "Unexpected struct element type"); - ElemDie = new DIE(DT.getTag()); - AddType(DW_Unit, ElemDie, DT); - } + else + ElemDie = CreateMemberDIE(DW_Unit, + DIDerivedType(Element.getGV())); Buffer.AddChild(ElemDie); } } @@ -1903,6 +1899,27 @@ return GVDie; } + /// CreateMemberDIE - Create new member DIE. + DIE *CreateMemberDIE(CompileUnit *DW_Unit, const DIDerivedType &DT) { + DIE *MemberDie = new DIE(DT.getTag()); + std::string Name = DT.getName(); + if (!Name.empty()) + AddString(MemberDie, DW_AT_name, DW_FORM_string, Name); + + AddType(DW_Unit, MemberDie, DT.getTypeDerivedFrom()); + + AddSourceLine(MemberDie, &DT); + + AddUInt(MemberDie, DW_AT_bit_size, 0, DT.getSizeInBits()); + DIEBlock *Block = new DIEBlock(); + AddUInt(Block, 0, DW_FORM_data1, DW_OP_plus_uconst); + AddUInt(Block, 0, DW_FORM_udata, DT.getOffsetInBits() >> 3); + AddBlock(MemberDie, DW_AT_data_member_location, 0, Block); + + // FIXME - Handle DW_AT_accessibility + return MemberDie; + } + /// CreateSubprogramDIE - Create new DIE using SP. DIE *CreateSubprogramDIE(CompileUnit *DW_Unit, const DISubprogram &SP, From isanbard at gmail.com Tue Jan 20 15:03:17 2009 From: isanbard at gmail.com (Bill Wendling) Date: Tue, 20 Jan 2009 13:03:17 -0800 Subject: [llvm-commits] [llvm-gcc-4.2] r62608 - /llvm-gcc-4.2/trunk/gcc/config/i386/i386.c In-Reply-To: <200901202047.n0KKlXKi032259@zion.cs.uiuc.edu> References: <200901202047.n0KKlXKi032259@zion.cs.uiuc.edu> Message-ID: <16e5fdf90901201303g8693177l84a4558e3d4200f5@mail.gmail.com> On Tue, Jan 20, 2009 at 12:47 PM, Duncan Sands wrote: > Author: baldrick > Date: Tue Jan 20 14:47:32 2009 > New Revision: 62608 > > URL: http://llvm.org/viewvc/llvm-project?rev=62608&view=rev > Log: > Add LLVM LOCAL tags to avoid having this be > stomped on again. > Thanks! -bw From sabre at nondot.org Tue Jan 20 15:15:52 2009 From: sabre at nondot.org (Chris Lattner) Date: Tue, 20 Jan 2009 15:15:52 -0600 Subject: [llvm-commits] CVS: llvm-www/www-index.html Message-ID: <200901202115.n0KLFqHK000812@zion.cs.uiuc.edu> Changes in directory llvm-www: www-index.html updated: 1.171 -> 1.172 --- Log message: stacker doc doesn't exist: PR3362: http://llvm.org/PR3362 --- Diffs of the changes: (+1 -1) www-index.html | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) Index: llvm-www/www-index.html diff -u llvm-www/www-index.html:1.171 llvm-www/www-index.html:1.172 --- llvm-www/www-index.html:1.171 Fri Dec 26 18:01:27 2008 +++ llvm-www/www-index.html Tue Jan 20 15:14:50 2009 @@ -52,7 +52,7 @@ language-independent analyses and optimizations of all sorts, including those that require extensive interprocedural analysis. LLVM is also a great target for front-end development for conventional or research +href="http://clang.llvm.org/">front-end development for conventional or research programming languages, including those which require compile-time, link-time, or run-time optimization for effective implementation, proper tail calls or garbage From sabre at nondot.org Tue Jan 20 15:17:11 2009 From: sabre at nondot.org (Chris Lattner) Date: Tue, 20 Jan 2009 15:17:11 -0600 Subject: [llvm-commits] CVS: llvm-www/demo/index.cgi Message-ID: <200901202117.n0KLHBrg000912@zion.cs.uiuc.edu> Changes in directory llvm-www/demo: index.cgi updated: 1.90 -> 1.91 --- Log message: stkrc is gone. --- Diffs of the changes: (+5 -15) index.cgi | 20 +++++--------------- 1 files changed, 5 insertions(+), 15 deletions(-) Index: llvm-www/demo/index.cgi diff -u llvm-www/demo/index.cgi:1.90 llvm-www/demo/index.cgi:1.91 --- llvm-www/demo/index.cgi:1.90 Mon Nov 10 00:48:14 2008 +++ llvm-www/demo/index.cgi Tue Jan 20 15:16:49 2009 @@ -295,7 +295,6 @@ 'JO99' => '.jo9', 'C' => '.c', 'C++' => '.cc', - 'Stacker' => '.st', 'preprocessed C' => '.i', 'preprocessed C++' => '.ii' ); @@ -306,8 +305,7 @@ '.i' => 'preprocessed C', '.ii' => 'preprocessed C++', '.cc' => 'C++', - '.cpp' => 'C++', - '.st' => 'Stacker' + '.cpp' => 'C++' ); my $uploaded_file_name = $c->param('uploaded_file'); @@ -352,20 +350,12 @@ my $timerFile = getname(".llvm-gcc.time"); my $stats = ''; - if ( $extension eq ".st" ) { - $stats = "-stats -time-passes " + #$stats = "-Wa,--stats,--time-passes,--info-output-file=$timerFile" + $stats = "-ftime-report" if ( $c->param('showstats') ); - try_run( "llvm Stacker front-end (stkrc)", - "stkrc $stats -o $bytecodeFile $inputFile > $outputFile 2>&1", - $outputFile ); - } else { - #$stats = "-Wa,--stats,--time-passes,--info-output-file=$timerFile" - $stats = "-ftime-report" - if ( $c->param('showstats') ); - try_run( "llvm C/C++ front-end (llvm-gcc)", + try_run( "llvm C/C++ front-end (llvm-gcc)", "llvm-gcc -emit-llvm -W -Wall -O2 $stats -o $bytecodeFile -c $inputFile > $outputFile 2>&1", - $outputFile ); - } + $outputFile ); if ( $c->param('showstats') && -s $timerFile ) { my ( $UnhilightedResult, $HtmlResult ) = From isanbard at gmail.com Tue Jan 20 15:17:59 2009 From: isanbard at gmail.com (Bill Wendling) Date: Tue, 20 Jan 2009 21:17:59 -0000 Subject: [llvm-commits] [llvm] r62615 - /llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp Message-ID: <200901202117.n0KLHxM5000960@zion.cs.uiuc.edu> Author: void Date: Tue Jan 20 15:17:57 2009 New Revision: 62615 URL: http://llvm.org/viewvc/llvm-project?rev=62615&view=rev Log: Use "SINT_TO_FP" instead of "UINT_TO_FP" when getting the exponent. This was causing the limited precision stuff to produce the wrong result for values in the range [0, 1). 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=62615&r1=62614&r2=62615&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp Tue Jan 20 15:17:57 2009 @@ -2945,26 +2945,27 @@ /// where Op is the hexidecimal representation of floating point value. static SDValue GetSignificand(SelectionDAG &DAG, SDValue Op) { - SDValue t1 = DAG.getNode(ISD::AND, MVT::i32, Op, - DAG.getConstant(0x007fffff, MVT::i32)); - SDValue t2 = DAG.getNode(ISD::OR, MVT::i32, t1, - DAG.getConstant(0x3f800000, MVT::i32)); - return DAG.getNode(ISD::BIT_CONVERT, MVT::f32, t2); + SDValue t1 = DAG.getNode(ISD::AND, MVT::i32, Op, + DAG.getConstant(0x007fffff, MVT::i32)); + SDValue t2 = DAG.getNode(ISD::OR, MVT::i32, t1, + DAG.getConstant(0x3f800000, MVT::i32)); + return DAG.getNode(ISD::BIT_CONVERT, MVT::f32, t2); } /// GetExponent - Get the exponent: /// -/// (float)((Op1 >> 23) - 127); +/// (float)(int)(((Op & 0x7f800000) >> 23) - 127); /// /// where Op is the hexidecimal representation of floating point value. static SDValue GetExponent(SelectionDAG &DAG, SDValue Op, const TargetLowering &TLI) { - SDValue t1 = DAG.getNode(ISD::SRL, MVT::i32, Op, - DAG.getConstant(23, TLI.getShiftAmountTy())); - SDValue t2 = DAG.getNode(ISD::SUB, MVT::i32, t1, - DAG.getConstant(127, MVT::i32)); - // SDValue t3 = DAG.getNode(ISD::BIT_CONVERT, MVT::i32, t2); - return DAG.getNode(ISD::UINT_TO_FP, MVT::f32, t2); + SDValue t0 = DAG.getNode(ISD::AND, MVT::i32, Op, + DAG.getConstant(0x7f800000, MVT::i32)); + SDValue t1 = DAG.getNode(ISD::SRL, MVT::i32, t0, + DAG.getConstant(23, TLI.getShiftAmountTy())); + SDValue t2 = DAG.getNode(ISD::SUB, MVT::i32, t1, + DAG.getConstant(127, MVT::i32)); + return DAG.getNode(ISD::SINT_TO_FP, MVT::f32, t2); } /// getF32Constant - Get 32-bit floating point constant. From baldrick at free.fr Tue Jan 20 15:20:23 2009 From: baldrick at free.fr (Duncan Sands) Date: Tue, 20 Jan 2009 21:20:23 -0000 Subject: [llvm-commits] [llvm] r62616 - /llvm/trunk/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp Message-ID: <200901202120.n0KLKN1g001046@zion.cs.uiuc.edu> Author: baldrick Date: Tue Jan 20 15:20:23 2009 New Revision: 62616 URL: http://llvm.org/viewvc/llvm-project?rev=62616&view=rev Log: Fix typo. Patch by Alexei Svitkine. Modified: llvm/trunk/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp Modified: llvm/trunk/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp?rev=62616&r1=62615&r2=62616&view=diff ============================================================================== --- llvm/trunk/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp (original) +++ llvm/trunk/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp Tue Jan 20 15:20:23 2009 @@ -149,7 +149,7 @@ } case Type::FloatTyID: { float *FloatPtr = (float *) ArgDataPtr; - *FloatPtr = AV.DoubleVal; + *FloatPtr = AV.FloatVal; return ArgDataPtr; } case Type::DoubleTyID: { From baldrick at free.fr Tue Jan 20 15:21:06 2009 From: baldrick at free.fr (Duncan Sands) Date: Tue, 20 Jan 2009 22:21:06 +0100 Subject: [llvm-commits] [llvm] r62553 - in /llvm/trunk: autoconf/configure.ac lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp In-Reply-To: <62d9ffc00901201038g733c93eep95339270e6ad36ea@mail.gmail.com> References: <62d9ffc00901201038g733c93eep95339270e6ad36ea@mail.gmail.com> Message-ID: <200901202221.09481.baldrick@free.fr> On Tuesday 20 January 2009 19:38:16 Alexei Svitkine wrote: > I just realised I made a small typo in the patch. > > Line 152 of ExternalFunctions.cpp should be: > > *FloatPtr = AV.FloatVal; > > instead of: > > *FloatPtr = AV.DoubleVal; > > Someone please fix this. Thanks! Done (r62616). Thanks for the fix! Ciao, Duncan. From evan.cheng at apple.com Tue Jan 20 15:25:12 2009 From: evan.cheng at apple.com (Evan Cheng) Date: Tue, 20 Jan 2009 21:25:12 -0000 Subject: [llvm-commits] [llvm] r62617 - in /llvm/trunk: include/llvm/CodeGen/LiveVariables.h lib/CodeGen/LiveVariables.cpp test/CodeGen/X86/pr3243.ll Message-ID: <200901202125.n0KLPDJx001194@zion.cs.uiuc.edu> Author: evancheng Date: Tue Jan 20 15:25:12 2009 New Revision: 62617 URL: http://llvm.org/viewvc/llvm-project?rev=62617&view=rev Log: Fix PR3243: a LiveVariables bug. When HandlePhysRegKill is checking whether the last reference is also the last def (i.e. dead def), it should also check if last reference is the current machine instruction being processed. This can happen when it is processing a physical register use and setting the current machine instruction as sub-register's last ref. Added: llvm/trunk/test/CodeGen/X86/pr3243.ll Modified: llvm/trunk/include/llvm/CodeGen/LiveVariables.h llvm/trunk/lib/CodeGen/LiveVariables.cpp Modified: llvm/trunk/include/llvm/CodeGen/LiveVariables.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/LiveVariables.h?rev=62617&r1=62616&r2=62617&view=diff ============================================================================== --- llvm/trunk/include/llvm/CodeGen/LiveVariables.h (original) +++ llvm/trunk/include/llvm/CodeGen/LiveVariables.h Tue Jan 20 15:25:12 2009 @@ -146,7 +146,7 @@ /// HandlePhysRegKill - Add kills of Reg and its sub-registers to the /// uses. Pay special attention to the sub-register uses which may come below /// the last use of the whole register. - bool HandlePhysRegKill(unsigned Reg); + bool HandlePhysRegKill(unsigned Reg, MachineInstr *MI); void HandlePhysRegUse(unsigned Reg, MachineInstr *MI); void HandlePhysRegDef(unsigned Reg, MachineInstr *MI); Modified: llvm/trunk/lib/CodeGen/LiveVariables.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/LiveVariables.cpp?rev=62617&r1=62616&r2=62617&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/LiveVariables.cpp (original) +++ llvm/trunk/lib/CodeGen/LiveVariables.cpp Tue Jan 20 15:25:12 2009 @@ -335,7 +335,7 @@ return true; } -bool LiveVariables::HandlePhysRegKill(unsigned Reg) { +bool LiveVariables::HandlePhysRegKill(unsigned Reg, MachineInstr *MI) { if (!PhysRegUse[Reg] && !PhysRegDef[Reg]) return false; @@ -373,8 +373,10 @@ } } } - if (LastRefOrPartRef == PhysRegDef[Reg]) - // Not used at all. + + if (LastRefOrPartRef == PhysRegDef[Reg] && LastRefOrPartRef != MI) + // If the last reference is the last def, then it's not used at all. + // That is, unless we are currently processing the last reference itself. LastRefOrPartRef->addRegisterDead(Reg, TRI, true); /* Partial uses. Mark register def dead and add implicit def of @@ -427,14 +429,14 @@ // Start from the largest piece, find the last time any part of the register // is referenced. - if (!HandlePhysRegKill(Reg)) { + if (!HandlePhysRegKill(Reg, MI)) { // Only some of the sub-registers are used. for (const unsigned *SubRegs = TRI->getSubRegisters(Reg); unsigned SubReg = *SubRegs; ++SubRegs) { if (!Live.count(SubReg)) // Skip if this sub-register isn't defined. continue; - if (HandlePhysRegKill(SubReg)) { + if (HandlePhysRegKill(SubReg, MI)) { Live.erase(SubReg); for (const unsigned *SS = TRI->getSubRegisters(SubReg); *SS; ++SS) Live.erase(*SS); @@ -475,7 +477,7 @@ } } else { // Otherwise, the super register is killed. - if (HandlePhysRegKill(SuperReg)) { + if (HandlePhysRegKill(SuperReg, MI)) { PhysRegDef[SuperReg] = NULL; PhysRegUse[SuperReg] = NULL; for (const unsigned *SS = TRI->getSubRegisters(SuperReg); *SS; ++SS) { @@ -558,13 +560,13 @@ SmallVector DefRegs; for (unsigned i = 0; i != NumOperandsToProcess; ++i) { const MachineOperand &MO = MI->getOperand(i); - if (MO.isReg() && MO.getReg()) { - unsigned MOReg = MO.getReg(); - if (MO.isUse()) - UseRegs.push_back(MOReg); - if (MO.isDef()) - DefRegs.push_back(MOReg); - } + if (!MO.isReg() || MO.getReg() == 0) + continue; + unsigned MOReg = MO.getReg(); + if (MO.isUse()) + UseRegs.push_back(MOReg); + if (MO.isDef()) + DefRegs.push_back(MOReg); } // Process all uses. Added: llvm/trunk/test/CodeGen/X86/pr3243.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/pr3243.ll?rev=62617&view=auto ============================================================================== --- llvm/trunk/test/CodeGen/X86/pr3243.ll (added) +++ llvm/trunk/test/CodeGen/X86/pr3243.ll Tue Jan 20 15:25:12 2009 @@ -0,0 +1,15 @@ +; RUN: llvm-as < %s | llc -march=x86 +; PR3243 + +declare signext i16 @safe_mul_func_int16_t_s_s(i16 signext, i32) nounwind readnone optsize + +define i32 @func_120(i32 %p_121) nounwind optsize { +entry: + %0 = trunc i32 %p_121 to i16 ; [#uses=1] + %1 = urem i16 %0, -15461 ; [#uses=1] + %phitmp1 = trunc i16 %1 to i8 ; [#uses=1] + %phitmp2 = urem i8 %phitmp1, -1 ; [#uses=1] + %phitmp3 = zext i8 %phitmp2 to i16 ; [#uses=1] + %2 = tail call signext i16 @safe_mul_func_int16_t_s_s(i16 signext %phitmp3, i32 1) nounwind ; [#uses=0] + unreachable +} From isanbard at gmail.com Tue Jan 20 15:28:53 2009 From: isanbard at gmail.com (Bill Wendling) Date: Tue, 20 Jan 2009 13:28:53 -0800 Subject: [llvm-commits] [llvm] r62615 - /llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp In-Reply-To: <200901202117.n0KLHxM5000960@zion.cs.uiuc.edu> References: <200901202117.n0KLHxM5000960@zion.cs.uiuc.edu> Message-ID: <16e5fdf90901201328x6fc53e23l37755d917e263894@mail.gmail.com> On Tue, Jan 20, 2009 at 1:17 PM, Bill Wendling wrote: > Author: void > Date: Tue Jan 20 15:17:57 2009 > New Revision: 62615 > > URL: http://llvm.org/viewvc/llvm-project?rev=62615&view=rev > Log: > Use "SINT_TO_FP" instead of "UINT_TO_FP" when getting the exponent. This was > causing the limited precision stuff to produce the wrong result for values in > the range [0, 1). > > --- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp (original) > +++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp Tue Jan 20 15:17:57 2009 > /// GetExponent - Get the exponent: > /// > -/// (float)((Op1 >> 23) - 127); > +/// (float)(int)(((Op & 0x7f800000) >> 23) - 127); > /// > /// where Op is the hexidecimal representation of floating point value. > static SDValue > GetExponent(SelectionDAG &DAG, SDValue Op, const TargetLowering &TLI) { ... > - return DAG.getNode(ISD::UINT_TO_FP, MVT::f32, t2); > + return DAG.getNode(ISD::SINT_TO_FP, MVT::f32, t2); There were formatting changes, but this is the only "real" change to the code. -bw > } > > /// getF32Constant - Get 32-bit floating point constant. > > > _______________________________________________ > llvm-commits mailing list > llvm-commits at cs.uiuc.edu > http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits > From sabre at nondot.org Tue Jan 20 15:41:53 2009 From: sabre at nondot.org (Chris Lattner) Date: Tue, 20 Jan 2009 21:41:53 -0000 Subject: [llvm-commits] [llvm] r62619 - /llvm/trunk/test/CodeGen/Generic/2008-07-29-EHLabel.ll Message-ID: <200901202141.n0KLfrbH001793@zion.cs.uiuc.edu> Author: lattner Date: Tue Jan 20 15:41:53 2009 New Revision: 62619 URL: http://llvm.org/viewvc/llvm-project?rev=62619&view=rev Log: Don't bother running the assembler, we don't know that it will be configured for whatever llc defaults to. This fixes PR3363 Modified: llvm/trunk/test/CodeGen/Generic/2008-07-29-EHLabel.ll Modified: llvm/trunk/test/CodeGen/Generic/2008-07-29-EHLabel.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Generic/2008-07-29-EHLabel.ll?rev=62619&r1=62618&r2=62619&view=diff ============================================================================== --- llvm/trunk/test/CodeGen/Generic/2008-07-29-EHLabel.ll (original) +++ llvm/trunk/test/CodeGen/Generic/2008-07-29-EHLabel.ll Tue Jan 20 15:41:53 2009 @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -o - | as -o /dev/null +; RUN: llvm-as < %s | llc ; PR2609 %struct..0._11 = type { i32 } %struct..1__pthread_mutex_s = type { i32, i32, i32, i32, i32, %struct..0._11 } From baldrick at free.fr Tue Jan 20 15:44:31 2009 From: baldrick at free.fr (Duncan Sands) Date: Tue, 20 Jan 2009 22:44:31 +0100 Subject: [llvm-commits] [llvm] r62619 - /llvm/trunk/test/CodeGen/Generic/2008-07-29-EHLabel.ll In-Reply-To: <200901202141.n0KLfrbH001793@zion.cs.uiuc.edu> References: <200901202141.n0KLfrbH001793@zion.cs.uiuc.edu> Message-ID: <200901202244.32163.baldrick@free.fr> Hi Chris, > Don't bother running the assembler, we don't know that it will be configured > for whatever llc defaults to. This fixes PR3363 the whole point of this testcase is to run the assembler! The original bug resulted in assembler being output that didn't assemble. Ciao, Duncan. From dalej at apple.com Tue Jan 20 15:58:13 2009 From: dalej at apple.com (Dale Johannesen) Date: Tue, 20 Jan 2009 21:58:13 -0000 Subject: [llvm-commits] [llvm] r62622 - /llvm/trunk/test/Transforms/InstCombine/2009-01-19-fmod-constant-float.ll Message-ID: <200901202158.n0KLwDIX002452@zion.cs.uiuc.edu> Author: johannes Date: Tue Jan 20 15:58:13 2009 New Revision: 62622 URL: http://llvm.org/viewvc/llvm-project?rev=62622&view=rev Log: Calls to fmod, it turns out, are constant-folded by invoking the host fmod, not by lowering to frem and constant-folding that. Fix this so it tests what I want to test. Modified: llvm/trunk/test/Transforms/InstCombine/2009-01-19-fmod-constant-float.ll Modified: llvm/trunk/test/Transforms/InstCombine/2009-01-19-fmod-constant-float.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/2009-01-19-fmod-constant-float.ll?rev=62622&r1=62621&r2=62622&view=diff ============================================================================== --- llvm/trunk/test/Transforms/InstCombine/2009-01-19-fmod-constant-float.ll (original) +++ llvm/trunk/test/Transforms/InstCombine/2009-01-19-fmod-constant-float.ll Tue Jan 20 15:58:13 2009 @@ -11,7 +11,7 @@ %retval = alloca float ; [#uses=2] %0 = alloca float ; [#uses=2] %"alloca point" = bitcast i32 0 to i32 ; [#uses=0] - %1 = call double @fmod(double 1.000000e-01, double 1.000000e+00) nounwind readonly ; [#uses=1] + %1 = frem double 1.000000e-01, 1.000000e+00 ; [#uses=1] %2 = fptrunc double %1 to float ; [#uses=1] store float %2, float* %0, align 4 %3 = load float* %0, align 4 ; [#uses=1] @@ -23,14 +23,12 @@ ret float %retval1 } -declare double @fmod(double, double) nounwind readonly - define float @test2() nounwind { entry: %retval = alloca float ; [#uses=2] %0 = alloca float ; [#uses=2] %"alloca point" = bitcast i32 0 to i32 ; [#uses=0] - %1 = call double @fmod(double -1.000000e-01, double 1.000000e+00) nounwind readonly ; [#uses=1] + %1 = frem double -1.000000e-01, 1.000000e+00 ; [#uses=1] %2 = fptrunc double %1 to float ; [#uses=1] store float %2, float* %0, align 4 %3 = load float* %0, align 4 ; [#uses=1] @@ -47,7 +45,7 @@ %retval = alloca float ; [#uses=2] %0 = alloca float ; [#uses=2] %"alloca point" = bitcast i32 0 to i32 ; [#uses=0] - %1 = call double @fmod(double 1.000000e-01, double -1.000000e+00) nounwind readonly ; [#uses=1] + %1 = frem double 1.000000e-01, -1.000000e+00 ; [#uses=1] %2 = fptrunc double %1 to float ; [#uses=1] store float %2, float* %0, align 4 %3 = load float* %0, align 4 ; [#uses=1] @@ -64,7 +62,7 @@ %retval = alloca float ; [#uses=2] %0 = alloca float ; [#uses=2] %"alloca point" = bitcast i32 0 to i32 ; [#uses=0] - %1 = call double @fmod(double -1.000000e-01, double -1.000000e+00) nounwind readonly ; [#uses=1] + %1 = frem double -1.000000e-01, -1.000000e+00 ; [#uses=1] %2 = fptrunc double %1 to float ; [#uses=1] store float %2, float* %0, align 4 %3 = load float* %0, align 4 ; [#uses=1] From dpatel at apple.com Tue Jan 20 16:26:11 2009 From: dpatel at apple.com (Devang Patel) Date: Tue, 20 Jan 2009 22:26:11 -0000 Subject: [llvm-commits] [llvm] r62624 - /llvm/trunk/test/DebugInfo/globalGetElementPtr.ll Message-ID: <200901202226.n0KMQBk1003527@zion.cs.uiuc.edu> Author: dpatel Date: Tue Jan 20 16:26:11 2009 New Revision: 62624 URL: http://llvm.org/viewvc/llvm-project?rev=62624&view=rev Log: Need compile unit to find location. Modified: llvm/trunk/test/DebugInfo/globalGetElementPtr.ll Modified: llvm/trunk/test/DebugInfo/globalGetElementPtr.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/globalGetElementPtr.ll?rev=62624&r1=62623&r2=62624&view=diff ============================================================================== --- llvm/trunk/test/DebugInfo/globalGetElementPtr.ll (original) +++ llvm/trunk/test/DebugInfo/globalGetElementPtr.ll Tue Jan 20 16:26:11 2009 @@ -121,7 +121,7 @@ i32 393217, %struct.anon* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to %struct.anon*), i8* null, - %struct.anon* null, + %struct.anon* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to %struct.anon*), i32 0, i64 0, i64 8, @@ -158,7 +158,7 @@ i32 393217, %struct.anon* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to %struct.anon*), i8* null, - %struct.anon* null, + %struct.anon* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to %struct.anon*), i32 0, i64 0, i64 8, From dpatel at apple.com Tue Jan 20 16:27:02 2009 From: dpatel at apple.com (Devang Patel) Date: Tue, 20 Jan 2009 22:27:02 -0000 Subject: [llvm-commits] [llvm] r62625 - in /llvm/trunk: include/llvm/Analysis/DebugInfo.h lib/CodeGen/AsmPrinter/DwarfWriter.cpp test/DebugInfo/forwardDecl.ll Message-ID: <200901202227.n0KMR2Up003583@zion.cs.uiuc.edu> Author: dpatel Date: Tue Jan 20 16:27:02 2009 New Revision: 62625 URL: http://llvm.org/viewvc/llvm-project?rev=62625&view=rev Log: Appropriately mark fowrad decls. Modified: llvm/trunk/include/llvm/Analysis/DebugInfo.h llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp llvm/trunk/test/DebugInfo/forwardDecl.ll Modified: llvm/trunk/include/llvm/Analysis/DebugInfo.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Analysis/DebugInfo.h?rev=62625&r1=62624&r2=62625&view=diff ============================================================================== --- llvm/trunk/include/llvm/Analysis/DebugInfo.h (original) +++ llvm/trunk/include/llvm/Analysis/DebugInfo.h Tue Jan 20 16:27:02 2009 @@ -129,6 +129,13 @@ /// FIXME: Types should be factored much better so that CV qualifiers and /// others do not require a huge and empty descriptor full of zeros. class DIType : public DIDescriptor { + public: + enum { + FlagPrivate = 1 << 0, + FlagProtected = 1 << 1, + FlagFwdDecl = 1 << 2 + }; + protected: DIType(GlobalVariable *GV, unsigned Tag) : DIDescriptor(GV, Tag) {} // This ctor is used when the Tag has already been validated by a derived @@ -167,6 +174,9 @@ // carry this is just plain insane. uint64_t getOffsetInBits() const { return getUInt64Field(7); } unsigned getFlags() const { return getUnsignedField(8); } + bool isPrivate() const { return (getFlags() & FlagPrivate) != 0; } + bool isProtected() const { return (getFlags() & FlagProtected) != 0; } + bool isForwardDecl() const { return (getFlags() & FlagFwdDecl) != 0; } virtual std::string getFilename() const { assert (0 && "Invalid DIDescriptor"); Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp?rev=62625&r1=62624&r2=62625&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp (original) +++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp Tue Jan 20 16:27:02 2009 @@ -1820,19 +1820,16 @@ if (Size) AddUInt(&Buffer, DW_AT_byte_size, 0, Size); else { - // Add zero size even if it is not a forward declaration. - // FIXME - Enable this. - // if (!CTy.isDefinition()) - // AddUInt(&Buffer, DW_AT_declaration, DW_FORM_flag, 1); - // else - // AddUInt(&Buffer, DW_AT_byte_size, 0, 0); + // Add zero size if it is not a forward declaration. + if (CTy.isForwardDecl()) + AddUInt(&Buffer, DW_AT_declaration, DW_FORM_flag, 1); + else + AddUInt(&Buffer, DW_AT_byte_size, 0, 0); } - // Add source line info if available and TyDesc is not a forward - // declaration. - // FIXME - Enable this. - // if (CTy.isForwardDecl()) - // AddSourceLine(&Buffer, *CTy); + // Add source line info if available. + if (!CTy.isForwardDecl()) + AddSourceLine(&Buffer, &CTy); } // ConstructSubrangeDIE - Construct subrange DIE from DISubrange. Modified: llvm/trunk/test/DebugInfo/forwardDecl.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/forwardDecl.ll?rev=62625&r1=62624&r2=62625&view=diff ============================================================================== --- llvm/trunk/test/DebugInfo/forwardDecl.ll (original) +++ llvm/trunk/test/DebugInfo/forwardDecl.ll Tue Jan 20 16:27:02 2009 @@ -1,5 +1,4 @@ ; RUN: llvm-as < %s | llc | %prcontext ST 1 | grep 0x1 | count 1 -; XFAIL: * target triple = "i386-apple-darwin9.6" %llvm.dbg.anchor.type = type { i32, i32 } From isanbard at gmail.com Tue Jan 20 17:25:26 2009 From: isanbard at gmail.com (Bill Wendling) Date: Tue, 20 Jan 2009 23:25:26 -0000 Subject: [llvm-commits] [llvm-gcc-4.2] r62635 - in /llvm-gcc-4.2/trunk/gcc: c-common.c c-common.h c-opts.c c.opt config/i386/darwin.h config/rs6000/darwin.h Message-ID: <200901202325.n0KNPQJM005624@zion.cs.uiuc.edu> Author: void Date: Tue Jan 20 17:25:25 2009 New Revision: 62635 URL: http://llvm.org/viewvc/llvm-project?rev=62635&view=rev Log: Reapply Wformat* merge patch with a hack not to print out the warning unless the warn_format_security flag is actually set. I tested this on Linux and it compiled with no problems. This patch was good for the Fortran FE. It should also fix a problem where -Wformat-security used to be enabled for ARM, but not anymore. Modified: llvm-gcc-4.2/trunk/gcc/c-common.c llvm-gcc-4.2/trunk/gcc/c-common.h llvm-gcc-4.2/trunk/gcc/c-opts.c llvm-gcc-4.2/trunk/gcc/c.opt llvm-gcc-4.2/trunk/gcc/config/i386/darwin.h llvm-gcc-4.2/trunk/gcc/config/rs6000/darwin.h Modified: llvm-gcc-4.2/trunk/gcc/c-common.c URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/c-common.c?rev=62635&r1=62634&r2=62635&view=diff ============================================================================== --- llvm-gcc-4.2/trunk/gcc/c-common.c (original) +++ llvm-gcc-4.2/trunk/gcc/c-common.c Tue Jan 20 17:25:25 2009 @@ -294,7 +294,21 @@ int warn_unknown_pragmas; /* Tri state variable. */ -/* LLVM LOCAL no definition of warn_format or warn_format_security. */ +/* Warn about format/argument anomalies in calls to formatted I/O functions + (*printf, *scanf, strftime, strfmon, etc.). */ + +/* APPLE LOCAL begin default to Wformat-security 5764921 */ +/* LLVM LOCAL begin initialize via config/darwin.h */ +#ifndef WARN_FORMAT_INIT +#define WARN_FORMAT_INIT 0 +#endif +#ifndef WARN_FORMAT_SECURITY_INIT +#define WARN_FORMAT_SECURITY_INIT 0 +#endif +int warn_format = WARN_FORMAT_INIT; +int warn_format_security = WARN_FORMAT_SECURITY_INIT; +/* LLVM LOCAL end initialize via config/darwin.h */ +/* APPLE LOCAL end default to Wformat-security 5764921 */ /* Warn about using __null (as NULL in C++) as sentinel. For code compiled with GCC this doesn't matter as __null is guaranteed to have the right Modified: llvm-gcc-4.2/trunk/gcc/c-common.h URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/c-common.h?rev=62635&r1=62634&r2=62635&view=diff ============================================================================== --- llvm-gcc-4.2/trunk/gcc/c-common.h (original) +++ llvm-gcc-4.2/trunk/gcc/c-common.h Tue Jan 20 17:25:25 2009 @@ -461,7 +461,16 @@ extern int warn_unknown_pragmas; /* Tri state variable. */ -/* LLVM LOCAL no decl of warn_format or warn_format_security. */ +/* Warn about format/argument anomalies in calls to formatted I/O functions + (*printf, *scanf, strftime, strfmon, etc.). */ + +extern int warn_format; + +/* LLVM LOCAL begin */ +/* Warn about possible security problems with format functions */ + +extern int warn_format_security; +/* LLVM LOCAL end */ /* APPLE LOCAL begin disable_typechecking_for_spec_flag */ /* This makes type conflicts a warning, instead of an error, Modified: llvm-gcc-4.2/trunk/gcc/c-opts.c URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/c-opts.c?rev=62635&r1=62634&r2=62635&view=diff ============================================================================== --- llvm-gcc-4.2/trunk/gcc/c-opts.c (original) +++ llvm-gcc-4.2/trunk/gcc/c-opts.c Tue Jan 20 17:25:25 2009 @@ -1187,8 +1187,11 @@ "-Wformat-zero-length ignored without -Wformat"); warning (OPT_Wformat_nonliteral, "-Wformat-nonliteral ignored without -Wformat"); - warning (OPT_Wformat_security, - "-Wformat-security ignored without -Wformat"); + /* LLVM LOCAL begin */ + if (warn_format_security) + warning (OPT_Wformat_security, + "-Wformat-security ignored without -Wformat"); + /* LLVM LOCAL end */ } /* C99 requires special handling of complex multiplication and division; Modified: llvm-gcc-4.2/trunk/gcc/c.opt URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/c.opt?rev=62635&r1=62634&r2=62635&view=diff ============================================================================== --- llvm-gcc-4.2/trunk/gcc/c.opt (original) +++ llvm-gcc-4.2/trunk/gcc/c.opt Tue Jan 20 17:25:25 2009 @@ -224,11 +224,9 @@ C ObjC C++ ObjC++ Var(warn_float_equal) Warn if testing floating point numbers for equality -; LLVM LOCAL begin keep "Var(warn_format) Warning" Wformat -C ObjC C++ ObjC++ Var(warn_format) Warning +C ObjC C++ ObjC++ Warn about printf/scanf/strftime/strfmon format string anomalies -; LLVM LOCAL end keep "Var(warn_format) Warning" Wformat-extra-args C ObjC C++ ObjC++ Var(warn_format_extra_args) @@ -239,11 +237,11 @@ Warn about format strings that are not literals ; APPLE LOCAL begin default to Wformat-security 5764921 -; LLVM LOCAL begin keep "Var(warn_format_security)" +; LLVM LOCAL begin don't initialize this Wformat-security -C ObjC C++ ObjC++ Var(warn_format_security) +C ObjC C++ ObjC++ Warn about possible security problems with format functions -; LLVM LOCAL endkeep "Var(warn_format_security)" +; LLVM LOCAL end don't initialize this ; APPLE LOCAL end default to Wformat-security 5764921 Wformat-y2k Modified: llvm-gcc-4.2/trunk/gcc/config/i386/darwin.h URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config/i386/darwin.h?rev=62635&r1=62634&r2=62635&view=diff ============================================================================== --- llvm-gcc-4.2/trunk/gcc/config/i386/darwin.h (original) +++ llvm-gcc-4.2/trunk/gcc/config/i386/darwin.h Tue Jan 20 17:25:25 2009 @@ -100,9 +100,6 @@ "/* APPLE LOCAL ARM 5683689 */"\ %{!mmacosx-version-min=*: %{!miphoneos-version-min=*: %(darwin_cc1_minversion)}} \ "/* APPLE LOCAL ignore -mcpu=G4 -mcpu=G5 */"\ - "/* LLVM LOCAL enable format security warnings */" \ - %{!Wno-format:-Wformat} \ - %{!Wno-format-security:-Wformat-security} \ % References: <200901202141.n0KLfrbH001793@zion.cs.uiuc.edu> <200901202244.32163.baldrick@free.fr> Message-ID: <98813538-E26C-4F70-A5E7-5741EA7D1736@apple.com> On Jan 20, 2009, at 1:44 PMPST, Duncan Sands wrote: > Hi Chris, > >> Don't bother running the assembler, we don't know that it will be >> configured >> for whatever llc defaults to. This fixes PR3363 > > the whole point of this testcase is to run the assembler! The > original > bug resulted in assembler being output that didn't assemble. > > Ciao, > > Duncan. Right, if can't fix it better than this we should remove the test. I don't think it's unreasonable to assume there's an assembler around capable of assembling llc's output. If it isn't named "as" everywhere, maybe the thing is to add a configure option to define it. From dpatel at apple.com Tue Jan 20 18:08:04 2009 From: dpatel at apple.com (Devang Patel) Date: Wed, 21 Jan 2009 00:08:04 -0000 Subject: [llvm-commits] [llvm] r62638 - in /llvm/trunk: include/llvm/Analysis/DebugInfo.h lib/CodeGen/AsmPrinter/DwarfWriter.cpp Message-ID: <200901210008.n0L085w1007092@zion.cs.uiuc.edu> Author: dpatel Date: Tue Jan 20 18:08:04 2009 New Revision: 62638 URL: http://llvm.org/viewvc/llvm-project?rev=62638&view=rev Log: Encode member accessibility. Modified: llvm/trunk/include/llvm/Analysis/DebugInfo.h llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp Modified: llvm/trunk/include/llvm/Analysis/DebugInfo.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Analysis/DebugInfo.h?rev=62638&r1=62637&r2=62638&view=diff ============================================================================== --- llvm/trunk/include/llvm/Analysis/DebugInfo.h (original) +++ llvm/trunk/include/llvm/Analysis/DebugInfo.h Tue Jan 20 18:08:04 2009 @@ -133,7 +133,7 @@ enum { FlagPrivate = 1 << 0, FlagProtected = 1 << 1, - FlagFwdDecl = 1 << 2 + FlagFwdDecl = 1 << 2 }; protected: Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp?rev=62638&r1=62637&r2=62638&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp (original) +++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp Tue Jan 20 18:08:04 2009 @@ -1913,7 +1913,11 @@ AddUInt(Block, 0, DW_FORM_udata, DT.getOffsetInBits() >> 3); AddBlock(MemberDie, DW_AT_data_member_location, 0, Block); - // FIXME - Handle DW_AT_accessibility + if (DT.isProtected()) + AddUInt(MemberDie, DW_AT_accessibility, 0, DW_ACCESS_protected); + else if (DT.isPrivate()) + AddUInt(MemberDie, DW_AT_accessibility, 0, DW_ACCESS_private); + return MemberDie; } From resistor at mac.com Tue Jan 20 18:13:28 2009 From: resistor at mac.com (Owen Anderson) Date: Wed, 21 Jan 2009 00:13:28 -0000 Subject: [llvm-commits] [llvm] r62639 - in /llvm/trunk: lib/CodeGen/PreAllocSplitting.cpp test/CodeGen/X86/pre-split2.ll Message-ID: <200901210013.n0L0DSVC007288@zion.cs.uiuc.edu> Author: resistor Date: Tue Jan 20 18:13:28 2009 New Revision: 62639 URL: http://llvm.org/viewvc/llvm-project?rev=62639&view=rev Log: Be more aggressive about renumbering vregs after splitting them. Modified: llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp llvm/trunk/test/CodeGen/X86/pre-split2.ll Modified: llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp?rev=62639&r1=62638&r2=62639&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp (original) +++ llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp Tue Jan 20 18:13:28 2009 @@ -1127,9 +1127,11 @@ LIs->InsertMachineInstrInMaps(prior(RestorePt), RestoreIdx); if (KillPt->getParent() == BarrierMBB) { - UpdateRegisterInterval(ValNo, LIs->getUseIndex(KillIdx)+1, + VNInfo* After = UpdateRegisterInterval(ValNo, LIs->getUseIndex(KillIdx)+1, LIs->getDefIndex(RestoreIdx)); + RenumberValno(After); + ++NumSplits; ++NumRemats; return true; @@ -1312,9 +1314,11 @@ UpdateSpillSlotInterval(ValNo, LIs->getUseIndex(SpillIndex)+1, LIs->getDefIndex(RestoreIndex)); - UpdateRegisterInterval(ValNo, LIs->getUseIndex(SpillIndex)+1, + VNInfo* After = UpdateRegisterInterval(ValNo, + LIs->getUseIndex(SpillIndex)+1, LIs->getDefIndex(RestoreIndex)); - + RenumberValno(After); + ++NumSplits; return true; } Modified: llvm/trunk/test/CodeGen/X86/pre-split2.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/pre-split2.ll?rev=62639&r1=62638&r2=62639&view=diff ============================================================================== --- llvm/trunk/test/CodeGen/X86/pre-split2.ll (original) +++ llvm/trunk/test/CodeGen/X86/pre-split2.ll Tue Jan 20 18:13:28 2009 @@ -1,5 +1,5 @@ ; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 -pre-alloc-split -stats |& \ -; RUN: grep {pre-alloc-split} | count 2 +; RUN: grep {pre-alloc-split} | count 3 define i32 @t() { entry: From dalej at apple.com Tue Jan 20 18:35:19 2009 From: dalej at apple.com (Dale Johannesen) Date: Wed, 21 Jan 2009 00:35:19 -0000 Subject: [llvm-commits] [llvm] r62645 - in /llvm/trunk: include/llvm/ADT/APFloat.h lib/Support/APFloat.cpp lib/Transforms/Scalar/InstructionCombining.cpp lib/VMCore/ConstantFold.cpp test/Transforms/InstCombine/2009-01-19-fmod-constant-float-specials.ll Message-ID: <200901210035.n0L0ZKU8008095@zion.cs.uiuc.edu> Author: johannes Date: Tue Jan 20 18:35:19 2009 New Revision: 62645 URL: http://llvm.org/viewvc/llvm-project?rev=62645&view=rev Log: Make special cases (0 inf nan) work for frem. Besides APFloat, this involved removing code from two places that thought they knew the result of frem(0., x) but were wrong. Added: llvm/trunk/test/Transforms/InstCombine/2009-01-19-fmod-constant-float-specials.ll Modified: llvm/trunk/include/llvm/ADT/APFloat.h llvm/trunk/lib/Support/APFloat.cpp llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp llvm/trunk/lib/VMCore/ConstantFold.cpp Modified: llvm/trunk/include/llvm/ADT/APFloat.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ADT/APFloat.h?rev=62645&r1=62644&r2=62645&view=diff ============================================================================== --- llvm/trunk/include/llvm/ADT/APFloat.h (original) +++ llvm/trunk/include/llvm/ADT/APFloat.h Tue Jan 20 18:35:19 2009 @@ -293,6 +293,7 @@ opStatus addOrSubtractSpecials(const APFloat &, bool subtract); opStatus divideSpecials(const APFloat &); opStatus multiplySpecials(const APFloat &); + opStatus modSpecials(const APFloat &); /* Miscellany. */ void makeNaN(void); Modified: llvm/trunk/lib/Support/APFloat.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/APFloat.cpp?rev=62645&r1=62644&r2=62645&view=diff ============================================================================== --- llvm/trunk/lib/Support/APFloat.cpp (original) +++ llvm/trunk/lib/Support/APFloat.cpp Tue Jan 20 18:35:19 2009 @@ -1405,6 +1405,42 @@ } } +APFloat::opStatus +APFloat::modSpecials(const APFloat &rhs) +{ + switch(convolve(category, rhs.category)) { + default: + assert(0); + + case convolve(fcNaN, fcZero): + case convolve(fcNaN, fcNormal): + case convolve(fcNaN, fcInfinity): + case convolve(fcNaN, fcNaN): + case convolve(fcZero, fcInfinity): + case convolve(fcZero, fcNormal): + case convolve(fcNormal, fcInfinity): + return opOK; + + case convolve(fcZero, fcNaN): + case convolve(fcNormal, fcNaN): + case convolve(fcInfinity, fcNaN): + category = fcNaN; + copySignificand(rhs); + return opOK; + + case convolve(fcNormal, fcZero): + case convolve(fcInfinity, fcZero): + case convolve(fcInfinity, fcNormal): + case convolve(fcInfinity, fcInfinity): + case convolve(fcZero, fcZero): + makeNaN(); + return opInvalidOp; + + case convolve(fcNormal, fcNormal): + return opOK; + } +} + /* Change sign. */ void APFloat::changeSign() @@ -1557,35 +1593,39 @@ APFloat::mod(const APFloat &rhs, roundingMode rounding_mode) { opStatus fs; - APFloat V = *this; - unsigned int origSign = sign; - assertArithmeticOK(*semantics); - fs = V.divide(rhs, rmNearestTiesToEven); - if (fs == opDivByZero) - return fs; + fs = modSpecials(rhs); - int parts = partCount(); - integerPart *x = new integerPart[parts]; - bool ignored; - fs = V.convertToInteger(x, parts * integerPartWidth, true, - rmTowardZero, &ignored); - if (fs==opInvalidOp) - return fs; - - fs = V.convertFromZeroExtendedInteger(x, parts * integerPartWidth, true, - rmNearestTiesToEven); - assert(fs==opOK); // should always work - - fs = V.multiply(rhs, rounding_mode); - assert(fs==opOK || fs==opInexact); // should not overflow or underflow - - fs = subtract(V, rounding_mode); - assert(fs==opOK || fs==opInexact); // likewise - - if (isZero()) - sign = origSign; // IEEE754 requires this - delete[] x; + if (category == fcNormal && rhs.category == fcNormal) { + APFloat V = *this; + unsigned int origSign = sign; + + fs = V.divide(rhs, rmNearestTiesToEven); + if (fs == opDivByZero) + return fs; + + int parts = partCount(); + integerPart *x = new integerPart[parts]; + bool ignored; + fs = V.convertToInteger(x, parts * integerPartWidth, true, + rmTowardZero, &ignored); + if (fs==opInvalidOp) + return fs; + + fs = V.convertFromZeroExtendedInteger(x, parts * integerPartWidth, true, + rmNearestTiesToEven); + assert(fs==opOK); // should always work + + fs = V.multiply(rhs, rounding_mode); + assert(fs==opOK || fs==opInexact); // should not overflow or underflow + + fs = subtract(V, rounding_mode); + assert(fs==opOK || fs==opInexact); // likewise + + if (isZero()) + sign = origSign; // IEEE754 requires this + delete[] x; + } return fs; } Modified: llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp?rev=62645&r1=62644&r2=62645&view=diff ============================================================================== --- llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp (original) +++ llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp Tue Jan 20 18:35:19 2009 @@ -2954,11 +2954,6 @@ Instruction *InstCombiner::commonRemTransforms(BinaryOperator &I) { Value *Op0 = I.getOperand(0), *Op1 = I.getOperand(1); - // 0 % X == 0 for integer, we don't need to preserve faults! - if (Constant *LHS = dyn_cast(Op0)) - if (LHS->isNullValue()) - return ReplaceInstUsesWith(I, Constant::getNullValue(I.getType())); - if (isa(Op0)) { // undef % X -> 0 if (I.getType()->isFPOrFPVector()) return ReplaceInstUsesWith(I, Op0); // X % undef -> undef (could be SNaN) @@ -2984,6 +2979,11 @@ if (Instruction *common = commonRemTransforms(I)) return common; + // 0 % X == 0 for integer, we don't need to preserve faults! + if (Constant *LHS = dyn_cast(Op0)) + if (LHS->isNullValue()) + return ReplaceInstUsesWith(I, Constant::getNullValue(I.getType())); + if (ConstantInt *RHS = dyn_cast(Op1)) { // X % 0 == undef, we don't need to preserve faults! if (RHS->equalsInt(0)) Modified: llvm/trunk/lib/VMCore/ConstantFold.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/ConstantFold.cpp?rev=62645&r1=62644&r2=62645&view=diff ============================================================================== --- llvm/trunk/lib/VMCore/ConstantFold.cpp (original) +++ llvm/trunk/lib/VMCore/ConstantFold.cpp Tue Jan 20 18:35:19 2009 @@ -802,16 +802,6 @@ (void)C3V.divide(C2V, APFloat::rmNearestTiesToEven); return ConstantFP::get(C3V); case Instruction::FRem: - if (C2V.isZero()) { - // IEEE 754, Section 7.1, #5 - if (CFP1->getType() == Type::DoubleTy) - return ConstantFP::get(APFloat(std::numeric_limits:: - quiet_NaN())); - if (CFP1->getType() == Type::FloatTy) - return ConstantFP::get(APFloat(std::numeric_limits:: - quiet_NaN())); - break; - } (void)C3V.mod(C2V, APFloat::rmNearestTiesToEven); return ConstantFP::get(C3V); } Added: llvm/trunk/test/Transforms/InstCombine/2009-01-19-fmod-constant-float-specials.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/2009-01-19-fmod-constant-float-specials.ll?rev=62645&view=auto ============================================================================== --- llvm/trunk/test/Transforms/InstCombine/2009-01-19-fmod-constant-float-specials.ll (added) +++ llvm/trunk/test/Transforms/InstCombine/2009-01-19-fmod-constant-float-specials.ll Tue Jan 20 18:35:19 2009 @@ -0,0 +1,315 @@ +; RUN: llvm-as < %s | opt -simplifycfg -instcombine | llvm-dis | grep 0x7FF8000000000000 | count 7 +; RUN: llvm-as < %s | opt -simplifycfg -instcombine | llvm-dis | grep 0x7FF80000FFFFFFFF | count 5 +; RUN: llvm-as < %s | opt -simplifycfg -instcombine | llvm-dis | grep {0\\.0} | count 3 +; RUN: llvm-as < %s | opt -simplifycfg -instcombine | llvm-dis | grep {3\\.5} | count 1 + +; ModuleID = 'apf.c' +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:128:128" +target triple = "i386-apple-darwin9.6" +@"\01LC" = internal constant [4 x i8] c"%f\0A\00" ; <[4 x i8]*> [#uses=1] + +define void @foo1() nounwind { +entry: + %y = alloca float ; [#uses=2] + %x = alloca float ; [#uses=2] + %"alloca point" = bitcast i32 0 to i32 ; [#uses=0] + store float 0x7FF0000000000000, float* %x, align 4 + store float 0x7FF8000000000000, float* %y, align 4 + %0 = load float* %y, align 4 ; [#uses=1] + %1 = fpext float %0 to double ; [#uses=1] + %2 = load float* %x, align 4 ; [#uses=1] + %3 = fpext float %2 to double ; [#uses=1] + %4 = frem double %3, %1 ; [#uses=1] + %5 = call i32 (i8*, ...)* @printf(i8* getelementptr ([4 x i8]* @"\01LC", i32 0, i32 0), double %4) nounwind ; [#uses=0] + br label %return + +return: ; preds = %entry + ret void +} + +declare i32 @printf(i8*, ...) nounwind + +define void @foo2() nounwind { +entry: + %y = alloca float ; [#uses=2] + %x = alloca float ; [#uses=2] + %"alloca point" = bitcast i32 0 to i32 ; [#uses=0] + store float 0x7FF0000000000000, float* %x, align 4 + store float 0.000000e+00, float* %y, align 4 + %0 = load float* %y, align 4 ; [#uses=1] + %1 = fpext float %0 to double ; [#uses=1] + %2 = load float* %x, align 4 ; [#uses=1] + %3 = fpext float %2 to double ; [#uses=1] + %4 = frem double %3, %1 ; [#uses=1] + %5 = call i32 (i8*, ...)* @printf(i8* getelementptr ([4 x i8]* @"\01LC", i32 0, i32 0), double %4) nounwind ; [#uses=0] + br label %return + +return: ; preds = %entry + ret void +} + +define void @foo3() nounwind { +entry: + %y = alloca float ; [#uses=2] + %x = alloca float ; [#uses=2] + %"alloca point" = bitcast i32 0 to i32 ; [#uses=0] + store float 0x7FF0000000000000, float* %x, align 4 + store float 3.500000e+00, float* %y, align 4 + %0 = load float* %y, align 4 ; [#uses=1] + %1 = fpext float %0 to double ; [#uses=1] + %2 = load float* %x, align 4 ; [#uses=1] + %3 = fpext float %2 to double ; [#uses=1] + %4 = frem double %3, %1 ; [#uses=1] + %5 = call i32 (i8*, ...)* @printf(i8* getelementptr ([4 x i8]* @"\01LC", i32 0, i32 0), double %4) nounwind ; [#uses=0] + br label %return + +return: ; preds = %entry + ret void +} + +define void @foo4() nounwind { +entry: + %y = alloca float ; [#uses=2] + %x = alloca float ; [#uses=2] + %"alloca point" = bitcast i32 0 to i32 ; [#uses=0] + store float 0x7FF0000000000000, float* %x, align 4 + store float 0x7FF0000000000000, float* %y, align 4 + %0 = load float* %y, align 4 ; [#uses=1] + %1 = fpext float %0 to double ; [#uses=1] + %2 = load float* %x, align 4 ; [#uses=1] + %3 = fpext float %2 to double ; [#uses=1] + %4 = frem double %3, %1 ; [#uses=1] + %5 = call i32 (i8*, ...)* @printf(i8* getelementptr ([4 x i8]* @"\01LC", i32 0, i32 0), double %4) nounwind ; [#uses=0] + br label %return + +return: ; preds = %entry + ret void +} + +define void @foo5() nounwind { +entry: + %y = alloca float ; [#uses=2] + %x = alloca float ; [#uses=2] + %"alloca point" = bitcast i32 0 to i32 ; [#uses=0] + store float 0x7FF8000000000000, float* %x, align 4 + store float 0x7FF0000000000000, float* %y, align 4 + %0 = load float* %y, align 4 ; [#uses=1] + %1 = fpext float %0 to double ; [#uses=1] + %2 = load float* %x, align 4 ; [#uses=1] + %3 = fpext float %2 to double ; [#uses=1] + %4 = frem double %3, %1 ; [#uses=1] + %5 = call i32 (i8*, ...)* @printf(i8* getelementptr ([4 x i8]* @"\01LC", i32 0, i32 0), double %4) nounwind ; [#uses=0] + br label %return + +return: ; preds = %entry + ret void +} + +define void @foo6() nounwind { +entry: + %y = alloca float ; [#uses=2] + %x = alloca float ; [#uses=2] + %"alloca point" = bitcast i32 0 to i32 ; [#uses=0] + store float 0x7FF8000000000000, float* %x, align 4 + store float 0.000000e+00, float* %y, align 4 + %0 = load float* %y, align 4 ; [#uses=1] + %1 = fpext float %0 to double ; [#uses=1] + %2 = load float* %x, align 4 ; [#uses=1] + %3 = fpext float %2 to double ; [#uses=1] + %4 = frem double %3, %1 ; [#uses=1] + %5 = call i32 (i8*, ...)* @printf(i8* getelementptr ([4 x i8]* @"\01LC", i32 0, i32 0), double %4) nounwind ; [#uses=0] + br label %return + +return: ; preds = %entry + ret void +} + +define void @foo7() nounwind { +entry: + %y = alloca float ; [#uses=2] + %x = alloca float ; [#uses=2] + %"alloca point" = bitcast i32 0 to i32 ; [#uses=0] + store float 0x7FF8000000000000, float* %x, align 4 + store float 3.500000e+00, float* %y, align 4 + %0 = load float* %y, align 4 ; [#uses=1] + %1 = fpext float %0 to double ; [#uses=1] + %2 = load float* %x, align 4 ; [#uses=1] + %3 = fpext float %2 to double ; [#uses=1] + %4 = frem double %3, %1 ; [#uses=1] + %5 = call i32 (i8*, ...)* @printf(i8* getelementptr ([4 x i8]* @"\01LC", i32 0, i32 0), double %4) nounwind ; [#uses=0] + br label %return + +return: ; preds = %entry + ret void +} + +define void @foo8() nounwind { +entry: + %y = alloca float ; [#uses=2] + %x = alloca float ; [#uses=2] + %"alloca point" = bitcast i32 0 to i32 ; [#uses=0] + store float 0x7FF8000000000000, float* %x, align 4 + store float 0x7FF8000000000000, float* %y, align 4 + %0 = load float* %y, align 4 ; [#uses=1] + %1 = fpext float %0 to double ; [#uses=1] + %2 = load float* %x, align 4 ; [#uses=1] + %3 = fpext float %2 to double ; [#uses=1] + %4 = frem double %3, %1 ; [#uses=1] + %5 = call i32 (i8*, ...)* @printf(i8* getelementptr ([4 x i8]* @"\01LC", i32 0, i32 0), double %4) nounwind ; [#uses=0] + br label %return + +return: ; preds = %entry + ret void +} + +define void @foo9() nounwind { +entry: + %y = alloca float ; [#uses=2] + %x = alloca float ; [#uses=2] + %"alloca point" = bitcast i32 0 to i32 ; [#uses=0] + store float 0.000000e+00, float* %x, align 4 + store float 0x7FF8000000000000, float* %y, align 4 + %0 = load float* %y, align 4 ; [#uses=1] + %1 = fpext float %0 to double ; [#uses=1] + %2 = load float* %x, align 4 ; [#uses=1] + %3 = fpext float %2 to double ; [#uses=1] + %4 = frem double %3, %1 ; [#uses=1] + %5 = call i32 (i8*, ...)* @printf(i8* getelementptr ([4 x i8]* @"\01LC", i32 0, i32 0), double %4) nounwind ; [#uses=0] + br label %return + +return: ; preds = %entry + ret void +} + +define void @foo10() nounwind { +entry: + %y = alloca float ; [#uses=2] + %x = alloca float ; [#uses=2] + %"alloca point" = bitcast i32 0 to i32 ; [#uses=0] + store float 0.000000e+00, float* %x, align 4 + store float 0x7FF0000000000000, float* %y, align 4 + %0 = load float* %y, align 4 ; [#uses=1] + %1 = fpext float %0 to double ; [#uses=1] + %2 = load float* %x, align 4 ; [#uses=1] + %3 = fpext float %2 to double ; [#uses=1] + %4 = frem double %3, %1 ; [#uses=1] + %5 = call i32 (i8*, ...)* @printf(i8* getelementptr ([4 x i8]* @"\01LC", i32 0, i32 0), double %4) nounwind ; [#uses=0] + br label %return + +return: ; preds = %entry + ret void +} + +define void @foo11() nounwind { +entry: + %y = alloca float ; [#uses=2] + %x = alloca float ; [#uses=2] + %"alloca point" = bitcast i32 0 to i32 ; [#uses=0] + store float 0.000000e+00, float* %x, align 4 + store float 0.000000e+00, float* %y, align 4 + %0 = load float* %y, align 4 ; [#uses=1] + %1 = fpext float %0 to double ; [#uses=1] + %2 = load float* %x, align 4 ; [#uses=1] + %3 = fpext float %2 to double ; [#uses=1] + %4 = frem double %3, %1 ; [#uses=1] + %5 = call i32 (i8*, ...)* @printf(i8* getelementptr ([4 x i8]* @"\01LC", i32 0, i32 0), double %4) nounwind ; [#uses=0] + br label %return + +return: ; preds = %entry + ret void +} + +define void @foo12() nounwind { +entry: + %y = alloca float ; [#uses=2] + %x = alloca float ; [#uses=2] + %"alloca point" = bitcast i32 0 to i32 ; [#uses=0] + store float 0.000000e+00, float* %x, align 4 + store float 3.500000e+00, float* %y, align 4 + %0 = load float* %y, align 4 ; [#uses=1] + %1 = fpext float %0 to double ; [#uses=1] + %2 = load float* %x, align 4 ; [#uses=1] + %3 = fpext float %2 to double ; [#uses=1] + %4 = frem double %3, %1 ; [#uses=1] + %5 = call i32 (i8*, ...)* @printf(i8* getelementptr ([4 x i8]* @"\01LC", i32 0, i32 0), double %4) nounwind ; [#uses=0] + br label %return + +return: ; preds = %entry + ret void +} + +define void @foo13() nounwind { +entry: + %y = alloca float ; [#uses=2] + %x = alloca float ; [#uses=2] + %"alloca point" = bitcast i32 0 to i32 ; [#uses=0] + store float 3.500000e+00, float* %x, align 4 + store float 0x7FF8000000000000, float* %y, align 4 + %0 = load float* %y, align 4 ; [#uses=1] + %1 = fpext float %0 to double ; [#uses=1] + %2 = load float* %x, align 4 ; [#uses=1] + %3 = fpext float %2 to double ; [#uses=1] + %4 = frem double %3, %1 ; [#uses=1] + %5 = call i32 (i8*, ...)* @printf(i8* getelementptr ([4 x i8]* @"\01LC", i32 0, i32 0), double %4) nounwind ; [#uses=0] + br label %return + +return: ; preds = %entry + ret void +} + +define void @foo14() nounwind { +entry: + %y = alloca float ; [#uses=2] + %x = alloca float ; [#uses=2] + %"alloca point" = bitcast i32 0 to i32 ; [#uses=0] + store float 3.500000e+00, float* %x, align 4 + store float 0x7FF0000000000000, float* %y, align 4 + %0 = load float* %y, align 4 ; [#uses=1] + %1 = fpext float %0 to double ; [#uses=1] + %2 = load float* %x, align 4 ; [#uses=1] + %3 = fpext float %2 to double ; [#uses=1] + %4 = frem double %3, %1 ; [#uses=1] + %5 = call i32 (i8*, ...)* @printf(i8* getelementptr ([4 x i8]* @"\01LC", i32 0, i32 0), double %4) nounwind ; [#uses=0] + br label %return + +return: ; preds = %entry + ret void +} + +define void @foo15() nounwind { +entry: + %y = alloca float ; [#uses=2] + %x = alloca float ; [#uses=2] + %"alloca point" = bitcast i32 0 to i32 ; [#uses=0] + store float 3.500000e+00, float* %x, align 4 + store float 0.000000e+00, float* %y, align 4 + %0 = load float* %y, align 4 ; [#uses=1] + %1 = fpext float %0 to double ; [#uses=1] + %2 = load float* %x, align 4 ; [#uses=1] + %3 = fpext float %2 to double ; [#uses=1] + %4 = frem double %3, %1 ; [#uses=1] + %5 = call i32 (i8*, ...)* @printf(i8* getelementptr ([4 x i8]* @"\01LC", i32 0, i32 0), double %4) nounwind ; [#uses=0] + br label %return + +return: ; preds = %entry + ret void +} + +define void @foo16() nounwind { +entry: + %y = alloca float ; [#uses=2] + %x = alloca float ; [#uses=2] + %"alloca point" = bitcast i32 0 to i32 ; [#uses=0] + store float 3.500000e+00, float* %x, align 4 + store float 3.500000e+00, float* %y, align 4 + %0 = load float* %y, align 4 ; [#uses=1] + %1 = fpext float %0 to double ; [#uses=1] + %2 = load float* %x, align 4 ; [#uses=1] + %3 = fpext float %2 to double ; [#uses=1] + %4 = frem double %3, %1 ; [#uses=1] + %5 = call i32 (i8*, ...)* @printf(i8* getelementptr ([4 x i8]* @"\01LC", i32 0, i32 0), double %4) nounwind ; [#uses=0] + br label %return + +return: ; preds = %entry + ret void +} From sabre at nondot.org Tue Jan 20 19:55:07 2009 From: sabre at nondot.org (Chris Lattner) Date: Tue, 20 Jan 2009 17:55:07 -0800 (PST) Subject: [llvm-commits] [llvm] r62619 - /llvm/trunk/test/CodeGen/Generic/2008-07-29-EHLabel.ll In-Reply-To: <200901202244.32163.baldrick@free.fr> References: <200901202141.n0KLfrbH001793@zion.cs.uiuc.edu> <200901202244.32163.baldrick@free.fr> Message-ID: On Tue, 20 Jan 2009, Duncan Sands wrote: > Hi Chris, > >> Don't bother running the assembler, we don't know that it will be configured >> for whatever llc defaults to. This fixes PR3363 > > the whole point of this testcase is to run the assembler! The original > bug resulted in assembler being output that didn't assemble. Ok, how can we solve this issue? The test harness isn't set up to know about *any* assembler, much less one for a particular target. Can't this use 'grep' like anything other test? While yes, the output didn't assemble, there was a specific reason that it didn't assemble, why not just grep for that? -Chris -- http://nondot.org/sabre/ http://llvm.org/ From mrs at apple.com Tue Jan 20 17:42:27 2009 From: mrs at apple.com (Mike Stump) Date: Tue, 20 Jan 2009 15:42:27 -0800 Subject: [llvm-commits] [llvm] r62619 - /llvm/trunk/test/CodeGen/Generic/2008-07-29-EHLabel.ll In-Reply-To: <200901202244.32163.baldrick@free.fr> References: <200901202141.n0KLfrbH001793@zion.cs.uiuc.edu> <200901202244.32163.baldrick@free.fr> Message-ID: <63587EE6-CB5B-4A7A-9547-1D0DE4F378E7@apple.com> On Jan 20, 2009, at 10:44 PM, Duncan Sands wrote: >> Don't bother running the assembler, we don't know that it will be >> configured >> for whatever llc defaults to. This fixes PR3363 > > the whole point of this testcase is to run the assembler! The > original > bug resulted in assembler being output that didn't assemble. Imagine cross testing on a mips host; as on mips would be wrong. Instead, can we look for the invalid construct by grepping (or what ever post processing of the .s file is necessary), the .s output directly? From dpatel at apple.com Tue Jan 20 19:03:29 2009 From: dpatel at apple.com (Devang Patel) Date: Wed, 21 Jan 2009 01:03:29 -0000 Subject: [llvm-commits] [llvm-gcc-4.2] r62648 - /llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp Message-ID: <200901210103.n0L13Tk8009051@zion.cs.uiuc.edu> Author: dpatel Date: Tue Jan 20 19:03:29 2009 New Revision: 62648 URL: http://llvm.org/viewvc/llvm-project?rev=62648&view=rev Log: Set member accessibility flag. Do not seperate out file name and directory name in compile unit. It is only useful if the compiler emits multiple compile_units. Modified: llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp Modified: llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp?rev=62648&r1=62647&r2=62648&view=diff ============================================================================== --- llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp (original) +++ llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp Tue Jan 20 19:03:29 2009 @@ -558,7 +558,7 @@ llvm::DIType FwdDecl = DebugFactory.CreateCompositeType(Tag, MainCompileUnit, TypeName, MainCompileUnit, Loc.line, - 0, 0, 0, DW_AT_declaration, + 0, 0, 0, llvm::DIType::FlagFwdDecl, llvm::DIType(), llvm::DIArray(), &Filename, &Directory); @@ -617,11 +617,10 @@ const char *MemberName = GetNodeName(Member); unsigned Flags = 0; if (TREE_PROTECTED(Member)) - Flags = DW_ACCESS_protected; + Flags = llvm::DIType::FlagProtected; else if (TREE_PRIVATE(Member)) - Flags = DW_ACCESS_private; - else - Flags = DW_ACCESS_public; + Flags = llvm::DIType::FlagPrivate; + DIType DTy = DebugFactory.CreateDerivedType(DW_TAG_member, MainCompileUnit, MemberName, MainCompileUnit, @@ -727,8 +726,6 @@ DICompileUnit DebugInfo::createCompileUnit(const std::string &FullPath){ // Get source file information. std::string Directory; - std::string FileName; - DirectoryAndFile(FullPath, Directory, FileName); // Set up Language number. unsigned LangTag; @@ -752,7 +749,7 @@ else LangTag = DW_LANG_C89; - return DebugFactory.CreateCompileUnit(LangTag, FileName, Directory, + return DebugFactory.CreateCompileUnit(LangTag, FullPath, "", version_string); } From kremenek at apple.com Tue Jan 20 19:10:21 2009 From: kremenek at apple.com (Ted Kremenek) Date: Wed, 21 Jan 2009 01:10:21 -0000 Subject: [llvm-commits] [llvm] r62651 - /llvm/tags/checker/checker-0.142/ Message-ID: <200901210110.n0L1AL3q009338@zion.cs.uiuc.edu> Author: kremenek Date: Tue Jan 20 19:10:20 2009 New Revision: 62651 URL: http://llvm.org/viewvc/llvm-project?rev=62651&view=rev Log: Tagging checker-0.142. Added: llvm/tags/checker/checker-0.142/ - copied from r62650, llvm/trunk/ From dalej at apple.com Tue Jan 20 19:22:36 2009 From: dalej at apple.com (Dale Johannesen) Date: Tue, 20 Jan 2009 17:22:36 -0800 Subject: [llvm-commits] [llvm] r62619 - /llvm/trunk/test/CodeGen/Generic/2008-07-29-EHLabel.ll In-Reply-To: References: <200901202141.n0KLfrbH001793@zion.cs.uiuc.edu> <200901202244.32163.baldrick@free.fr> Message-ID: On Jan 20, 2009, at 5:55 PMPST, Chris Lattner wrote: > On Tue, 20 Jan 2009, Duncan Sands wrote: > >> Hi Chris, >> >>> Don't bother running the assembler, we don't know that it will be >>> configured >>> for whatever llc defaults to. This fixes PR3363 >> >> the whole point of this testcase is to run the assembler! The >> original >> bug resulted in assembler being output that didn't assemble. > > Ok, how can we solve this issue? The test harness isn't set up to > know > about *any* assembler, much less one for a particular target. Can't > this > use 'grep' like anything other test? Probably. While that looks like a bug I might have introduced, the analysis, fix, and testcase are all Duncan's; I'll let him answer. > While yes, the output didn't > assemble, there was a specific reason that it didn't assemble, why not > just grep for that? Because checking that the file assembles is a much stronger and more valuable test. Tests that embalm a bug that existed at one point are fairly useless; while duplicate bugs can creep back in, that's rare. (In years of working on gcc, a large majority of the regressions we found in the testsuite were things that had nothing to do with the original purpose of the test. The testsuite's main virtue is volume, not the contents of the individual tests.) From dalej at apple.com Tue Jan 20 20:08:30 2009 From: dalej at apple.com (Dale Johannesen) Date: Wed, 21 Jan 2009 02:08:30 -0000 Subject: [llvm-commits] [llvm] r62660 - /llvm/trunk/test/Transforms/InstCombine/2009-01-19-fmod-constant-float-specials.ll Message-ID: <200901210208.n0L28UIh011093@zion.cs.uiuc.edu> Author: johannes Date: Tue Jan 20 20:08:30 2009 New Revision: 62660 URL: http://llvm.org/viewvc/llvm-project?rev=62660&view=rev Log: Disable on x86_64 until I figure out what's wrong. Modified: llvm/trunk/test/Transforms/InstCombine/2009-01-19-fmod-constant-float-specials.ll Modified: llvm/trunk/test/Transforms/InstCombine/2009-01-19-fmod-constant-float-specials.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/2009-01-19-fmod-constant-float-specials.ll?rev=62660&r1=62659&r2=62660&view=diff ============================================================================== --- llvm/trunk/test/Transforms/InstCombine/2009-01-19-fmod-constant-float-specials.ll (original) +++ llvm/trunk/test/Transforms/InstCombine/2009-01-19-fmod-constant-float-specials.ll Tue Jan 20 20:08:30 2009 @@ -2,6 +2,7 @@ ; RUN: llvm-as < %s | opt -simplifycfg -instcombine | llvm-dis | grep 0x7FF80000FFFFFFFF | count 5 ; RUN: llvm-as < %s | opt -simplifycfg -instcombine | llvm-dis | grep {0\\.0} | count 3 ; RUN: llvm-as < %s | opt -simplifycfg -instcombine | llvm-dis | grep {3\\.5} | count 1 +; XFAIL: x86_64 ; ModuleID = 'apf.c' 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:128:128" From evan.cheng at apple.com Tue Jan 20 20:09:05 2009 From: evan.cheng at apple.com (Evan Cheng) Date: Wed, 21 Jan 2009 02:09:05 -0000 Subject: [llvm-commits] [llvm] r62661 - in /llvm/trunk: lib/Target/X86/X86InstrInfo.td test/CodeGen/X86/xor_not.ll Message-ID: <200901210209.n0L296Lh011122@zion.cs.uiuc.edu> Author: evancheng Date: Tue Jan 20 20:09:05 2009 New Revision: 62661 URL: http://llvm.org/viewvc/llvm-project?rev=62661&view=rev Log: Favors generating "not" over "xor -1". For example. unsigned test(unsigned a) { return ~a; } llvm used to generate: movl $4294967295, %eax xorl 4(%esp), %eax Now it generates: movl 4(%esp), %eax notl %eax It's 3 bytes shorter. Modified: llvm/trunk/lib/Target/X86/X86InstrInfo.td llvm/trunk/test/CodeGen/X86/xor_not.ll Modified: llvm/trunk/lib/Target/X86/X86InstrInfo.td URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86InstrInfo.td?rev=62661&r1=62660&r2=62661&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/X86InstrInfo.td (original) +++ llvm/trunk/lib/Target/X86/X86InstrInfo.td Tue Jan 20 20:09:05 2009 @@ -1235,12 +1235,15 @@ } } // Defs = [EFLAGS] +// Match xor -1 to not. Favors these over a move imm + xor to save code size. +let AddedComplexity = 15 in { def NOT8r : I<0xF6, MRM2r, (outs GR8 :$dst), (ins GR8 :$src), "not{b}\t$dst", [(set GR8:$dst, (not GR8:$src))]>; def NOT16r : I<0xF7, MRM2r, (outs GR16:$dst), (ins GR16:$src), "not{w}\t$dst", [(set GR16:$dst, (not GR16:$src))]>, OpSize; def NOT32r : I<0xF7, MRM2r, (outs GR32:$dst), (ins GR32:$src), "not{l}\t$dst", [(set GR32:$dst, (not GR32:$src))]>; +} let isTwoAddress = 0 in { def NOT8m : I<0xF6, MRM2m, (outs), (ins i8mem :$dst), "not{b}\t$dst", [(store (not (loadi8 addr:$dst)), addr:$dst)]>; Modified: llvm/trunk/test/CodeGen/X86/xor_not.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/xor_not.ll?rev=62661&r1=62660&r2=62661&view=diff ============================================================================== --- llvm/trunk/test/CodeGen/X86/xor_not.ll (original) +++ llvm/trunk/test/CodeGen/X86/xor_not.ll Tue Jan 20 20:09:05 2009 @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 | grep {not\[lwb\]} | count 3 +; RUN: llvm-as < %s | llc -march=x86 | grep {not\[lwb\]} | count 4 ; RUN: llvm-as < %s | llc -march=x86-64 | grep {not\[lwb\]} | count 4 define i32 @test(i32 %a, i32 %b) nounwind { entry: From gohman at apple.com Tue Jan 20 21:00:49 2009 From: gohman at apple.com (Dan Gohman) Date: Tue, 20 Jan 2009 19:00:49 -0800 Subject: [llvm-commits] [llvm] r62661 - in /llvm/trunk: lib/Target/X86/X86InstrInfo.td test/CodeGen/X86/xor_not.ll In-Reply-To: <200901210209.n0L296Lh011122@zion.cs.uiuc.edu> References: <200901210209.n0L296Lh011122@zion.cs.uiuc.edu> Message-ID: Hi Evan, Please make the corresponding change for 64-bit instructions too. Thanks, Dan On Jan 20, 2009, at 6:09 PM, Evan Cheng wrote: > Author: evancheng > Date: Tue Jan 20 20:09:05 2009 > New Revision: 62661 > > URL: http://llvm.org/viewvc/llvm-project?rev=62661&view=rev > Log: > Favors generating "not" over "xor -1". For example. > unsigned test(unsigned a) { > return ~a; > } > llvm used to generate: > movl $4294967295, %eax > xorl 4(%esp), %eax > > Now it generates: > movl 4(%esp), %eax > notl %eax > > It's 3 bytes shorter. > > Modified: > llvm/trunk/lib/Target/X86/X86InstrInfo.td > llvm/trunk/test/CodeGen/X86/xor_not.ll > > Modified: llvm/trunk/lib/Target/X86/X86InstrInfo.td > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86InstrInfo.td?rev=62661&r1=62660&r2=62661&view=diff > > = > = > = > = > = > = > = > = > ====================================================================== > --- llvm/trunk/lib/Target/X86/X86InstrInfo.td (original) > +++ llvm/trunk/lib/Target/X86/X86InstrInfo.td Tue Jan 20 20:09:05 2009 > @@ -1235,12 +1235,15 @@ > } > } // Defs = [EFLAGS] > > +// Match xor -1 to not. Favors these over a move imm + xor to save > code size. > +let AddedComplexity = 15 in { > def NOT8r : I<0xF6, MRM2r, (outs GR8 :$dst), (ins GR8 :$src), > "not{b}\t$dst", > [(set GR8:$dst, (not GR8:$src))]>; > def NOT16r : I<0xF7, MRM2r, (outs GR16:$dst), (ins GR16:$src), > "not{w}\t$dst", > [(set GR16:$dst, (not GR16:$src))]>, OpSize; > def NOT32r : I<0xF7, MRM2r, (outs GR32:$dst), (ins GR32:$src), > "not{l}\t$dst", > [(set GR32:$dst, (not GR32:$src))]>; > +} > let isTwoAddress = 0 in { > def NOT8m : I<0xF6, MRM2m, (outs), (ins i8mem :$dst), "not{b}\t > $dst", > [(store (not (loadi8 addr:$dst)), addr:$dst)]>; > > Modified: llvm/trunk/test/CodeGen/X86/xor_not.ll > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/xor_not.ll?rev=62661&r1=62660&r2=62661&view=diff > > = > = > = > = > = > = > = > = > ====================================================================== > --- llvm/trunk/test/CodeGen/X86/xor_not.ll (original) > +++ llvm/trunk/test/CodeGen/X86/xor_not.ll Tue Jan 20 20:09:05 2009 > @@ -1,4 +1,4 @@ > -; RUN: llvm-as < %s | llc -march=x86 | grep {not\[lwb\]} | count 3 > +; RUN: llvm-as < %s | llc -march=x86 | grep {not\[lwb\]} | count 4 > ; RUN: llvm-as < %s | llc -march=x86-64 | grep {not\[lwb\]} | count 4 > define i32 @test(i32 %a, i32 %b) nounwind { > entry: > > > _______________________________________________ > llvm-commits mailing list > llvm-commits at cs.uiuc.edu > http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits From mrs at apple.com Tue Jan 20 21:21:49 2009 From: mrs at apple.com (Mike Stump) Date: Tue, 20 Jan 2009 19:21:49 -0800 Subject: [llvm-commits] [llvm] r62619 - /llvm/trunk/test/CodeGen/Generic/2008-07-29-EHLabel.ll In-Reply-To: References: <200901202141.n0KLfrbH001793@zion.cs.uiuc.edu> <200901202244.32163.baldrick@free.fr> Message-ID: <0080E808-BB8F-4673-8BA9-1A90EA292CA8@apple.com> On Jan 20, 2009, at 5:22 PM, Dale Johannesen wrote: > Because checking that the file assembles is a much stronger and more > valuable test. Fine, but then the question is, what annotation do we use to ensure that the sex of as is the sex we need to run the testcase? If there isn't any, then the testcase is unutterable in the existing framework. From sanjiv.gupta at microchip.com Tue Jan 20 22:48:41 2009 From: sanjiv.gupta at microchip.com (Sanjiv Gupta) Date: Wed, 21 Jan 2009 04:48:41 -0000 Subject: [llvm-commits] [llvm] r62663 - in /llvm/trunk: include/llvm/Target/TargetLowering.h lib/CodeGen/SelectionDAG/LegalizeFloatTypes.cpp lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp lib/CodeGen/SelectionDAG/LegalizeTypes.cpp lib/CodeGen/SelectionDAG/LegalizeTypes.h lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp Message-ID: <200901210448.n0L4mfuM015826@zion.cs.uiuc.edu> Author: sgupta Date: Tue Jan 20 22:48:39 2009 New Revision: 62663 URL: http://llvm.org/viewvc/llvm-project?rev=62663&view=rev Log: Allow targets to legalize operations (with illegal operands) that produces multiple values. For example, a load with an illegal operand (a load produces two values, a value and chain). Modified: llvm/trunk/include/llvm/Target/TargetLowering.h llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeFloatTypes.cpp llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeTypes.h llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp Modified: llvm/trunk/include/llvm/Target/TargetLowering.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/TargetLowering.h?rev=62663&r1=62662&r2=62663&view=diff ============================================================================== --- llvm/trunk/include/llvm/Target/TargetLowering.h (original) +++ llvm/trunk/include/llvm/Target/TargetLowering.h Tue Jan 20 22:48:39 2009 @@ -1131,6 +1131,23 @@ return SDValue(); } + /// LowerOperationWrapper - This callback is invoked by the type legalizer + /// to legalize operation with illegal operand types but legal result types; + /// It replaces the LowerOperation callback in the type Legalizer. + /// The reason we can not do away with LowerOperation entirely is that + /// LegalizeDAG isn't yet ready to use this callback. + + /// The target places new result values for the node in Results (their number + /// and types must exactly match those of the original return values of + /// the node), or leaves Results empty, which indicates that the node is not + /// to be custom lowered after all. + /// In its default implementation it calls the LowerOperation. + + virtual void LowerOperationWrapper(SDValue Op, + SmallVectorImpl &Results, + SelectionDAG &DAG); + + /// LowerOperation - This callback is invoked for operations that are /// unsupported by the target, which are registered to use 'custom' lowering, /// and whose defined values are all legal. Modified: llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeFloatTypes.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeFloatTypes.cpp?rev=62663&r1=62662&r2=62663&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeFloatTypes.cpp (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeFloatTypes.cpp Tue Jan 20 22:48:39 2009 @@ -722,7 +722,7 @@ Lo = Hi = SDValue(); // See if the target wants to custom expand this node. - if (CustomLowerResults(N, ResNo)) + if (CustomLowerResults(N, ResNo, true)) return; 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=62663&r1=62662&r2=62663&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp Tue Jan 20 22:48:39 2009 @@ -34,7 +34,7 @@ SDValue Result = SDValue(); // See if the target wants to custom expand this node. - if (CustomLowerResults(N, ResNo)) + if (CustomLowerResults(N, ResNo, true)) return; switch (N->getOpcode()) { @@ -623,45 +623,42 @@ DEBUG(cerr << "Promote integer operand: "; N->dump(&DAG); cerr << "\n"); SDValue Res = SDValue(); - if (TLI.getOperationAction(N->getOpcode(), N->getOperand(OpNo).getValueType()) - == TargetLowering::Custom) - Res = TLI.LowerOperation(SDValue(N, 0), DAG); + if (CustomLowerResults(N, OpNo, false)) + return false; - if (Res.getNode() == 0) { - switch (N->getOpcode()) { - default: + switch (N->getOpcode()) { + default: #ifndef NDEBUG - cerr << "PromoteIntegerOperand Op #" << OpNo << ": "; - N->dump(&DAG); cerr << "\n"; + cerr << "PromoteIntegerOperand Op #" << OpNo << ": "; + N->dump(&DAG); cerr << "\n"; #endif - assert(0 && "Do not know how to promote this operator's operand!"); - abort(); + assert(0 && "Do not know how to promote this operator's operand!"); + abort(); - case ISD::ANY_EXTEND: Res = PromoteIntOp_ANY_EXTEND(N); break; - case ISD::BR_CC: Res = PromoteIntOp_BR_CC(N, OpNo); break; - case ISD::BRCOND: Res = PromoteIntOp_BRCOND(N, OpNo); break; - case ISD::BUILD_PAIR: Res = PromoteIntOp_BUILD_PAIR(N); break; - case ISD::BUILD_VECTOR: Res = PromoteIntOp_BUILD_VECTOR(N); break; - case ISD::CONVERT_RNDSAT: - Res = PromoteIntOp_CONVERT_RNDSAT(N); break; - case ISD::INSERT_VECTOR_ELT: - Res = PromoteIntOp_INSERT_VECTOR_ELT(N, OpNo);break; - case ISD::MEMBARRIER: Res = PromoteIntOp_MEMBARRIER(N); break; - case ISD::SELECT: Res = PromoteIntOp_SELECT(N, OpNo); break; - case ISD::SELECT_CC: Res = PromoteIntOp_SELECT_CC(N, OpNo); break; - case ISD::SETCC: Res = PromoteIntOp_SETCC(N, OpNo); break; - case ISD::SIGN_EXTEND: Res = PromoteIntOp_SIGN_EXTEND(N); break; - case ISD::SINT_TO_FP: Res = PromoteIntOp_SINT_TO_FP(N); break; - case ISD::STORE: Res = PromoteIntOp_STORE(cast(N), - OpNo); break; - case ISD::TRUNCATE: Res = PromoteIntOp_TRUNCATE(N); break; - case ISD::UINT_TO_FP: Res = PromoteIntOp_UINT_TO_FP(N); break; - case ISD::ZERO_EXTEND: Res = PromoteIntOp_ZERO_EXTEND(N); break; - } + case ISD::ANY_EXTEND: Res = PromoteIntOp_ANY_EXTEND(N); break; + case ISD::BR_CC: Res = PromoteIntOp_BR_CC(N, OpNo); break; + case ISD::BRCOND: Res = PromoteIntOp_BRCOND(N, OpNo); break; + case ISD::BUILD_PAIR: Res = PromoteIntOp_BUILD_PAIR(N); break; + case ISD::BUILD_VECTOR: Res = PromoteIntOp_BUILD_VECTOR(N); break; + case ISD::CONVERT_RNDSAT: + Res = PromoteIntOp_CONVERT_RNDSAT(N); break; + case ISD::INSERT_VECTOR_ELT: + Res = PromoteIntOp_INSERT_VECTOR_ELT(N, OpNo);break; + case ISD::MEMBARRIER: Res = PromoteIntOp_MEMBARRIER(N); break; + case ISD::SELECT: Res = PromoteIntOp_SELECT(N, OpNo); break; + case ISD::SELECT_CC: Res = PromoteIntOp_SELECT_CC(N, OpNo); break; + case ISD::SETCC: Res = PromoteIntOp_SETCC(N, OpNo); break; + case ISD::SIGN_EXTEND: Res = PromoteIntOp_SIGN_EXTEND(N); break; + case ISD::SINT_TO_FP: Res = PromoteIntOp_SINT_TO_FP(N); break; + case ISD::STORE: Res = PromoteIntOp_STORE(cast(N), + OpNo); break; + case ISD::TRUNCATE: Res = PromoteIntOp_TRUNCATE(N); break; + case ISD::UINT_TO_FP: Res = PromoteIntOp_UINT_TO_FP(N); break; + case ISD::ZERO_EXTEND: Res = PromoteIntOp_ZERO_EXTEND(N); break; } - + // If the result is null, the sub-method took care of registering results etc. - if (!Res.getNode()) return false; + if (! Res.getNode()) return false; // If the result is N, the sub-method updated N in place. Tell the legalizer // core about this. @@ -921,7 +918,7 @@ Lo = Hi = SDValue(); // See if the target wants to custom expand this node. - if (CustomLowerResults(N, ResNo)) + if (CustomLowerResults(N, ResNo, true)) return; switch (N->getOpcode()) { @@ -1851,35 +1848,32 @@ DEBUG(cerr << "Expand integer operand: "; N->dump(&DAG); cerr << "\n"); SDValue Res = SDValue(); - if (TLI.getOperationAction(N->getOpcode(), N->getOperand(OpNo).getValueType()) - == TargetLowering::Custom) - Res = TLI.LowerOperation(SDValue(N, 0), DAG); + if (CustomLowerResults(N, OpNo, false)) + return false; - if (Res.getNode() == 0) { - switch (N->getOpcode()) { - default: + switch (N->getOpcode()) { + default: #ifndef NDEBUG - cerr << "ExpandIntegerOperand Op #" << OpNo << ": "; - N->dump(&DAG); cerr << "\n"; + cerr << "ExpandIntegerOperand Op #" << OpNo << ": "; + N->dump(&DAG); cerr << "\n"; #endif - assert(0 && "Do not know how to expand this operator's operand!"); - abort(); + assert(0 && "Do not know how to expand this operator's operand!"); + abort(); - case ISD::BUILD_VECTOR: Res = ExpandOp_BUILD_VECTOR(N); break; - case ISD::BIT_CONVERT: Res = ExpandOp_BIT_CONVERT(N); break; - case ISD::EXTRACT_ELEMENT: Res = ExpandOp_EXTRACT_ELEMENT(N); break; - case ISD::INSERT_VECTOR_ELT: Res = ExpandOp_INSERT_VECTOR_ELT(N); break; - case ISD::SCALAR_TO_VECTOR: Res = ExpandOp_SCALAR_TO_VECTOR(N); break; - - case ISD::BR_CC: Res = ExpandIntOp_BR_CC(N); break; - case ISD::SELECT_CC: Res = ExpandIntOp_SELECT_CC(N); break; - case ISD::SETCC: Res = ExpandIntOp_SETCC(N); break; - case ISD::SINT_TO_FP: Res = ExpandIntOp_SINT_TO_FP(N); break; - case ISD::STORE: Res = ExpandIntOp_STORE(cast(N), OpNo); - break; - case ISD::TRUNCATE: Res = ExpandIntOp_TRUNCATE(N); break; - case ISD::UINT_TO_FP: Res = ExpandIntOp_UINT_TO_FP(N); break; - } + case ISD::BUILD_VECTOR: Res = ExpandOp_BUILD_VECTOR(N); break; + case ISD::BIT_CONVERT: Res = ExpandOp_BIT_CONVERT(N); break; + case ISD::EXTRACT_ELEMENT: Res = ExpandOp_EXTRACT_ELEMENT(N); break; + case ISD::INSERT_VECTOR_ELT: Res = ExpandOp_INSERT_VECTOR_ELT(N); break; + case ISD::SCALAR_TO_VECTOR: Res = ExpandOp_SCALAR_TO_VECTOR(N); break; + + case ISD::BR_CC: Res = ExpandIntOp_BR_CC(N); break; + case ISD::SELECT_CC: Res = ExpandIntOp_SELECT_CC(N); break; + case ISD::SETCC: Res = ExpandIntOp_SETCC(N); break; + case ISD::SINT_TO_FP: Res = ExpandIntOp_SINT_TO_FP(N); break; + case ISD::STORE: Res = ExpandIntOp_STORE(cast(N), OpNo); + break; + case ISD::TRUNCATE: Res = ExpandIntOp_TRUNCATE(N); break; + case ISD::UINT_TO_FP: Res = ExpandIntOp_UINT_TO_FP(N); break; } // If the result is null, the sub-method took care of registering results etc. Modified: llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp?rev=62663&r1=62662&r2=62663&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp Tue Jan 20 22:48:39 2009 @@ -848,14 +848,28 @@ /// CustomLowerResults - Replace the node's results with custom code provided /// by the target and return "true", or do nothing and return "false". -bool DAGTypeLegalizer::CustomLowerResults(SDNode *N, unsigned ResNo) { +/// The last parameter is FALSE if we are dealing with a node with legal +/// result types and illegal operand. The second parameter denotes the illegal +/// OperandNo in that case. +/// The last parameter being TRUE means we are dealing with a +/// node with illegal result types. The second parameter denotes the illegal +/// ResNo in that case. +bool DAGTypeLegalizer::CustomLowerResults(SDNode *N, unsigned Num, + bool LegalizeResult) { + // Get the type of illegal Result or Operand. + MVT ValueTy = (LegalizeResult) ? N->getValueType(Num) + : N->getOperand(Num).getValueType(); + // See if the target wants to custom lower this node. - if (TLI.getOperationAction(N->getOpcode(), N->getValueType(ResNo)) != - TargetLowering::Custom) + if (TLI.getOperationAction(N->getOpcode(), ValueTy) != TargetLowering::Custom) return false; SmallVector Results; - TLI.ReplaceNodeResults(N, Results, DAG); + if (LegalizeResult) + TLI.ReplaceNodeResults(N, Results, DAG); + else + TLI.LowerOperationWrapper(SDValue(N, 0), Results, DAG); + if (Results.empty()) // The target didn't want to custom lower it after all. return false; Modified: llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeTypes.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeTypes.h?rev=62663&r1=62662&r2=62663&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeTypes.h (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeTypes.h Tue Jan 20 22:48:39 2009 @@ -191,7 +191,7 @@ // Common routines. SDValue BitConvertToInteger(SDValue Op); SDValue CreateStackStoreLoad(SDValue Op, MVT DestVT); - bool CustomLowerResults(SDNode *N, unsigned ResNo); + bool CustomLowerResults(SDNode *N, unsigned ResNo, bool LegalizeResult); SDValue GetVectorElementPointer(SDValue VecPtr, MVT EltVT, SDValue Index); SDValue JoinIntegers(SDValue Lo, SDValue Hi); SDValue LibCallify(RTLIB::Libcall LC, SDNode *N, bool isSigned); Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp?rev=62663&r1=62662&r2=62663&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp Tue Jan 20 22:48:39 2009 @@ -5568,6 +5568,15 @@ return std::make_pair(Res, Chain); } +void TargetLowering::LowerOperationWrapper(SDValue Op, + SmallVectorImpl &Results, + SelectionDAG &DAG) { + SDValue Res; + Res = LowerOperation(Op, DAG); + if (Res.getNode()) + Results.push_back(Res); +} + SDValue TargetLowering::LowerOperation(SDValue Op, SelectionDAG &DAG) { assert(0 && "LowerOperation not implemented for this target!"); abort(); From scottm at aero.org Tue Jan 20 22:58:48 2009 From: scottm at aero.org (Scott Michel) Date: Wed, 21 Jan 2009 04:58:48 -0000 Subject: [llvm-commits] [llvm] r62664 - in /llvm/trunk: lib/CodeGen/SelectionDAG/LegalizeDAG.cpp lib/Target/CellSPU/README.txt lib/Target/CellSPU/SPU128InstrInfo.td lib/Target/CellSPU/SPU64InstrInfo.td lib/Target/CellSPU/SPUISelDAGToDAG.cpp lib/Target/CellSPU/SPUISelLowering.cpp lib/Target/CellSPU/SPUISelLowering.h lib/Target/CellSPU/SPUInstrInfo.cpp lib/Target/CellSPU/SPUInstrInfo.td test/CodeGen/CellSPU/fneg-fabs.ll Message-ID: <200901210458.n0L4wnti016096@zion.cs.uiuc.edu> Author: pingbak Date: Tue Jan 20 22:58:48 2009 New Revision: 62664 URL: http://llvm.org/viewvc/llvm-project?rev=62664&view=rev Log: CellSPU: - Ensure that (operation) legalization emits proper FDIV libcall when needed. - Fix various bugs encountered during llvm-spu-gcc build, along with various cleanups. - Start supporting double precision comparisons for remaining libgcc2 build. Discovered interesting DAGCombiner feature, which is currently solved via custom lowering (64-bit constants are not legal on CellSPU, but DAGCombiner insists on inserting one anyway.) - Update README. Modified: llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp llvm/trunk/lib/Target/CellSPU/README.txt llvm/trunk/lib/Target/CellSPU/SPU128InstrInfo.td llvm/trunk/lib/Target/CellSPU/SPU64InstrInfo.td llvm/trunk/lib/Target/CellSPU/SPUISelDAGToDAG.cpp llvm/trunk/lib/Target/CellSPU/SPUISelLowering.cpp llvm/trunk/lib/Target/CellSPU/SPUISelLowering.h llvm/trunk/lib/Target/CellSPU/SPUInstrInfo.cpp llvm/trunk/lib/Target/CellSPU/SPUInstrInfo.td llvm/trunk/test/CodeGen/CellSPU/fneg-fabs.ll Modified: llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp?rev=62664&r1=62663&r2=62664&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp Tue Jan 20 22:58:48 2009 @@ -3294,6 +3294,10 @@ LC = GetFPLibCall(VT, RTLIB::POW_F32, RTLIB::POW_F64, RTLIB::POW_F80, RTLIB::POW_PPCF128); break; + case ISD::FDIV: + LC = GetFPLibCall(VT, RTLIB::DIV_F32, RTLIB::DIV_F64, RTLIB::DIV_F80, + RTLIB::DIV_PPCF128); + break; default: break; } if (LC != RTLIB::UNKNOWN_LIBCALL) { Modified: llvm/trunk/lib/Target/CellSPU/README.txt URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/CellSPU/README.txt?rev=62664&r1=62663&r2=62664&view=diff ============================================================================== --- llvm/trunk/lib/Target/CellSPU/README.txt (original) +++ llvm/trunk/lib/Target/CellSPU/README.txt Tue Jan 20 22:58:48 2009 @@ -8,7 +8,7 @@ - Mark Thomas (floating point instructions) - Michael AuYeung (intrinsics) - Chandler Carruth (LLVM expertise) -- Nehal Desai (debugging, RoadRunner SPU expertise) +- Nehal Desai (debugging, i32 operations, RoadRunner SPU expertise) THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF @@ -36,7 +36,7 @@ TODO: * Create a machine pass for performing dual-pipeline scheduling specifically - for CellSPU, handle inserting branch prediction instructions. + for CellSPU, and insert branch prediction instructions as needed. * i32 instructions: @@ -48,20 +48,43 @@ * sign and zero extension: done * addition: done * subtraction: needed - * multiplication: work-in-progress + * multiplication: done * i128 support: - * zero extension: done + * zero extension, any extension: done * sign extension: needed * arithmetic operators (add, sub, mul, div): needed + * logical operations (and, or, shl, srl, sra, xor, nor, nand): needed -* Double floating point support + * or: done - This was started. "What's missing?" to be filled in. +* f64 support + + * Comparison operators: + SETOEQ unimplemented + SETOGT unimplemented + SETOGE unimplemented + SETOLT unimplemented + SETOLE unimplemented + SETONE unimplemented + SETO done (lowered) + SETUO done (lowered) + SETUEQ unimplemented + SETUGT unimplemented + SETUGE unimplemented + SETULT unimplemented + SETULE unimplemented + SETUNE unimplemented + +* LLVM vector suport + + * VSETCC needs to be implemented. It's pretty straightforward to code, but + needs implementation. * Intrinsics - Lots of progress. "What's missing/incomplete?" to be filled in. + * spu.h instrinsics added but not tested. Need to have an operational + llvm-spu-gcc in order to write a unit test harness. ===-------------------------------------------------------------------------=== Modified: llvm/trunk/lib/Target/CellSPU/SPU128InstrInfo.td URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/CellSPU/SPU128InstrInfo.td?rev=62664&r1=62663&r2=62664&view=diff ============================================================================== --- llvm/trunk/lib/Target/CellSPU/SPU128InstrInfo.td (original) +++ llvm/trunk/lib/Target/CellSPU/SPU128InstrInfo.td Tue Jan 20 22:58:48 2009 @@ -2,7 +2,6 @@ // // Cell SPU 128-bit operations // -// Primary author: Scott Michel (scottm at aero.org) //===----------------------------------------------------------------------===// // zext 32->128: Zero extend 32-bit to 128-bit @@ -20,3 +19,23 @@ // zext 8->128: Zero extend 8-bit to 128-bit def : Pat<(i128 (zext R8C:$rSrc)), (ROTQMBYIr128_zext_r32 (ANDIi8i32 R8C:$rSrc, 0xf), 12)>; + +// anyext 32->128: Zero extend 32-bit to 128-bit +def : Pat<(i128 (anyext R32C:$rSrc)), + (ROTQMBYIr128_zext_r32 R32C:$rSrc, 12)>; + +// anyext 64->128: Zero extend 64-bit to 128-bit +def : Pat<(i128 (anyext R64C:$rSrc)), + (ROTQMBYIr128_zext_r64 R64C:$rSrc, 8)>; + +// anyext 16->128: Zero extend 16-bit to 128-bit +def : Pat<(i128 (anyext R16C:$rSrc)), + (ROTQMBYIr128_zext_r32 (ANDi16i32 R16C:$rSrc, (ILAr32 0xffff)), 12)>; + +// anyext 8->128: Zero extend 8-bit to 128-bit +def : Pat<(i128 (anyext R8C:$rSrc)), + (ROTQMBYIr128_zext_r32 (ANDIi8i32 R8C:$rSrc, 0xf), 12)>; + +// Shift left +def : Pat<(shl GPRC:$rA, R32C:$rB), + (SHLQBYBIr128 (SHLQBIr128 GPRC:$rA, R32C:$rB), R32C:$rB)>; Modified: llvm/trunk/lib/Target/CellSPU/SPU64InstrInfo.td URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/CellSPU/SPU64InstrInfo.td?rev=62664&r1=62663&r2=62664&view=diff ============================================================================== --- llvm/trunk/lib/Target/CellSPU/SPU64InstrInfo.td (original) +++ llvm/trunk/lib/Target/CellSPU/SPU64InstrInfo.td Tue Jan 20 22:58:48 2009 @@ -33,6 +33,13 @@ SELBInst<(outs R64C:$rT), (ins R64C:$rA, R64C:$rB, VECREG:$rC), [/* no pattern */]>; +// The generic i64 select pattern, which assumes that the comparison result +// is in a 32-bit register that contains a select mask pattern (i.e., gather +// bits result): + +def : Pat<(select R32C:$rCond, R64C:$rFalse, R64C:$rTrue), + (SELBr64_cond R64C:$rTrue, R64C:$rFalse, (FSMr32 R32C:$rCond))>; + // select the negative condition: class I64SELECTNegCond: Pat<(select (i32 (cond R64C:$rA, R64C:$rB)), R64C:$rTrue, R64C:$rFalse), @@ -43,13 +50,6 @@ Pat<(cond R64C:$rA, R64C:$rB), (XORIr32 compare.Fragment, -1)>; -// The generic i64 select pattern, which assumes that the comparison result -// is in a 32-bit register that contains a select mask pattern (i.e., gather -// bits result): - -def : Pat<(select R32C:$rCond, R64C:$rFalse, R64C:$rTrue), - (SELBr64_cond R64C:$rTrue, R64C:$rFalse, (FSMr32 R32C:$rCond))>; - //-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~ // The i64 seteq fragment that does the scalar->vector conversion and // comparison: @@ -331,8 +331,8 @@ (MPYHv4i32 v2i64_mul_bhi64.Fragment, v2i64_mul_ashlq4.Fragment), (Av4i32 - (MPYHv4i32 v2i64_mul_ashlq4.Fragment, - v2i64_mul_bhi64.Fragment), + (MPYHv4i32 v2i64_mul_ashlq4.Fragment, + v2i64_mul_bhi64.Fragment), (Av4i32 (MPYUv4i32 v2i64_mul_ashlq4.Fragment, v2i64_mul_bhi64.Fragment), @@ -381,3 +381,14 @@ (v4i32 VECREG:$rCGmask)), v2i64_mul<(v2i64 VECREG:$rA), (v2i64 VECREG:$rB), (v4i32 VECREG:$rCGmask)>.Fragment>; + +//-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~ +// f64 comparisons +//-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~ + +// selb instruction definition for i64. Note that the selection mask is +// a vector, produced by various forms of FSM: +def SELBf64_cond: + SELBInst<(outs R64FP:$rT), (ins R64FP:$rA, R64FP:$rB, R32C:$rC), + [(set R64FP:$rT, + (select R32C:$rC, R64FP:$rB, R64FP:$rA))]>; Modified: llvm/trunk/lib/Target/CellSPU/SPUISelDAGToDAG.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/CellSPU/SPUISelDAGToDAG.cpp?rev=62664&r1=62663&r2=62664&view=diff ============================================================================== --- llvm/trunk/lib/Target/CellSPU/SPUISelDAGToDAG.cpp (original) +++ llvm/trunk/lib/Target/CellSPU/SPUISelDAGToDAG.cpp Tue Jan 20 22:58:48 2009 @@ -685,26 +685,26 @@ break; case MVT::i32: shufMask = CurDAG->getNode(ISD::BUILD_VECTOR, MVT::v4i32, - CurDAG->getConstant(0x80808080, MVT::i32), - CurDAG->getConstant(0x00010203, MVT::i32), - CurDAG->getConstant(0x80808080, MVT::i32), - CurDAG->getConstant(0x08090a0b, MVT::i32)); + CurDAG->getConstant(0x80808080, MVT::i32), + CurDAG->getConstant(0x00010203, MVT::i32), + CurDAG->getConstant(0x80808080, MVT::i32), + CurDAG->getConstant(0x08090a0b, MVT::i32)); break; case MVT::i16: shufMask = CurDAG->getNode(ISD::BUILD_VECTOR, MVT::v4i32, - CurDAG->getConstant(0x80808080, MVT::i32), - CurDAG->getConstant(0x80800203, MVT::i32), - CurDAG->getConstant(0x80808080, MVT::i32), - CurDAG->getConstant(0x80800a0b, MVT::i32)); + CurDAG->getConstant(0x80808080, MVT::i32), + CurDAG->getConstant(0x80800203, MVT::i32), + CurDAG->getConstant(0x80808080, MVT::i32), + CurDAG->getConstant(0x80800a0b, MVT::i32)); break; case MVT::i8: shufMask = CurDAG->getNode(ISD::BUILD_VECTOR, MVT::v4i32, - CurDAG->getConstant(0x80808080, MVT::i32), - CurDAG->getConstant(0x80808003, MVT::i32), - CurDAG->getConstant(0x80808080, MVT::i32), - CurDAG->getConstant(0x8080800b, MVT::i32)); + CurDAG->getConstant(0x80808080, MVT::i32), + CurDAG->getConstant(0x80808003, MVT::i32), + CurDAG->getConstant(0x80808080, MVT::i32), + CurDAG->getConstant(0x8080800b, MVT::i32)); break; } @@ -714,9 +714,9 @@ SDValue zextShuffle = CurDAG->getNode(SPUISD::SHUFB, OpVecVT, - SDValue(PromoteScalar, 0), - SDValue(PromoteScalar, 0), - SDValue(shufMaskLoad, 0)); + SDValue(PromoteScalar, 0), + SDValue(PromoteScalar, 0), + SDValue(shufMaskLoad, 0)); // N.B.: BIT_CONVERT replaces and updates the zextShuffle node, so we // re-use it in the VEC2PREFSLOT selection without needing to explicitly @@ -745,6 +745,27 @@ return SelectCode(CurDAG->getNode(SPUISD::MUL64_MARKER, OpVT, Op.getOperand(0), Op.getOperand(1), SDValue(CGLoad, 0))); + } else if (Opc == ISD::ADD && (OpVT == MVT::i64 || OpVT == MVT::v2i64)) { + SDNode *CGLoad = + emitBuildVector(SPU::getCarryGenerateShufMask(*CurDAG)); + + return SelectCode(CurDAG->getNode(SPUISD::ADD64_MARKER, OpVT, + Op.getOperand(0), Op.getOperand(1), + SDValue(CGLoad, 0))); + } else if (Opc == ISD::SUB && (OpVT == MVT::i64 || OpVT == MVT::v2i64)) { + SDNode *CGLoad = + emitBuildVector(SPU::getBorrowGenerateShufMask(*CurDAG)); + + return SelectCode(CurDAG->getNode(SPUISD::SUB64_MARKER, OpVT, + Op.getOperand(0), Op.getOperand(1), + SDValue(CGLoad, 0))); + } else if (Opc == ISD::MUL && (OpVT == MVT::i64 || OpVT == MVT::v2i64)) { + SDNode *CGLoad = + emitBuildVector(SPU::getCarryGenerateShufMask(*CurDAG)); + + return SelectCode(CurDAG->getNode(SPUISD::MUL64_MARKER, OpVT, + Op.getOperand(0), Op.getOperand(1), + SDValue(CGLoad, 0))); } else if (Opc == ISD::SHL) { if (OpVT == MVT::i64) { return SelectSHLi64(Op, OpVT); Modified: llvm/trunk/lib/Target/CellSPU/SPUISelLowering.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/CellSPU/SPUISelLowering.cpp?rev=62664&r1=62663&r2=62664&view=diff ============================================================================== --- llvm/trunk/lib/Target/CellSPU/SPUISelLowering.cpp (original) +++ llvm/trunk/lib/Target/CellSPU/SPUISelLowering.cpp Tue Jan 20 22:58:48 2009 @@ -92,6 +92,9 @@ setUseUnderscoreSetJmp(true); setUseUnderscoreLongJmp(true); + // Set RTLIB libcall names as used by SPU: + setLibcallName(RTLIB::DIV_F64, "__fast_divdf3"); + // Set up the SPU's register classes: addRegisterClass(MVT::i8, SPU::R8CRegisterClass); addRegisterClass(MVT::i16, SPU::R16CRegisterClass); @@ -183,6 +186,9 @@ setOperationAction(ISD::FCOPYSIGN, MVT::f64, Expand); setOperationAction(ISD::FCOPYSIGN, MVT::f32, Expand); + // Make sure that DAGCombine doesn't insert illegal 64-bit constants + setOperationAction(ISD::FABS, MVT::f64, Custom); + // SPU can do rotate right and left, so legalize it... but customize for i8 // because instructions don't exist. @@ -243,6 +249,7 @@ setOperationAction(ISD::SETCC, MVT::i16, Legal); setOperationAction(ISD::SETCC, MVT::i32, Legal); setOperationAction(ISD::SETCC, MVT::i64, Legal); + setOperationAction(ISD::SETCC, MVT::f64, Custom); // Custom lower i128 -> i64 truncates setOperationAction(ISD::TRUNCATE, MVT::i64, Custom); @@ -410,6 +417,9 @@ node_names[(unsigned) SPUISD::VEC_SRA] = "SPUISD::VEC_SRA"; node_names[(unsigned) SPUISD::VEC_ROTL] = "SPUISD::VEC_ROTL"; node_names[(unsigned) SPUISD::VEC_ROTR] = "SPUISD::VEC_ROTR"; + node_names[(unsigned) SPUISD::ROTBYTES_LEFT] = "SPUISD::ROTBYTES_LEFT"; + node_names[(unsigned) SPUISD::ROTBYTES_LEFT_BITS] = + "SPUISD::ROTBYTES_LEFT_BITS"; node_names[(unsigned) SPUISD::SELECT_MASK] = "SPUISD::SELECT_MASK"; node_names[(unsigned) SPUISD::SELB] = "SPUISD::SELB"; node_names[(unsigned) SPUISD::ADD64_MARKER] = "SPUISD::ADD64_MARKER"; @@ -1552,12 +1562,9 @@ return false; // Can't be a splat if two pieces don't match. } -// If this is a case we can't handle, return null and let the default -// expansion code take care of it. If we CAN select this case, and if it -// selects to a single instruction, return Op. Otherwise, if we can codegen -// this case more efficiently than a constant pool load, lower it to the -// sequence of ops that should be used. -static SDValue LowerBUILD_VECTOR(SDValue Op, SelectionDAG &DAG) { +//! Lower a BUILD_VECTOR instruction creatively: +SDValue +SPU::LowerBUILD_VECTOR(SDValue Op, SelectionDAG &DAG) { MVT VT = Op.getValueType(); // If this is a vector of constants or undefs, get the bits. A bit in // UndefBits is set if the corresponding element of the vector is an @@ -1575,6 +1582,11 @@ switch (VT.getSimpleVT()) { default: + cerr << "CellSPU: Unhandled VT in LowerBUILD_VECTOR, VT = " + << VT.getMVTString() + << "\n"; + abort(); + /*NOTREACHED*/ case MVT::v4f32: { uint32_t Value32 = SplatBits; assert(SplatSize == 4 @@ -2188,32 +2200,32 @@ //! Generate the carry-generate shuffle mask. SDValue SPU::getCarryGenerateShufMask(SelectionDAG &DAG) { -SmallVector ShufBytes; + SmallVector ShufBytes; -// Create the shuffle mask for "rotating" the borrow up one register slot -// once the borrow is generated. -ShufBytes.push_back(DAG.getConstant(0x04050607, MVT::i32)); -ShufBytes.push_back(DAG.getConstant(0x80808080, MVT::i32)); -ShufBytes.push_back(DAG.getConstant(0x0c0d0e0f, MVT::i32)); -ShufBytes.push_back(DAG.getConstant(0x80808080, MVT::i32)); + // Create the shuffle mask for "rotating" the borrow up one register slot + // once the borrow is generated. + ShufBytes.push_back(DAG.getConstant(0x04050607, MVT::i32)); + ShufBytes.push_back(DAG.getConstant(0x80808080, MVT::i32)); + ShufBytes.push_back(DAG.getConstant(0x0c0d0e0f, MVT::i32)); + ShufBytes.push_back(DAG.getConstant(0x80808080, MVT::i32)); -return DAG.getNode(ISD::BUILD_VECTOR, MVT::v4i32, - &ShufBytes[0], ShufBytes.size()); + return DAG.getNode(ISD::BUILD_VECTOR, MVT::v4i32, + &ShufBytes[0], ShufBytes.size()); } //! Generate the borrow-generate shuffle mask SDValue SPU::getBorrowGenerateShufMask(SelectionDAG &DAG) { -SmallVector ShufBytes; + SmallVector ShufBytes; -// Create the shuffle mask for "rotating" the borrow up one register slot -// once the borrow is generated. -ShufBytes.push_back(DAG.getConstant(0x04050607, MVT::i32)); -ShufBytes.push_back(DAG.getConstant(0xc0c0c0c0, MVT::i32)); -ShufBytes.push_back(DAG.getConstant(0x0c0d0e0f, MVT::i32)); -ShufBytes.push_back(DAG.getConstant(0xc0c0c0c0, MVT::i32)); + // Create the shuffle mask for "rotating" the borrow up one register slot + // once the borrow is generated. + ShufBytes.push_back(DAG.getConstant(0x04050607, MVT::i32)); + ShufBytes.push_back(DAG.getConstant(0xc0c0c0c0, MVT::i32)); + ShufBytes.push_back(DAG.getConstant(0x0c0d0e0f, MVT::i32)); + ShufBytes.push_back(DAG.getConstant(0xc0c0c0c0, MVT::i32)); -return DAG.getNode(ISD::BUILD_VECTOR, MVT::v4i32, - &ShufBytes[0], ShufBytes.size()); + return DAG.getNode(ISD::BUILD_VECTOR, MVT::v4i32, + &ShufBytes[0], ShufBytes.size()); } //! Lower byte immediate operations for v16i8 vectors: @@ -2372,6 +2384,83 @@ return SDValue(); } +//! Lower ISD::FABS +/*! + DAGCombine does the same basic reduction: convert the double to i64 and mask + off the sign bit. Unfortunately, DAGCombine inserts the i64 constant, which + CellSPU has to legalize. Hence, the custom lowering. + */ + +static SDValue LowerFABS(SDValue Op, SelectionDAG &DAG) { + MVT OpVT = Op.getValueType(); + MVT IntVT(MVT::i64); + SDValue Op0 = Op.getOperand(0); + + assert(OpVT == MVT::f64 && "LowerFABS: expecting MVT::f64!\n"); + + SDValue iABS = + DAG.getNode(ISD::AND, IntVT, + DAG.getNode(ISD::BIT_CONVERT, IntVT, Op0), + DAG.getConstant(~IntVT.getIntegerVTSignBit(), IntVT)); + + return DAG.getNode(ISD::BIT_CONVERT, MVT::f64, iABS); +} + +//! Lower ISD::SETCC +/*! + This handles MVT::f64 (double floating point) condition lowering + */ + +static SDValue LowerSETCC(SDValue Op, SelectionDAG &DAG, + const TargetLowering &TLI) { + SDValue lhs = Op.getOperand(0); + SDValue rhs = Op.getOperand(1); + CondCodeSDNode *CC = dyn_cast (Op.getOperand(2)); + MVT lhsVT = lhs.getValueType(); + SDValue posNaN = DAG.getConstant(0x7ff0000000000001ULL, MVT::i64); + + assert(CC != 0 && "LowerSETCC: CondCodeSDNode should not be null here!\n"); + assert(lhsVT == MVT::f64 && "LowerSETCC: type other than MVT::64\n"); + + switch (CC->get()) { + case ISD::SETOEQ: + case ISD::SETOGT: + case ISD::SETOGE: + case ISD::SETOLT: + case ISD::SETOLE: + case ISD::SETONE: + cerr << "CellSPU ISel Select: unimplemented f64 condition\n"; + abort(); + break; + case ISD::SETO: { + SDValue lhsfabs = DAG.getNode(ISD::FABS, MVT::f64, lhs); + SDValue i64lhs = + DAG.getNode(ISD::BIT_CONVERT, MVT::i64, lhsfabs); + + return DAG.getSetCC(MVT::i32, i64lhs, posNaN, ISD::SETLT); + } + case ISD::SETUO: { + SDValue lhsfabs = DAG.getNode(ISD::FABS, MVT::f64, lhs); + SDValue i64lhs = + DAG.getNode(ISD::BIT_CONVERT, MVT::i64, lhsfabs); + + return DAG.getSetCC(MVT::i32, i64lhs, posNaN, ISD::SETGE); + } + case ISD::SETUEQ: + case ISD::SETUGT: + case ISD::SETUGE: + case ISD::SETULT: + case ISD::SETULE: + case ISD::SETUNE: + default: + cerr << "CellSPU ISel Select: unimplemented f64 condition\n"; + abort(); + break; + } + + return SDValue(); +} + //! Lower ISD::SELECT_CC /*! ISD::SELECT_CC can (generally) be implemented directly on the SPU using the @@ -2501,9 +2590,12 @@ break; } + case ISD::FABS: + return LowerFABS(Op, DAG); + // Vector-related lowering. case ISD::BUILD_VECTOR: - return LowerBUILD_VECTOR(Op, DAG); + return SPU::LowerBUILD_VECTOR(Op, DAG); case ISD::SCALAR_TO_VECTOR: return LowerSCALAR_TO_VECTOR(Op, DAG); case ISD::VECTOR_SHUFFLE: @@ -2530,6 +2622,9 @@ case ISD::SELECT_CC: return LowerSELECT_CC(Op, DAG, *this); + case ISD::SETCC: + return LowerSETCC(Op, DAG, *this); + case ISD::TRUNCATE: return LowerTRUNCATE(Op, DAG); } @@ -2656,8 +2751,8 @@ } case SPUISD::IndirectAddr: { if (!ST->usingLargeMem() && Op0.getOpcode() == SPUISD::AFormAddr) { - ConstantSDNode *CN = cast(N->getOperand(1)); - if (CN->getZExtValue() == 0) { + ConstantSDNode *CN = dyn_cast(N->getOperand(1)); + if (CN != 0 && CN->getZExtValue() == 0) { // (SPUindirect (SPUaform , 0), 0) -> // (SPUaform , 0) @@ -2736,7 +2831,7 @@ break; } } - + // Otherwise, return unchanged. #ifndef NDEBUG if (Result.getNode()) { @@ -2809,41 +2904,18 @@ unsigned Depth ) const { #if 0 const uint64_t uint64_sizebits = sizeof(uint64_t) * 8; -#endif switch (Op.getOpcode()) { default: // KnownZero = KnownOne = APInt(Mask.getBitWidth(), 0); break; - -#if 0 case CALL: case SHUFB: case SHUFFLE_MASK: case CNTB: -#endif - - case SPUISD::PREFSLOT2VEC: { - SDValue Op0 = Op.getOperand(0); - MVT Op0VT = Op0.getValueType(); - unsigned Op0VTBits = Op0VT.getSizeInBits(); - uint64_t InMask = Op0VT.getIntegerVTBitMask(); - KnownZero |= APInt(Op0VTBits, ~InMask, false); - KnownOne |= APInt(Op0VTBits, InMask, false); - break; - } - + case SPUISD::PREFSLOT2VEC: case SPUISD::LDRESULT: - case SPUISD::VEC2PREFSLOT: { - MVT OpVT = Op.getValueType(); - unsigned OpVTBits = OpVT.getSizeInBits(); - uint64_t InMask = OpVT.getIntegerVTBitMask(); - KnownZero |= APInt(OpVTBits, ~InMask, false); - KnownOne |= APInt(OpVTBits, InMask, false); - break; - } - -#if 0 + case SPUISD::VEC2PREFSLOT: case SPUISD::SHLQUAD_L_BITS: case SPUISD::SHLQUAD_L_BYTES: case SPUISD::VEC_SHL: @@ -2854,8 +2926,8 @@ case SPUISD::ROTBYTES_LEFT: case SPUISD::SELECT_MASK: case SPUISD::SELB: -#endif } +#endif } unsigned Modified: llvm/trunk/lib/Target/CellSPU/SPUISelLowering.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/CellSPU/SPUISelLowering.h?rev=62664&r1=62663&r2=62664&view=diff ============================================================================== --- llvm/trunk/lib/Target/CellSPU/SPUISelLowering.h (original) +++ llvm/trunk/lib/Target/CellSPU/SPUISelLowering.h Tue Jan 20 22:58:48 2009 @@ -61,7 +61,7 @@ }; } - /// Predicates that are used for node matching: + //! Utility functions specific to CellSPU-only: namespace SPU { SDValue get_vec_u18imm(SDNode *N, SelectionDAG &DAG, MVT ValueType); @@ -78,6 +78,7 @@ SDValue LowerConstantPool(SDValue Op, SelectionDAG &DAG, const SPUTargetMachine &TM); + SDValue LowerBUILD_VECTOR(SDValue Op, SelectionDAG &DAG); SDValue getBorrowGenerateShufMask(SelectionDAG &DAG); SDValue getCarryGenerateShufMask(SelectionDAG &DAG); Modified: llvm/trunk/lib/Target/CellSPU/SPUInstrInfo.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/CellSPU/SPUInstrInfo.cpp?rev=62664&r1=62663&r2=62664&view=diff ============================================================================== --- llvm/trunk/lib/Target/CellSPU/SPUInstrInfo.cpp (original) +++ llvm/trunk/lib/Target/CellSPU/SPUInstrInfo.cpp Tue Jan 20 22:58:48 2009 @@ -134,6 +134,7 @@ case SPU::ORi64_v2i64: case SPU::ORf32_v4f32: case SPU::ORf64_v2f64: +/* case SPU::ORi128_r64: case SPU::ORi128_f64: case SPU::ORi128_r32: @@ -148,6 +149,8 @@ case SPU::ORr16_i128: case SPU::ORr8_i128: case SPU::ORvec_i128: +*/ +/* case SPU::ORr16_r32: case SPU::ORr8_r32: case SPU::ORr32_r16: @@ -158,7 +161,11 @@ case SPU::ORr64_r32: case SPU::ORr64_r16: case SPU::ORr64_r8: - { +*/ + case SPU::ORf32_r32: + case SPU::ORr32_f32: + case SPU::ORf64_r64: + case SPU::ORr64_f64: { assert(MI.getNumOperands() == 2 && MI.getOperand(0).isReg() && MI.getOperand(1).isReg() && Modified: llvm/trunk/lib/Target/CellSPU/SPUInstrInfo.td URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/CellSPU/SPUInstrInfo.td?rev=62664&r1=62663&r2=62664&view=diff ============================================================================== --- llvm/trunk/lib/Target/CellSPU/SPUInstrInfo.td (original) +++ llvm/trunk/lib/Target/CellSPU/SPUInstrInfo.td Tue Jan 20 22:58:48 2009 @@ -1259,9 +1259,6 @@ def fabs32: ANDInst<(outs R32FP:$rT), (ins R32FP:$rA, R32C:$rB), [/* Intentionally does not match a pattern */]>; - def fabs64: ANDInst<(outs R64FP:$rT), (ins R64FP:$rA, VECREG:$rB), - [/* Intentionally does not match a pattern */]>; - // Could use v4i32, but won't for clarity def fabsvec: ANDInst<(outs VECREG:$rT), (ins VECREG:$rA, VECREG:$rB), [/* Intentionally does not match a pattern */]>; @@ -1408,12 +1405,12 @@ // These are effectively no-ops, but need to exist for proper type conversion // and type coercion. -class ORCvtForm +class ORCvtForm pattern = [/* no pattern */]> : SPUInstr { bits<7> RA; bits<7> RT; - let Pattern = [/* no pattern */]; + let Pattern = pattern; let Inst{0-10} = 0b10000010000; let Inst{11-17} = RA; @@ -1427,29 +1424,29 @@ class ORExtractElt: ORCvtForm<(outs rclass:$rT), (ins VECREG:$rA)>; -class ORCvtRegGPRC: - ORCvtForm<(outs GPRC:$rT), (ins rclass:$rA)>; +/* class ORCvtRegGPRC: + ORCvtForm<(outs GPRC:$rT), (ins rclass:$rA)>; */ -class ORCvtVecGPRC: - ORCvtForm<(outs GPRC:$rT), (ins VECREG:$rA)>; +/* class ORCvtVecGPRC: + ORCvtForm<(outs GPRC:$rT), (ins VECREG:$rA)>; */ -class ORCvtGPRCReg: - ORCvtForm<(outs rclass:$rT), (ins GPRC:$rA)>; +/* class ORCvtGPRCReg: + ORCvtForm<(outs rclass:$rT), (ins GPRC:$rA)>; */ -class ORCvtFormR32Reg: - ORCvtForm<(outs rclass:$rT), (ins R32C:$rA)>; +class ORCvtFormR32Reg pattern = [ ]>: + ORCvtForm<(outs rclass:$rT), (ins R32C:$rA), pattern>; -class ORCvtFormRegR32: - ORCvtForm<(outs R32C:$rT), (ins rclass:$rA)>; +class ORCvtFormRegR32 pattern = [ ]>: + ORCvtForm<(outs R32C:$rT), (ins rclass:$rA), pattern>; -class ORCvtFormR64Reg: - ORCvtForm<(outs rclass:$rT), (ins R64C:$rA)>; +class ORCvtFormR64Reg pattern = [ ]>: + ORCvtForm<(outs rclass:$rT), (ins R64C:$rA), pattern>; -class ORCvtFormRegR64: - ORCvtForm<(outs R64C:$rT), (ins rclass:$rA)>; +class ORCvtFormRegR64 pattern = [ ]>: + ORCvtForm<(outs R64C:$rT), (ins rclass:$rA), pattern>; -class ORCvtGPRCVec: - ORCvtForm<(outs VECREG:$rT), (ins GPRC:$rA)>; +/* class ORCvtGPRCVec: + ORCvtForm<(outs VECREG:$rT), (ins GPRC:$rA)>; */ multiclass BitwiseOr { @@ -1468,10 +1465,11 @@ (v2f64 (bitconvert (or (v2i64 VECREG:$rA), (v2i64 VECREG:$rB)))))]>; - def r64: ORRegInst; - def r32: ORRegInst; - def r16: ORRegInst; - def r8: ORRegInst; + def r128: ORRegInst; + def r64: ORRegInst; + def r32: ORRegInst; + def r16: ORRegInst; + def r8: ORRegInst; // OR instructions used to copy f32 and f64 registers. def f32: ORInst<(outs R32FP:$rT), (ins R32FP:$rA, R32FP:$rB), @@ -1496,6 +1494,7 @@ def f32_v4f32: ORExtractElt; def f64_v2f64: ORExtractElt; +/* // Conversion from GPRC to register def i128_r64: ORCvtRegGPRC; def i128_f64: ORCvtRegGPRC; @@ -1517,7 +1516,8 @@ // Conversion from vector to GPRC def vec_i128: ORCvtGPRCVec; - +*/ +/* // Conversion from register to R32C: def r16_r32: ORCvtFormRegR32; def r8_r32: ORCvtFormRegR32; @@ -1535,6 +1535,18 @@ def r64_r32: ORCvtFormRegR64; def r64_r16: ORCvtFormRegR64; def r64_r8: ORCvtFormRegR64; +*/ + + // bitconvert patterns: + def r32_f32: ORCvtFormR32Reg; + def f32_r32: ORCvtFormRegR32; + + def r64_f64: ORCvtFormR64Reg; + def f64_r64: ORCvtFormRegR64; } defm OR : BitwiseOr; @@ -1960,7 +1972,7 @@ (v4f32 VECREG:$rB), (v4f32 VECREG:$rA)))]>; - // SELBr64_cond is defined further down, look for i64 comparisons + // SELBr64_cond is defined in SPU64InstrInfo.td def r32_cond: SELBRegCondInst; def f32_cond: SELBRegCondInst; def r16_cond: SELBRegCondInst; @@ -2146,14 +2158,6 @@ [(set (vectype VECREG:$rT), (SPUvec_shl (vectype VECREG:$rA), R16C:$rB))]>; -// $rB gets promoted to 32-bit register type when confronted with -// this llvm assembly code: -// -// define i16 @shlh_i16_1(i16 %arg1, i16 %arg2) { -// %A = shl i16 %arg1, %arg2 -// ret i16 %A -// } - multiclass ShiftLeftHalfword { def v8i16: SHLHVecInst; @@ -2250,6 +2254,10 @@ [(set (vectype VECREG:$rT), (SPUshlquad_l_bits (vectype VECREG:$rA), R32C:$rB))]>; +class SHLQBIRegInst: + SHLQBIInst<(outs rclass:$rT), (ins rclass:$rA, R32C:$rB), + [/* no pattern */]>; + multiclass ShiftLeftQuadByBits { def v16i8: SHLQBIVecInst; @@ -2258,6 +2266,8 @@ def v4f32: SHLQBIVecInst; def v2i64: SHLQBIVecInst; def v2f64: SHLQBIVecInst; + + def r128: SHLQBIRegInst; } defm SHLQBI : ShiftLeftQuadByBits; @@ -2335,6 +2345,32 @@ defm SHLQBYI : ShiftLeftQuadBytesImm; +class SHLQBYBIInst pattern>: + RRForm<0b00111001111, OOL, IOL, "shlqbybi\t$rT, $rA, $rB", + RotateShift, pattern>; + +class SHLQBYBIVecInst: + SHLQBYBIInst<(outs VECREG:$rT), (ins VECREG:$rA, R32C:$rB), + [/* no pattern */]>; + +class SHLQBYBIRegInst: + SHLQBYBIInst<(outs rclass:$rT), (ins rclass:$rA, R32C:$rB), + [/* no pattern */]>; + +multiclass ShiftLeftQuadBytesBitCount +{ + def v16i8: SHLQBYBIVecInst; + def v8i16: SHLQBYBIVecInst; + def v4i32: SHLQBYBIVecInst; + def v4f32: SHLQBYBIVecInst; + def v2i64: SHLQBYBIVecInst; + def v2f64: SHLQBYBIVecInst; + + def r128: SHLQBYBIRegInst; +} + +defm SHLQBYBI : ShiftLeftQuadBytesBitCount; + //-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~ // Rotate halfword: //-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~ @@ -4285,13 +4321,6 @@ (ANDfabsvec (v4f32 VECREG:$rA), (v4f32 (ANDBIv16i8 (FSMBIv16i8 0xffff), 0x7f)))>; -def : Pat<(fabs R64FP:$rA), - (ANDfabs64 R64FP:$rA, (ANDBIv16i8 (FSMBIv16i8 0xffff), 0x7f))>; - -def : Pat<(fabs (v2f64 VECREG:$rA)), - (ANDfabsvec (v2f64 VECREG:$rA), - (v2f64 (ANDBIv16i8 (FSMBIv16i8 0xffff), 0x7f)))>; - //===----------------------------------------------------------------------===// // Hint for branch instructions: //===----------------------------------------------------------------------===// Modified: llvm/trunk/test/CodeGen/CellSPU/fneg-fabs.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/CellSPU/fneg-fabs.ll?rev=62664&r1=62663&r2=62664&view=diff ============================================================================== --- llvm/trunk/test/CodeGen/CellSPU/fneg-fabs.ll (original) +++ llvm/trunk/test/CodeGen/CellSPU/fneg-fabs.ll Tue Jan 20 22:58:48 2009 @@ -1,9 +1,9 @@ ; RUN: llvm-as -o - %s | llc -march=cellspu > %t1.s -; RUN: grep fsmbi %t1.s | count 3 +; RUN: grep fsmbi %t1.s | count 2 ; RUN: grep 32768 %t1.s | count 2 ; RUN: grep xor %t1.s | count 4 -; RUN: grep and %t1.s | count 5 -; RUN: grep andbi %t1.s | count 3 +; RUN: grep and %t1.s | count 4 +; RUN: grep andbi %t1.s | count 2 target datalayout = "E-p:32:32:128-f64:64:128-f32:32:128-i64:32:128-i32:32:128-i16:16:128-i8:8:128-i1:8:128-a0:0:128-v128:128:128-s0:128:128" target triple = "spu" From sanjiv.gupta at microchip.com Tue Jan 20 23:44:05 2009 From: sanjiv.gupta at microchip.com (Sanjiv Gupta) Date: Wed, 21 Jan 2009 05:44:05 -0000 Subject: [llvm-commits] [llvm] r62665 - in /llvm/trunk/lib/Target/PIC16: PIC16.h PIC16ISelLowering.cpp PIC16ISelLowering.h PIC16InstrInfo.cpp PIC16InstrInfo.h Message-ID: <200901210544.n0L5i5GA017444@zion.cs.uiuc.edu> Author: sgupta Date: Tue Jan 20 23:44:05 2009 New Revision: 62665 URL: http://llvm.org/viewvc/llvm-project?rev=62665&view=rev Log: Implement LowerOperationWrapper for legalizer. Also a few signed comparison fixes. Modified: llvm/trunk/lib/Target/PIC16/PIC16.h llvm/trunk/lib/Target/PIC16/PIC16ISelLowering.cpp llvm/trunk/lib/Target/PIC16/PIC16ISelLowering.h llvm/trunk/lib/Target/PIC16/PIC16InstrInfo.cpp llvm/trunk/lib/Target/PIC16/PIC16InstrInfo.h Modified: llvm/trunk/lib/Target/PIC16/PIC16.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PIC16/PIC16.h?rev=62665&r1=62664&r2=62665&view=diff ============================================================================== --- llvm/trunk/lib/Target/PIC16/PIC16.h (original) +++ llvm/trunk/lib/Target/PIC16/PIC16.h Tue Jan 20 23:44:05 2009 @@ -31,7 +31,11 @@ LT, LE, GT, - GE + GE, + ULT, + UGT, + ULE, + UGE }; } @@ -41,12 +45,32 @@ case PIC16CC::NE: return "ne"; case PIC16CC::EQ: return "eq"; case PIC16CC::LT: return "lt"; + case PIC16CC::ULT: return "lt"; case PIC16CC::LE: return "le"; case PIC16CC::GT: return "gt"; + case PIC16CC::UGT: return "gt"; case PIC16CC::GE: return "ge"; } } + inline static bool isSignedComparison(PIC16CC::CondCodes CC) { + switch (CC) { + default: assert(0 && "Unknown condition code"); + case PIC16CC::NE: + case PIC16CC::EQ: + case PIC16CC::LT: + case PIC16CC::LE: + case PIC16CC::GE: + case PIC16CC::GT: + return true; + case PIC16CC::ULT: + case PIC16CC::UGT: + case PIC16CC::ULE: + case PIC16CC::UGE: + return false; // condition codes for unsigned comparison. + } + } + FunctionPass *createPIC16ISelDag(PIC16TargetMachine &TM); FunctionPass *createPIC16CodePrinterPass(raw_ostream &OS, Modified: llvm/trunk/lib/Target/PIC16/PIC16ISelLowering.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PIC16/PIC16ISelLowering.cpp?rev=62665&r1=62664&r2=62665&view=diff ============================================================================== --- llvm/trunk/lib/Target/PIC16/PIC16ISelLowering.cpp (original) +++ llvm/trunk/lib/Target/PIC16/PIC16ISelLowering.cpp Tue Jan 20 23:44:05 2009 @@ -41,21 +41,27 @@ setShiftAmountFlavor(Extend); // SRA library call names - setPIC16LibCallName(PIC16ISD::SRA_I8, "__intrinsics.sra.i8"); - setPIC16LibCallName(PIC16ISD::SRA_I16, "__intrinsics.sra.i16"); - setPIC16LibCallName(PIC16ISD::SRA_I32, "__intrinsics.sra.i32"); - - // SLL library call names - setPIC16LibCallName(PIC16ISD::SLL_I8, "__intrinsics.sll.i8"); - setPIC16LibCallName(PIC16ISD::SLL_I16, "__intrinsics.sll.i16"); - setPIC16LibCallName(PIC16ISD::SLL_I32, "__intrinsics.sll.i32"); + setPIC16LibcallName(PIC16ISD::SRA_I8, "__intrinsics.sra.i8"); + setLibcallName(RTLIB::SRA_I16, "__intrinsics.sra.i16"); + setLibcallName(RTLIB::SRA_I32, "__intrinsics.sra.i32"); + + // SHL library call names + setPIC16LibcallName(PIC16ISD::SLL_I8, "__intrinsics.sll.i8"); + setLibcallName(RTLIB::SHL_I16, "__intrinsics.sll.i16"); + setLibcallName(RTLIB::SHL_I32, "__intrinsics.sll.i32"); // SRL library call names - setPIC16LibCallName(PIC16ISD::SRL_I8, "__intrinsics.srl.i8"); - setPIC16LibCallName(PIC16ISD::SRL_I16, "__intrinsics.srl.i16"); - setPIC16LibCallName(PIC16ISD::SRL_I32, "__intrinsics.srl.i32"); + setPIC16LibcallName(PIC16ISD::SRL_I8, "__intrinsics.srl.i8"); + setLibcallName(RTLIB::SRL_I16, "__intrinsics.srl.i16"); + setLibcallName(RTLIB::SRL_I32, "__intrinsics.srl.i32"); + + // MUL Library call names + setPIC16LibcallName(PIC16ISD::MUL_I8, "__intrinsics.mul.i8"); + setLibcallName(RTLIB::MUL_I16, "__intrinsics.mul.i16"); + setLibcallName(RTLIB::MUL_I32, "__intrinsics.mul.i32"); setOperationAction(ISD::GlobalAddress, MVT::i16, Custom); + setOperationAction(ISD::ExternalSymbol, MVT::i16, Custom); setOperationAction(ISD::LOAD, MVT::i8, Legal); setOperationAction(ISD::LOAD, MVT::i16, Custom); @@ -69,7 +75,7 @@ setOperationAction(ISD::ADDC, MVT::i8, Custom); setOperationAction(ISD::SUBE, MVT::i8, Custom); setOperationAction(ISD::SUBC, MVT::i8, Custom); - setOperationAction(ISD::ADD, MVT::i8, Legal); + setOperationAction(ISD::ADD, MVT::i8, Custom); setOperationAction(ISD::ADD, MVT::i16, Custom); setOperationAction(ISD::OR, MVT::i8, Custom); @@ -80,16 +86,44 @@ setOperationAction(ISD::CALL, MVT::i16, Custom); setOperationAction(ISD::RET, MVT::Other, Custom); + setOperationAction(ISD::MUL, MVT::i8, Custom); + setOperationAction(ISD::MUL, MVT::i16, Expand); + setOperationAction(ISD::MUL, MVT::i32, Expand); + + setOperationAction(ISD::SMUL_LOHI, MVT::i8, Expand); + setOperationAction(ISD::SMUL_LOHI, MVT::i16, Expand); + setOperationAction(ISD::SMUL_LOHI, MVT::i32, Expand); + setOperationAction(ISD::UMUL_LOHI, MVT::i8, Expand); + setOperationAction(ISD::UMUL_LOHI, MVT::i16, Expand); + setOperationAction(ISD::UMUL_LOHI, MVT::i32, Expand); + setOperationAction(ISD::MULHU, MVT::i8, Expand); + setOperationAction(ISD::MULHU, MVT::i16, Expand); + setOperationAction(ISD::MULHU, MVT::i32, Expand); + setOperationAction(ISD::MULHS, MVT::i8, Expand); + setOperationAction(ISD::MULHS, MVT::i16, Expand); + setOperationAction(ISD::MULHS, MVT::i32, Expand); + setOperationAction(ISD::SRA, MVT::i8, Custom); - setOperationAction(ISD::SRA, MVT::i16, Custom); - setOperationAction(ISD::SRA, MVT::i32, Custom); + setOperationAction(ISD::SRA, MVT::i16, Expand); + setOperationAction(ISD::SRA, MVT::i32, Expand); + setOperationAction(ISD::SHL, MVT::i8, Custom); + setOperationAction(ISD::SHL, MVT::i16, Expand); + setOperationAction(ISD::SHL, MVT::i32, Expand); + setOperationAction(ISD::SRL, MVT::i8, Custom); + setOperationAction(ISD::SRL, MVT::i16, Expand); + setOperationAction(ISD::SRL, MVT::i32, Expand); + + // PIC16 does not support shift parts + setOperationAction(ISD::SRA_PARTS, MVT::i8, Expand); + setOperationAction(ISD::SRA_PARTS, MVT::i16, Expand); + setOperationAction(ISD::SRA_PARTS, MVT::i32, Expand); + setOperationAction(ISD::SHL_PARTS, MVT::i8, Expand); + setOperationAction(ISD::SHL_PARTS, MVT::i16, Expand); + setOperationAction(ISD::SHL_PARTS, MVT::i32, Expand); + setOperationAction(ISD::SRL_PARTS, MVT::i8, Expand); + setOperationAction(ISD::SRL_PARTS, MVT::i16, Expand); + setOperationAction(ISD::SRL_PARTS, MVT::i32, Expand); - setOperationAction(ISD::SHL, MVT::i8, Custom); - setOperationAction(ISD::SHL, MVT::i16, Custom); - setOperationAction(ISD::SHL, MVT::i32, Custom); - setOperationAction(ISD::SRL, MVT::i8, Custom); - setOperationAction(ISD::SRL, MVT::i16, Custom); - setOperationAction(ISD::SRL, MVT::i32, Custom); // PIC16 does not have a SETCC, expand it to SELECT_CC. setOperationAction(ISD::SETCC, MVT::i8, Expand); @@ -124,18 +158,18 @@ void -PIC16TargetLowering::setPIC16LibCallName(PIC16ISD::PIC16LibCall Call, +PIC16TargetLowering::setPIC16LibcallName(PIC16ISD::PIC16Libcall Call, const char *Name) { - PIC16LibCallNames[Call] = Name; + PIC16LibcallNames[Call] = Name; } const char * -PIC16TargetLowering::getPIC16LibCallName(PIC16ISD::PIC16LibCall Call) { - return PIC16LibCallNames[Call]; +PIC16TargetLowering::getPIC16LibcallName(PIC16ISD::PIC16Libcall Call) { + return PIC16LibcallNames[Call]; } SDValue -PIC16TargetLowering::MakePIC16LibCall(PIC16ISD::PIC16LibCall Call, +PIC16TargetLowering::MakePIC16Libcall(PIC16ISD::PIC16Libcall Call, MVT RetVT, const SDValue *Ops, unsigned NumOps, bool isSigned, SelectionDAG &DAG) { @@ -151,7 +185,7 @@ Entry.isZExt = !isSigned; Args.push_back(Entry); } - SDValue Callee = DAG.getExternalSymbol(getPIC16LibCallName(Call), MVT::i8); + SDValue Callee = DAG.getExternalSymbol(getPIC16LibcallName(Call), MVT::i8); const Type *RetTy = RetVT.getTypeForMVT(); std::pair CallInfo = @@ -247,15 +281,6 @@ case ISD::ADD: // Results.push_back(ExpandAdd(N, DAG)); return; - case ISD::SHL: - case ISD::SRL: - case ISD::SRA: - { - SDValue Res = ExpandShift(N, DAG); - if (Res.getNode()) - Results.push_back(Res); - return; - } case ISD::FrameIndex: Results.push_back(ExpandFrameIndex(N, DAG)); return; @@ -708,94 +733,64 @@ return DAG.getNode(ISD::MERGE_VALUES, Tys, BP, Chain); } -SDValue PIC16TargetLowering::ExpandShift(SDNode *N, SelectionDAG &DAG) { +SDValue PIC16TargetLowering::LowerShift(SDValue Op, SelectionDAG &DAG) { + // We should have handled larger operands in type legalizer itself. + assert (Op.getValueType() == MVT::i8 && "illegal shift to lower"); + + SDNode *N = Op.getNode(); SDValue Value = N->getOperand(0); SDValue Amt = N->getOperand(1); - SDValue BCF, BCFInput; - SDValue ShfCom; // Shift Component - Lo component should be shifted - SDValue RotCom; // Rotate Component- Hi component should be rotated - - PIC16ISD::PIC16LibCall CallCode; - - // Shift amount should be MVT::i8 only. If it is more than that then - // extract MVT::i8 from that - if (Amt.getValueType() == MVT::i8) { - // Do Nothing - This is ok - } else if (Amt.getValueType() == MVT::i16) { - SDValue Lo, Hi; - GetExpandedParts(Amt, DAG, Lo, Hi); - Amt = Lo; // Take the Lo part as amount - - } else if (Amt.getValueType() == MVT::i32) { - SDValue Lo, Hi; - // Get MVT::i16 Components - GetExpandedParts(Amt, DAG, Lo, Hi); - // Get MVT::i8 Components - GetExpandedParts(Lo, DAG, Lo, Hi); - Amt = Lo; - - } else { - assert ( 0 && "Invalid Shift amount"); - } - - // Shift library call will always have two operands - if (N->getValueType(0) == MVT::i8) { - switch (N->getOpcode()) { - case ISD::SRA: - CallCode = PIC16ISD::SRA_I8; - break; - case ISD::SHL: - CallCode = PIC16ISD::SLL_I8; - break; - case ISD::SRL: - CallCode = PIC16ISD::SRL_I8; - break; - default: - assert ( 0 && "This shift is not implemented yet."); - return SDValue(); - } - } else if (N->getValueType(0) == MVT::i16) { - switch (N->getOpcode()) { - case ISD::SRA: - CallCode = PIC16ISD::SRA_I16; - break; - case ISD::SHL: - CallCode = PIC16ISD::SLL_I16; - break; - case ISD::SRL: - CallCode = PIC16ISD::SRL_I16; - break; - default: - assert ( 0 && "This shift is not implemented yet."); - return SDValue(); - } - } else if (N->getValueType(0) == MVT::i32) { - switch (N->getOpcode()) { - case ISD::SRA: - CallCode = PIC16ISD::SRA_I32; - break; - case ISD::SHL: - CallCode = PIC16ISD::SLL_I32; - break; - case ISD::SRL: - CallCode = PIC16ISD::SRL_I32; - break; - default: - assert ( 0 && "This shift is not implemented yet."); - return SDValue(); - } - } else { - //assert ( 0 && "Shift for this value type not yet implemented."); + PIC16ISD::PIC16Libcall CallCode; + switch (N->getOpcode()) { + case ISD::SRA: + CallCode = PIC16ISD::SRA_I8; + break; + case ISD::SHL: + CallCode = PIC16ISD::SLL_I8; + break; + case ISD::SRL: + CallCode = PIC16ISD::SRL_I8; + break; + default: + assert ( 0 && "This shift is not implemented yet."); return SDValue(); } - SmallVector Ops(2); Ops[0] = Value; Ops[1] = Amt; - SDValue Call = MakePIC16LibCall(CallCode, N->getValueType(0), &Ops[0], 2, true, DAG); + SDValue Call = MakePIC16Libcall(CallCode, N->getValueType(0), &Ops[0], 2, true, DAG); return Call; } +void PIC16TargetLowering::LowerOperationWrapper(SDValue Op, + SmallVectorImpl&Results, + SelectionDAG &DAG) { + SDValue Res; + unsigned i; + switch (Op.getOpcode()) { + case ISD::FORMAL_ARGUMENTS: + Res = LowerFORMAL_ARGUMENTS(Op, DAG); break; + case ISD::LOAD: + Res = ExpandLoad(Op.getNode(), DAG); break; + case ISD::CALL: + Res = LowerCALL(Op, DAG); break; + default: { + // All other operations are handled in LowerOperation. + Res = LowerOperation(Op, DAG); + if (Res.getNode()) + Results.push_back(Res); + + return; + } + } + SDNode *N = Res.getNode(); + unsigned NumValues = N->getNumValues(); + for (i=0; i< NumValues ; i++) { + Results.push_back(SDValue(N, i)); + } + +} + SDValue PIC16TargetLowering::LowerOperation(SDValue Op, SelectionDAG &DAG) { switch (Op.getOpcode()) { case ISD::FORMAL_ARGUMENTS: @@ -815,14 +810,12 @@ case ISD::SHL: case ISD::SRA: case ISD::SRL: - return ExpandShift(Op.getNode(), DAG); + return LowerShift(Op, DAG); case ISD::OR: case ISD::AND: case ISD::XOR: return LowerBinOp(Op, DAG); case ISD::CALL: - // This is called only from LegalizeDAG. No call is made to - // legalize CALL node from LegalizeType. return LowerCALL(Op, DAG); case ISD::RET: return LowerRET(Op, DAG); @@ -1142,6 +1135,9 @@ else return DAG.getNode(Op.getOpcode(), Tys, Op.getOperand(MemOp ^ 1), NewVal); } + else if (Op.getOpcode() == ISD::ADD) { + return Op; + } else { return SDValue(); } @@ -1219,10 +1215,10 @@ case ISD::SETGE: return PIC16CC::GE; case ISD::SETLT: return PIC16CC::LT; case ISD::SETLE: return PIC16CC::LE; - case ISD::SETULT: return PIC16CC::LT; + case ISD::SETULT: return PIC16CC::ULT; case ISD::SETULE: return PIC16CC::LE; case ISD::SETUGE: return PIC16CC::GE; - case ISD::SETUGT: return PIC16CC::GT; + case ISD::SETUGT: return PIC16CC::UGT; } } @@ -1268,18 +1264,36 @@ case PIC16CC::GT: CondCode = PIC16CC::LT; break; + case PIC16CC::ULT: + CondCode = PIC16CC::UGT; + break; + case PIC16CC::UGT: + CondCode = PIC16CC::ULT; + break; case PIC16CC::GE: CondCode = PIC16CC::LE; break; case PIC16CC::LE: CondCode = PIC16CC::GE; break; + case PIC16CC::ULE: + CondCode = PIC16CC::UGE; + break; + case PIC16CC::UGE: + CondCode = PIC16CC::ULE; + break; } } PIC16CC = DAG.getConstant(CondCode, MVT::i8); SDVTList VTs = DAG.getVTList (MVT::i8, MVT::Flag); + // These are signed comparisons. + SDValue Mask = DAG.getConstant(128, MVT::i8); + if (isSignedComparison(CondCode)) { + LHS = DAG.getNode (ISD::XOR, MVT::i8, LHS, Mask); + RHS = DAG.getNode (ISD::XOR, MVT::i8, RHS, Mask); + } // We can use a subtract operation to set the condition codes. But // we need to put one operand in memory if required. // Nothing to do if the first operand is already a direct load and it has Modified: llvm/trunk/lib/Target/PIC16/PIC16ISelLowering.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PIC16/PIC16ISelLowering.h?rev=62665&r1=62664&r2=62665&view=diff ============================================================================== --- llvm/trunk/lib/Target/PIC16/PIC16ISelLowering.h (original) +++ llvm/trunk/lib/Target/PIC16/PIC16ISelLowering.h Tue Jan 20 23:44:05 2009 @@ -52,16 +52,11 @@ RAM_SPACE = 0, // RAM address space ROM_SPACE = 1 // ROM address space number is 1 }; - enum PIC16LibCall { + enum PIC16Libcall { + MUL_I8, SRA_I8, SLL_I8, SRL_I8, - SRA_I16, - SLL_I16, - SRL_I16, - SRA_I32, - SLL_I32, - SRL_I32, PIC16UnknownCall }; } @@ -79,8 +74,8 @@ virtual const char *getTargetNodeName(unsigned Opcode) const; /// getSetCCResultType - Return the ISD::SETCC ValueType virtual MVT getSetCCResultType(MVT ValType) const; - SDValue LowerOperation(SDValue Op, SelectionDAG &DAG); SDValue LowerFORMAL_ARGUMENTS(SDValue Op, SelectionDAG &DAG); + SDValue LowerShift(SDValue Op, SelectionDAG &DAG); SDValue LowerADD(SDValue Op, SelectionDAG &DAG); SDValue LowerSUB(SDValue Op, SelectionDAG &DAG); SDValue LowerBinOp(SDValue Op, SelectionDAG &DAG); @@ -98,15 +93,19 @@ MachineBasicBlock *MBB); + virtual SDValue LowerOperation(SDValue Op, SelectionDAG &DAG); virtual void ReplaceNodeResults(SDNode *N, SmallVectorImpl &Results, SelectionDAG &DAG); + virtual void LowerOperationWrapper(SDValue Op, + SmallVectorImpl &Results, + SelectionDAG &DAG); + SDValue ExpandStore(SDNode *N, SelectionDAG &DAG); SDValue ExpandLoad(SDNode *N, SelectionDAG &DAG); //SDValue ExpandAdd(SDNode *N, SelectionDAG &DAG); SDValue ExpandGlobalAddress(SDNode *N, SelectionDAG &DAG); SDValue ExpandExternalSymbol(SDNode *N, SelectionDAG &DAG); - SDValue ExpandShift(SDNode *N, SelectionDAG &DAG); SDValue ExpandFrameIndex(SDNode *N, SelectionDAG &DAG); SDValue PerformDAGCombine(SDNode *N, DAGCombinerInfo &DCI) const; @@ -159,15 +158,15 @@ // Extending the LIB Call framework of LLVM - // To hold the names of PIC16LibCalls - const char *PIC16LibCallNames[PIC16ISD::PIC16UnknownCall]; + // To hold the names of PIC16Libcalls + const char *PIC16LibcallNames[PIC16ISD::PIC16UnknownCall]; // To set and retrieve the lib call names - void setPIC16LibCallName(PIC16ISD::PIC16LibCall Call, const char *Name); - const char *getPIC16LibCallName(PIC16ISD::PIC16LibCall Call); + void setPIC16LibcallName(PIC16ISD::PIC16Libcall Call, const char *Name); + const char *getPIC16LibcallName(PIC16ISD::PIC16Libcall Call); - // Make PIC16 LibCall - SDValue MakePIC16LibCall(PIC16ISD::PIC16LibCall Call, MVT RetVT, + // Make PIC16 Libcall + SDValue MakePIC16Libcall(PIC16ISD::PIC16Libcall Call, MVT RetVT, const SDValue *Ops, unsigned NumOps, bool isSigned, SelectionDAG &DAG); Modified: llvm/trunk/lib/Target/PIC16/PIC16InstrInfo.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PIC16/PIC16InstrInfo.cpp?rev=62665&r1=62664&r2=62665&view=diff ============================================================================== --- llvm/trunk/lib/Target/PIC16/PIC16InstrInfo.cpp (original) +++ llvm/trunk/lib/Target/PIC16/PIC16InstrInfo.cpp Tue Jan 20 23:44:05 2009 @@ -138,9 +138,8 @@ } bool PIC16InstrInfo::isMoveInstr(const MachineInstr &MI, - unsigned &SrcReg, unsigned &DestReg, - unsigned &SrcSubIdx, unsigned &DstSubIdx) const { - SrcSubIdx = DstSubIdx = 0; // No sub-registers. + unsigned &SrcReg, + unsigned &DestReg) const { if (MI.getOpcode() == PIC16::copy_fsr || MI.getOpcode() == PIC16::copy_w) { Modified: llvm/trunk/lib/Target/PIC16/PIC16InstrInfo.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PIC16/PIC16InstrInfo.h?rev=62665&r1=62664&r2=62665&view=diff ============================================================================== --- llvm/trunk/lib/Target/PIC16/PIC16InstrInfo.h (original) +++ llvm/trunk/lib/Target/PIC16/PIC16InstrInfo.h Tue Jan 20 23:44:05 2009 @@ -61,8 +61,8 @@ const TargetRegisterClass *DestRC, const TargetRegisterClass *SrcRC) const; virtual bool isMoveInstr(const MachineInstr &MI, - unsigned &SrcReg, unsigned &DstReg, - unsigned &SrcSubIdx, unsigned &DstSubIdx) const; + unsigned &SrcReg, + unsigned &DestReg) const; }; From clattner at apple.com Wed Jan 21 00:28:10 2009 From: clattner at apple.com (Chris Lattner) Date: Tue, 20 Jan 2009 22:28:10 -0800 Subject: [llvm-commits] [llvm] r62555 - /llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp In-Reply-To: <200901200058.n0K0wtJV015379@zion.cs.uiuc.edu> References: <200901200058.n0K0wtJV015379@zion.cs.uiuc.edu> Message-ID: <175C9F4E-4F5A-4710-BC0B-5B1B6E227BE9@apple.com> On Jan 19, 2009, at 4:58 PM, Devang Patel wrote: > Author: dpatel > Date: Mon Jan 19 18:58:55 2009 > New Revision: 62555 > > URL: http://llvm.org/viewvc/llvm-project?rev=62555&view=rev > Log: > Do not use DenseMap because the iterator is invalidated while > constructing types. After all there was a reason why std::map was > used initially! Aha! Can you change the code to just not depend on this? In other words, instead of: DIE *&Entry = GVToDieMap[GV]; ... something that could invalidate Entry ... Entry = ... Just do: DIE *&Entry = GVToDieMap[GV]; ... something that could invalidate Entry ... GVToDieMap[GV] = ... ? DenseMap is much much faster for pointer pairs than std::map. -Chris > > > > Modified: > llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp > > Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp?rev=62555&r1=62554&r2=62555&view=diff > > = > = > = > = > = > = > = > = > ====================================================================== > --- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp (original) > +++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp Mon Jan 19 > 18:58:55 2009 > @@ -779,11 +779,11 @@ > > /// GVToDieMap - Tracks the mapping of unit level debug informaton > /// variables to debug information entries. > - DenseMap GVToDieMap; > + std::map GVToDieMap; > > /// GVToDIEntryMap - Tracks the mapping of unit level debug > informaton > /// descriptors to debug information entries using a DIEntry proxy. > - DenseMap GVToDIEntryMap; > + std::map GVToDIEntryMap; > > /// Globals - A map of globally visible named entities for this > unit. > /// > > > _______________________________________________ > llvm-commits mailing list > llvm-commits at cs.uiuc.edu > http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits From clattner at apple.com Wed Jan 21 00:39:11 2009 From: clattner at apple.com (Chris Lattner) Date: Tue, 20 Jan 2009 22:39:11 -0800 Subject: [llvm-commits] [llvm] r62572 - /llvm/trunk/test/CodeGen/X86/limited-prec.ll In-Reply-To: <200901200624.n0K6O0sv025809@zion.cs.uiuc.edu> References: <200901200624.n0K6O0sv025809@zion.cs.uiuc.edu> Message-ID: <4368A490-53C4-48F3-AEF8-2A897C5A423F@apple.com> On Jan 19, 2009, at 10:24 PM, Bill Wendling wrote: > Author: void > Date: Tue Jan 20 00:23:59 2009 > New Revision: 62572 > > URL: http://llvm.org/viewvc/llvm-project?rev=62572&view=rev > Log: > Testcase for limited precision stuff. Hi Bill, please run the testcase through simplifycfg + mem2reg to clean it up, unless you really want the unoptimized code. -Chris > > > Added: > llvm/trunk/test/CodeGen/X86/limited-prec.ll > > Added: llvm/trunk/test/CodeGen/X86/limited-prec.ll > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/limited-prec.ll?rev=62572&view=auto > > = > = > = > = > = > = > = > = > ====================================================================== > --- llvm/trunk/test/CodeGen/X86/limited-prec.ll (added) > +++ llvm/trunk/test/CodeGen/X86/limited-prec.ll Tue Jan 20 00:23:59 > 2009 > @@ -0,0 +1,133 @@ > +; RUN: llvm-as < %s | llc -limit-float-precision=6 -march=x86 | \ > +; RUN: not grep exp | not grep log | not grep pow > +; RUN: llvm-as < %s | llc -limit-float-precision=12 -march=x86 | \ > +; RUN: not grep exp | not grep log | not grep pow > +; RUN: llvm-as < %s | llc -limit-float-precision=18 -march=x86 | \ > +; RUN: not grep exp | not grep log | not grep pow > +target triple = "i386-apple-darwin9.5" > + > +define float @f1(float %x) nounwind noinline { > +entry: > + %x_addr = alloca float ; [#uses=2] > + %retval = alloca float ; [#uses=2] > + %0 = alloca float ; [#uses=2] > + %"alloca point" = bitcast i32 0 to i32 ; [#uses=0] > + store float %x, float* %x_addr > + %1 = load float* %x_addr, align 4 ; [#uses=1] > + %2 = call float @llvm.exp.f32(float %1) ; [#uses=1] > + store float %2, float* %0, align 4 > + %3 = load float* %0, align 4 ; [#uses=1] > + store float %3, float* %retval, align 4 > + br label %return > + > +return: ; preds = %entry > + %retval1 = load float* %retval ; [#uses=1] > + ret float %retval1 > +} > + > +declare float @llvm.exp.f32(float) nounwind readonly > + > +define float @f2(float %x) nounwind noinline { > +entry: > + %x_addr = alloca float ; [#uses=2] > + %retval = alloca float ; [#uses=2] > + %0 = alloca float ; [#uses=2] > + %"alloca point" = bitcast i32 0 to i32 ; [#uses=0] > + store float %x, float* %x_addr > + %1 = load float* %x_addr, align 4 ; [#uses=1] > + %2 = call float @llvm.exp2.f32(float %1) ; [#uses=1] > + store float %2, float* %0, align 4 > + %3 = load float* %0, align 4 ; [#uses=1] > + store float %3, float* %retval, align 4 > + br label %return > + > +return: ; preds = %entry > + %retval1 = load float* %retval ; [#uses=1] > + ret float %retval1 > +} > + > +declare float @llvm.exp2.f32(float) nounwind readonly > + > +define float @f3(float %x) nounwind noinline { > +entry: > + %x_addr = alloca float ; [#uses=2] > + %retval = alloca float ; [#uses=2] > + %0 = alloca float ; [#uses=2] > + %"alloca point" = bitcast i32 0 to i32 ; [#uses=0] > + store float %x, float* %x_addr > + %1 = load float* %x_addr, align 4 ; [#uses=1] > + %2 = call float @llvm.pow.f32(float 1.000000e+01, float %1) ; > [#uses=1] > + store float %2, float* %0, align 4 > + %3 = load float* %0, align 4 ; [#uses=1] > + store float %3, float* %retval, align 4 > + br label %return > + > +return: ; preds = %entry > + %retval1 = load float* %retval ; [#uses=1] > + ret float %retval1 > +} > + > +declare float @llvm.pow.f32(float, float) nounwind readonly > + > +define float @f4(float %x) nounwind noinline { > +entry: > + %x_addr = alloca float ; [#uses=2] > + %retval = alloca float ; [#uses=2] > + %0 = alloca float ; [#uses=2] > + %"alloca point" = bitcast i32 0 to i32 ; [#uses=0] > + store float %x, float* %x_addr > + %1 = load float* %x_addr, align 4 ; [#uses=1] > + %2 = call float @llvm.log.f32(float %1) ; [#uses=1] > + store float %2, float* %0, align 4 > + %3 = load float* %0, align 4 ; [#uses=1] > + store float %3, float* %retval, align 4 > + br label %return > + > +return: ; preds = %entry > + %retval1 = load float* %retval ; [#uses=1] > + ret float %retval1 > +} > + > +declare float @llvm.log.f32(float) nounwind readonly > + > +define float @f5(float %x) nounwind noinline { > +entry: > + %x_addr = alloca float ; [#uses=2] > + %retval = alloca float ; [#uses=2] > + %0 = alloca float ; [#uses=2] > + %"alloca point" = bitcast i32 0 to i32 ; [#uses=0] > + store float %x, float* %x_addr > + %1 = load float* %x_addr, align 4 ; [#uses=1] > + %2 = call float @llvm.log2.f32(float %1) ; [#uses=1] > + store float %2, float* %0, align 4 > + %3 = load float* %0, align 4 ; [#uses=1] > + store float %3, float* %retval, align 4 > + br label %return > + > +return: ; preds = %entry > + %retval1 = load float* %retval ; [#uses=1] > + ret float %retval1 > +} > + > +declare float @llvm.log2.f32(float) nounwind readonly > + > +define float @f6(float %x) nounwind noinline { > +entry: > + %x_addr = alloca float ; [#uses=2] > + %retval = alloca float ; [#uses=2] > + %0 = alloca float ; [#uses=2] > + %"alloca point" = bitcast i32 0 to i32 ; [#uses=0] > + store float %x, float* %x_addr > + %1 = load float* %x_addr, align 4 ; [#uses=1] > + %2 = call float @llvm.log10.f32(float %1) ; [#uses=1] > + store float %2, float* %0, align 4 > + %3 = load float* %0, align 4 ; [#uses=1] > + store float %3, float* %retval, align 4 > + br label %return > + > +return: ; preds = %entry > + %retval1 = load float* %retval ; [#uses=1] > + ret float %retval1 > +} > + > +declare float @llvm.log10.f32(float) nounwind readonly > > > _______________________________________________ > llvm-commits mailing list > llvm-commits at cs.uiuc.edu > http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits From clattner at apple.com Wed Jan 21 00:40:12 2009 From: clattner at apple.com (Chris Lattner) Date: Tue, 20 Jan 2009 22:40:12 -0800 Subject: [llvm-commits] [llvm] r62587 - /llvm/trunk/test/FrontendC/2009-01-20-k8.c In-Reply-To: <200901201808.n0KI8dXr026934@zion.cs.uiuc.edu> References: <200901201808.n0KI8dXr026934@zion.cs.uiuc.edu> Message-ID: <71BC5C23-9806-422E-922D-ED771CDECFB1@apple.com> On Jan 20, 2009, at 10:08 AM, Duncan Sands wrote: > Author: baldrick > Date: Tue Jan 20 12:08:39 2009 > New Revision: 62587 > > URL: http://llvm.org/viewvc/llvm-project?rev=62587&view=rev > Log: > Check that the "don't barf on k8" fix is not > accidentally reverted again. > Does this work when run on a ppc host? -Chris > Added: > llvm/trunk/test/FrontendC/2009-01-20-k8.c > > Added: llvm/trunk/test/FrontendC/2009-01-20-k8.c > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/FrontendC/2009-01-20-k8.c?rev=62587&view=auto > > = > = > = > = > = > = > = > = > ====================================================================== > --- llvm/trunk/test/FrontendC/2009-01-20-k8.c (added) > +++ llvm/trunk/test/FrontendC/2009-01-20-k8.c Tue Jan 20 12:08:39 2009 > @@ -0,0 +1,2 @@ > +// RUN: %llvmgcc %s -S -march=k8 > +long double x; > > > _______________________________________________ > llvm-commits mailing list > llvm-commits at cs.uiuc.edu > http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits From anton at korobeynikov.info Wed Jan 21 01:51:12 2009 From: anton at korobeynikov.info (Anton Korobeynikov) Date: Wed, 21 Jan 2009 10:51:12 +0300 Subject: [llvm-commits] [llvm] r62587 - /llvm/trunk/test/FrontendC/2009-01-20-k8.c In-Reply-To: <71BC5C23-9806-422E-922D-ED771CDECFB1@apple.com> References: <200901201808.n0KI8dXr026934@zion.cs.uiuc.edu> <71BC5C23-9806-422E-922D-ED771CDECFB1@apple.com> Message-ID: Hi, Chris > Does this work when run on a ppc host? The whole program is the follows: there is invalid -march processing logic in the apple gcc, so every x86 64 bit specified explicitly (e.g. k8, core2) will lead to invalid initialization of gcc's internal structures and lead, for example, to alignment of 4 of long double. There are two ways to check for this currently: 1. Feed empty file to fortran frontend (with march set to k8/core2), fortran fe constructs some aux trees during initialization and thus this will assert / ICE soon 2. Feed something using long double to C / C++ frontend. We really need some sort of test for this, otherwise I worry at some next merge the fix can be removed again. What if we just xfail it for everything non-x86 ? --- With best regards, Anton Korobeynikov Faculty of Mathematics and Mechanics, Saint Petersburg State University From baldrick at free.fr Wed Jan 21 01:56:45 2009 From: baldrick at free.fr (Duncan Sands) Date: Wed, 21 Jan 2009 08:56:45 +0100 Subject: [llvm-commits] [llvm] r62587 - /llvm/trunk/test/FrontendC/2009-01-20-k8.c In-Reply-To: <71BC5C23-9806-422E-922D-ED771CDECFB1@apple.com> References: <200901201808.n0KI8dXr026934@zion.cs.uiuc.edu> <71BC5C23-9806-422E-922D-ED771CDECFB1@apple.com> Message-ID: <200901210856.45303.baldrick@free.fr> > > Check that the "don't barf on k8" fix is not > > accidentally reverted again. > > > > Does this work when run on a ppc host? I don't know (I guess we'll soon find out!). It works on x86-32 which is already surprising to me. I guess it can be XFAIL'd on all platforms that are not x86 (or is it possible to say: XPASS on x86?). Ciao, Duncan. From clattner at apple.com Wed Jan 21 02:02:52 2009 From: clattner at apple.com (Chris Lattner) Date: Wed, 21 Jan 2009 00:02:52 -0800 Subject: [llvm-commits] [llvm] r62587 - /llvm/trunk/test/FrontendC/2009-01-20-k8.c In-Reply-To: References: <200901201808.n0KI8dXr026934@zion.cs.uiuc.edu> <71BC5C23-9806-422E-922D-ED771CDECFB1@apple.com> Message-ID: <5CEC139B-A5E7-4761-BC29-54916304EE24@apple.com> On Jan 20, 2009, at 11:51 PM, Anton Korobeynikov wrote: > Hi, Chris > >> Does this work when run on a ppc host? > The whole program is the follows: there is invalid -march processing > logic in the apple gcc, so every x86 64 bit specified explicitly (e.g. > k8, core2) will lead to invalid initialization of gcc's internal > structures and lead, for example, to alignment of 4 of long double. > There are two ways to check for this currently: > 1. Feed empty file to fortran frontend (with march set to k8/core2), > fortran fe constructs some aux trees during initialization and thus > this will assert / ICE soon > 2. Feed something using long double to C / C++ frontend. > > We really need some sort of test for this, otherwise I worry at some > next merge the fix can be removed again. What if we just xfail it for > everything non-x86 ? I'm fine with xfailing it everywhere else. I think it is unfortunate that stuff like this is so fragile :( -Chris From anton at korobeynikov.info Wed Jan 21 02:05:23 2009 From: anton at korobeynikov.info (Anton Korobeynikov) Date: Wed, 21 Jan 2009 11:05:23 +0300 Subject: [llvm-commits] [llvm] r62587 - /llvm/trunk/test/FrontendC/2009-01-20-k8.c In-Reply-To: <5CEC139B-A5E7-4761-BC29-54916304EE24@apple.com> References: <200901201808.n0KI8dXr026934@zion.cs.uiuc.edu> <71BC5C23-9806-422E-922D-ED771CDECFB1@apple.com> <5CEC139B-A5E7-4761-BC29-54916304EE24@apple.com> Message-ID: <2A977379-EF44-4AD1-B6DF-C645845BC32C@korobeynikov.info> Hi, Chris > I'm fine with xfailing it everywhere else. I think it is unfortunate > that stuff like this is so fragile :( PS: I believe the change should be pulled into the apple gcc as well, because currently it will fail the mentioned testcase :) --- With best regards, Anton Korobeynikov Faculty of Mathematics and Mechanics, Saint Petersburg State University From baldrick at free.fr Wed Jan 21 02:10:33 2009 From: baldrick at free.fr (Duncan Sands) Date: Wed, 21 Jan 2009 09:10:33 +0100 Subject: [llvm-commits] [llvm] r62587 - /llvm/trunk/test/FrontendC/2009-01-20-k8.c In-Reply-To: References: <200901201808.n0KI8dXr026934@zion.cs.uiuc.edu> <71BC5C23-9806-422E-922D-ED771CDECFB1@apple.com> Message-ID: <200901210910.33298.baldrick@free.fr> Hi, > The whole program is the follows: there is invalid -march processing > logic in the apple gcc, so every x86 64 bit specified explicitly (e.g. > k8, core2) will lead to invalid initialization of gcc's internal > structures and lead, for example, to alignment of 4 of long double. > There are two ways to check for this currently: > 1. Feed empty file to fortran frontend (with march set to k8/core2), > fortran fe constructs some aux trees during initialization and thus > this will assert / ICE soon > 2. Feed something using long double to C / C++ frontend. maybe the Apple gcc people should add the fix to their tree. Ciao, Duncan. From resistor at mac.com Wed Jan 21 02:18:04 2009 From: resistor at mac.com (Owen Anderson) Date: Wed, 21 Jan 2009 08:18:04 -0000 Subject: [llvm-commits] [llvm] r62678 - /llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp Message-ID: <200901210818.n0L8I4GX021665@zion.cs.uiuc.edu> Author: resistor Date: Wed Jan 21 02:18:03 2009 New Revision: 62678 URL: http://llvm.org/viewvc/llvm-project?rev=62678&view=rev Log: I accidentally removed this check in an earlier commit, which cause breakage in the pre alloc splitter. 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=62678&r1=62677&r2=62678&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp (original) +++ llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp Wed Jan 21 02:18:03 2009 @@ -1219,6 +1219,10 @@ MachineInstr *DefMI = (ValNo->def != ~0U) ? LIs->getInstructionFromIndex(ValNo->def) : NULL; + // If this would create a new join point, do not split. + if (DefMI && createsNewJoin(LR, DefMI->getParent(), Barrier->getParent())) + return false; + // Find all references in the barrier mbb. SmallPtrSet RefsInMBB; for (MachineRegisterInfo::reg_iterator I = MRI->reg_begin(CurrLI->reg), From baldrick at free.fr Wed Jan 21 02:36:14 2009 From: baldrick at free.fr (Duncan Sands) Date: Wed, 21 Jan 2009 09:36:14 +0100 Subject: [llvm-commits] Warnings in PIC16 build Message-ID: <200901210936.14610.baldrick@free.fr> Hi Sanjiv, my gcc gives: llvm[3]: Compiling PIC16AsmPrinter.cpp for Debug+Checks build In file included from llvm/lib/Target/PIC16/PIC16TargetMachine.h:18, from llvm/lib/Target/PIC16/PIC16AsmPrinter.h:19, from llvm/lib/Target/PIC16/PIC16AsmPrinter.cpp:15: llvm/include/llvm/Target/TargetInstrInfo.h:95: warning: ?virtual bool llvm::TargetInstrInfo::isMoveInstr(const llvm::MachineInstr&, unsigned int&, unsigned int&, unsigned int&, unsigned int&) const? was hidden llvm/lib/Target/PIC16/PIC16InstrInfo.h:65: warning: by ?virtual bool llvm::PIC16InstrInfo::isMoveInstr(const llvm::MachineInstr&, unsigned int&, unsigned int&) const? Ciao, Duncan. From baldrick at free.fr Wed Jan 21 03:00:30 2009 From: baldrick at free.fr (Duncan Sands) Date: Wed, 21 Jan 2009 09:00:30 -0000 Subject: [llvm-commits] [llvm] r62680 - in /llvm/trunk: include/llvm/Target/TargetLowering.h lib/CodeGen/SelectionDAG/LegalizeFloatTypes.cpp lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp lib/CodeGen/SelectionDAG/LegalizeTypes.cpp lib/CodeGen/SelectionDAG/LegalizeTypes.h lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp lib/Target/PIC16/PIC16ISelLowering.cpp lib/Target/PIC16/PIC16ISelLowering.h Message-ID: <200901210900.n0L90Ue4029744@zion.cs.uiuc.edu> Author: baldrick Date: Wed Jan 21 03:00:29 2009 New Revision: 62680 URL: http://llvm.org/viewvc/llvm-project?rev=62680&view=rev Log: Cleanup whitespace and comments, and tweak some prototypes, in operand type legalization. No functionality change. Modified: llvm/trunk/include/llvm/Target/TargetLowering.h llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeFloatTypes.cpp llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeTypes.h llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp llvm/trunk/lib/Target/PIC16/PIC16ISelLowering.cpp llvm/trunk/lib/Target/PIC16/PIC16ISelLowering.h Modified: llvm/trunk/include/llvm/Target/TargetLowering.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/TargetLowering.h?rev=62680&r1=62679&r2=62680&view=diff ============================================================================== --- llvm/trunk/include/llvm/Target/TargetLowering.h (original) +++ llvm/trunk/include/llvm/Target/TargetLowering.h Wed Jan 21 03:00:29 2009 @@ -1131,23 +1131,22 @@ return SDValue(); } - /// LowerOperationWrapper - This callback is invoked by the type legalizer - /// to legalize operation with illegal operand types but legal result types; + /// LowerOperationWrapper - This callback is invoked by the type legalizer + /// to legalize nodes with an illegal operand type but legal result types. /// It replaces the LowerOperation callback in the type Legalizer. - /// The reason we can not do away with LowerOperation entirely is that + /// The reason we can not do away with LowerOperation entirely is that /// LegalizeDAG isn't yet ready to use this callback. - - /// The target places new result values for the node in Results (their number - /// and types must exactly match those of the original return values of - /// the node), or leaves Results empty, which indicates that the node is not - /// to be custom lowered after all. - /// In its default implementation it calls the LowerOperation. + /// TODO: Consider merging with ReplaceNodeResults. - virtual void LowerOperationWrapper(SDValue Op, + /// The target places new result values for the node in Results (their number + /// and types must exactly match those of the original return values of + /// the node), or leaves Results empty, which indicates that the node is not + /// to be custom lowered after all. + /// The default implementation calls LowerOperation. + virtual void LowerOperationWrapper(SDNode *N, SmallVectorImpl &Results, SelectionDAG &DAG); - /// LowerOperation - This callback is invoked for operations that are /// unsupported by the target, which are registered to use 'custom' lowering, /// and whose defined values are all legal. Modified: llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeFloatTypes.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeFloatTypes.cpp?rev=62680&r1=62679&r2=62680&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeFloatTypes.cpp (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeFloatTypes.cpp Wed Jan 21 03:00:29 2009 @@ -722,7 +722,7 @@ Lo = Hi = SDValue(); // See if the target wants to custom expand this node. - if (CustomLowerResults(N, ResNo, true)) + if (CustomLowerResults(N, N->getValueType(ResNo), true)) return; 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=62680&r1=62679&r2=62680&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp Wed Jan 21 03:00:29 2009 @@ -31,10 +31,10 @@ /// expansion, we just know that (at least) one result needs promotion. void DAGTypeLegalizer::PromoteIntegerResult(SDNode *N, unsigned ResNo) { DEBUG(cerr << "Promote integer result: "; N->dump(&DAG); cerr << "\n"); - SDValue Result = SDValue(); + SDValue Res = SDValue(); // See if the target wants to custom expand this node. - if (CustomLowerResults(N, ResNo, true)) + if (CustomLowerResults(N, N->getValueType(ResNo), true)) return; switch (N->getOpcode()) { @@ -45,58 +45,58 @@ #endif assert(0 && "Do not know how to promote this operator!"); abort(); - case ISD::AssertSext: Result = PromoteIntRes_AssertSext(N); break; - case ISD::AssertZext: Result = PromoteIntRes_AssertZext(N); break; - case ISD::BIT_CONVERT: Result = PromoteIntRes_BIT_CONVERT(N); break; - case ISD::BSWAP: Result = PromoteIntRes_BSWAP(N); break; - case ISD::BUILD_PAIR: Result = PromoteIntRes_BUILD_PAIR(N); break; - case ISD::Constant: Result = PromoteIntRes_Constant(N); break; + case ISD::AssertSext: Res = PromoteIntRes_AssertSext(N); break; + case ISD::AssertZext: Res = PromoteIntRes_AssertZext(N); break; + case ISD::BIT_CONVERT: Res = PromoteIntRes_BIT_CONVERT(N); break; + case ISD::BSWAP: Res = PromoteIntRes_BSWAP(N); break; + case ISD::BUILD_PAIR: Res = PromoteIntRes_BUILD_PAIR(N); break; + case ISD::Constant: Res = PromoteIntRes_Constant(N); break; case ISD::CONVERT_RNDSAT: - Result = PromoteIntRes_CONVERT_RNDSAT(N); break; - case ISD::CTLZ: Result = PromoteIntRes_CTLZ(N); break; - case ISD::CTPOP: Result = PromoteIntRes_CTPOP(N); break; - case ISD::CTTZ: Result = PromoteIntRes_CTTZ(N); break; + Res = PromoteIntRes_CONVERT_RNDSAT(N); break; + case ISD::CTLZ: Res = PromoteIntRes_CTLZ(N); break; + case ISD::CTPOP: Res = PromoteIntRes_CTPOP(N); break; + case ISD::CTTZ: Res = PromoteIntRes_CTTZ(N); break; case ISD::EXTRACT_VECTOR_ELT: - Result = PromoteIntRes_EXTRACT_VECTOR_ELT(N); break; - case ISD::LOAD: Result = PromoteIntRes_LOAD(cast(N));break; - case ISD::SELECT: Result = PromoteIntRes_SELECT(N); break; - case ISD::SELECT_CC: Result = PromoteIntRes_SELECT_CC(N); break; - case ISD::SETCC: Result = PromoteIntRes_SETCC(N); break; - case ISD::SHL: Result = PromoteIntRes_SHL(N); break; + Res = PromoteIntRes_EXTRACT_VECTOR_ELT(N); break; + case ISD::LOAD: Res = PromoteIntRes_LOAD(cast(N));break; + case ISD::SELECT: Res = PromoteIntRes_SELECT(N); break; + case ISD::SELECT_CC: Res = PromoteIntRes_SELECT_CC(N); break; + case ISD::SETCC: Res = PromoteIntRes_SETCC(N); break; + case ISD::SHL: Res = PromoteIntRes_SHL(N); break; case ISD::SIGN_EXTEND_INREG: - Result = PromoteIntRes_SIGN_EXTEND_INREG(N); break; - case ISD::SRA: Result = PromoteIntRes_SRA(N); break; - case ISD::SRL: Result = PromoteIntRes_SRL(N); break; - case ISD::TRUNCATE: Result = PromoteIntRes_TRUNCATE(N); break; - case ISD::UNDEF: Result = PromoteIntRes_UNDEF(N); break; - case ISD::VAARG: Result = PromoteIntRes_VAARG(N); break; + Res = PromoteIntRes_SIGN_EXTEND_INREG(N); break; + case ISD::SRA: Res = PromoteIntRes_SRA(N); break; + case ISD::SRL: Res = PromoteIntRes_SRL(N); break; + case ISD::TRUNCATE: Res = PromoteIntRes_TRUNCATE(N); break; + case ISD::UNDEF: Res = PromoteIntRes_UNDEF(N); break; + case ISD::VAARG: Res = PromoteIntRes_VAARG(N); break; case ISD::SIGN_EXTEND: case ISD::ZERO_EXTEND: - case ISD::ANY_EXTEND: Result = PromoteIntRes_INT_EXTEND(N); break; + case ISD::ANY_EXTEND: Res = PromoteIntRes_INT_EXTEND(N); break; case ISD::FP_TO_SINT: - case ISD::FP_TO_UINT: Result = PromoteIntRes_FP_TO_XINT(N); break; + case ISD::FP_TO_UINT: Res = PromoteIntRes_FP_TO_XINT(N); break; case ISD::AND: case ISD::OR: case ISD::XOR: case ISD::ADD: case ISD::SUB: - case ISD::MUL: Result = PromoteIntRes_SimpleIntBinOp(N); break; + case ISD::MUL: Res = PromoteIntRes_SimpleIntBinOp(N); break; case ISD::SDIV: - case ISD::SREM: Result = PromoteIntRes_SDIV(N); break; + case ISD::SREM: Res = PromoteIntRes_SDIV(N); break; case ISD::UDIV: - case ISD::UREM: Result = PromoteIntRes_UDIV(N); break; + case ISD::UREM: Res = PromoteIntRes_UDIV(N); break; case ISD::SADDO: - case ISD::SSUBO: Result = PromoteIntRes_SADDSUBO(N, ResNo); break; + case ISD::SSUBO: Res = PromoteIntRes_SADDSUBO(N, ResNo); break; case ISD::UADDO: - case ISD::USUBO: Result = PromoteIntRes_UADDSUBO(N, ResNo); break; + case ISD::USUBO: Res = PromoteIntRes_UADDSUBO(N, ResNo); break; case ISD::SMULO: - case ISD::UMULO: Result = PromoteIntRes_XMULO(N, ResNo); break; + case ISD::UMULO: Res = PromoteIntRes_XMULO(N, ResNo); break; case ISD::ATOMIC_LOAD_ADD: case ISD::ATOMIC_LOAD_SUB: @@ -109,15 +109,15 @@ case ISD::ATOMIC_LOAD_UMIN: case ISD::ATOMIC_LOAD_UMAX: case ISD::ATOMIC_SWAP: - Result = PromoteIntRes_Atomic1(cast(N)); break; + Res = PromoteIntRes_Atomic1(cast(N)); break; case ISD::ATOMIC_CMP_SWAP: - Result = PromoteIntRes_Atomic2(cast(N)); break; + Res = PromoteIntRes_Atomic2(cast(N)); break; } - // If Result is null, the sub-method took care of registering the result. - if (Result.getNode()) - SetPromotedInteger(SDValue(N, ResNo), Result); + // If the result is null then the sub-method took care of registering it. + if (Res.getNode()) + SetPromotedInteger(SDValue(N, ResNo), Res); } SDValue DAGTypeLegalizer::PromoteIntRes_AssertSext(SDNode *N) { @@ -623,7 +623,7 @@ DEBUG(cerr << "Promote integer operand: "; N->dump(&DAG); cerr << "\n"); SDValue Res = SDValue(); - if (CustomLowerResults(N, OpNo, false)) + if (CustomLowerResults(N, N->getOperand(OpNo).getValueType(), false)) return false; switch (N->getOpcode()) { @@ -656,9 +656,9 @@ case ISD::UINT_TO_FP: Res = PromoteIntOp_UINT_TO_FP(N); break; case ISD::ZERO_EXTEND: Res = PromoteIntOp_ZERO_EXTEND(N); break; } - + // If the result is null, the sub-method took care of registering results etc. - if (! Res.getNode()) return false; + if (!Res.getNode()) return false; // If the result is N, the sub-method updated N in place. Tell the legalizer // core about this. @@ -918,7 +918,7 @@ Lo = Hi = SDValue(); // See if the target wants to custom expand this node. - if (CustomLowerResults(N, ResNo, true)) + if (CustomLowerResults(N, N->getValueType(ResNo), true)) return; switch (N->getOpcode()) { @@ -1848,7 +1848,7 @@ DEBUG(cerr << "Expand integer operand: "; N->dump(&DAG); cerr << "\n"); SDValue Res = SDValue(); - if (CustomLowerResults(N, OpNo, false)) + if (CustomLowerResults(N, N->getOperand(OpNo).getValueType(), false)) return false; switch (N->getOpcode()) { Modified: llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp?rev=62680&r1=62679&r2=62680&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp Wed Jan 21 03:00:29 2009 @@ -848,27 +848,23 @@ /// CustomLowerResults - Replace the node's results with custom code provided /// by the target and return "true", or do nothing and return "false". -/// The last parameter is FALSE if we are dealing with a node with legal +/// The last parameter is FALSE if we are dealing with a node with legal /// result types and illegal operand. The second parameter denotes the illegal /// OperandNo in that case. /// The last parameter being TRUE means we are dealing with a -/// node with illegal result types. The second parameter denotes the illegal +/// node with illegal result types. The second parameter denotes the illegal /// ResNo in that case. -bool DAGTypeLegalizer::CustomLowerResults(SDNode *N, unsigned Num, +bool DAGTypeLegalizer::CustomLowerResults(SDNode *N, MVT VT, bool LegalizeResult) { - // Get the type of illegal Result or Operand. - MVT ValueTy = (LegalizeResult) ? N->getValueType(Num) - : N->getOperand(Num).getValueType(); - // See if the target wants to custom lower this node. - if (TLI.getOperationAction(N->getOpcode(), ValueTy) != TargetLowering::Custom) + if (TLI.getOperationAction(N->getOpcode(), VT) != TargetLowering::Custom) return false; SmallVector Results; if (LegalizeResult) TLI.ReplaceNodeResults(N, Results, DAG); else - TLI.LowerOperationWrapper(SDValue(N, 0), Results, DAG); + TLI.LowerOperationWrapper(N, Results, DAG); if (Results.empty()) // The target didn't want to custom lower it after all. Modified: llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeTypes.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeTypes.h?rev=62680&r1=62679&r2=62680&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeTypes.h (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeTypes.h Wed Jan 21 03:00:29 2009 @@ -191,7 +191,7 @@ // Common routines. SDValue BitConvertToInteger(SDValue Op); SDValue CreateStackStoreLoad(SDValue Op, MVT DestVT); - bool CustomLowerResults(SDNode *N, unsigned ResNo, bool LegalizeResult); + bool CustomLowerResults(SDNode *N, MVT VT, bool LegalizeResult); SDValue GetVectorElementPointer(SDValue VecPtr, MVT EltVT, SDValue Index); SDValue JoinIntegers(SDValue Lo, SDValue Hi); SDValue LibCallify(RTLIB::Libcall LC, SDNode *N, bool isSigned); Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp?rev=62680&r1=62679&r2=62680&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp Wed Jan 21 03:00:29 2009 @@ -5568,11 +5568,10 @@ return std::make_pair(Res, Chain); } -void TargetLowering::LowerOperationWrapper(SDValue Op, - SmallVectorImpl &Results, - SelectionDAG &DAG) { - SDValue Res; - Res = LowerOperation(Op, DAG); +void TargetLowering::LowerOperationWrapper(SDNode *N, + SmallVectorImpl &Results, + SelectionDAG &DAG) { + SDValue Res = LowerOperation(SDValue(N, 0), DAG); if (Res.getNode()) Results.push_back(Res); } Modified: llvm/trunk/lib/Target/PIC16/PIC16ISelLowering.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PIC16/PIC16ISelLowering.cpp?rev=62680&r1=62679&r2=62680&view=diff ============================================================================== --- llvm/trunk/lib/Target/PIC16/PIC16ISelLowering.cpp (original) +++ llvm/trunk/lib/Target/PIC16/PIC16ISelLowering.cpp Wed Jan 21 03:00:29 2009 @@ -762,9 +762,11 @@ return Call; } -void PIC16TargetLowering::LowerOperationWrapper(SDValue Op, - SmallVectorImpl&Results, - SelectionDAG &DAG) { +void +PIC16TargetLowering::LowerOperationWrapper(SDNode *N, + SmallVectorImpl&Results, + SelectionDAG &DAG) { + SDValue Op = SDValue(N, 0); SDValue Res; unsigned i; switch (Op.getOpcode()) { @@ -783,12 +785,12 @@ return; } } - SDNode *N = Res.getNode(); + + N = Res.getNode(); unsigned NumValues = N->getNumValues(); - for (i=0; i< NumValues ; i++) { + for (i = 0; i < NumValues ; i++) { Results.push_back(SDValue(N, i)); } - } SDValue PIC16TargetLowering::LowerOperation(SDValue Op, SelectionDAG &DAG) { Modified: llvm/trunk/lib/Target/PIC16/PIC16ISelLowering.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PIC16/PIC16ISelLowering.h?rev=62680&r1=62679&r2=62680&view=diff ============================================================================== --- llvm/trunk/lib/Target/PIC16/PIC16ISelLowering.h (original) +++ llvm/trunk/lib/Target/PIC16/PIC16ISelLowering.h Wed Jan 21 03:00:29 2009 @@ -97,9 +97,9 @@ virtual void ReplaceNodeResults(SDNode *N, SmallVectorImpl &Results, SelectionDAG &DAG); - virtual void LowerOperationWrapper(SDValue Op, - SmallVectorImpl &Results, - SelectionDAG &DAG); + virtual void LowerOperationWrapper(SDNode *N, + SmallVectorImpl &Results, + SelectionDAG &DAG); SDValue ExpandStore(SDNode *N, SelectionDAG &DAG); SDValue ExpandLoad(SDNode *N, SelectionDAG &DAG); From sanjiv.gupta at microchip.com Wed Jan 21 03:02:47 2009 From: sanjiv.gupta at microchip.com (Sanjiv Gupta) Date: Wed, 21 Jan 2009 09:02:47 -0000 Subject: [llvm-commits] [llvm] r62681 - in /llvm/trunk/lib/Target/PIC16: PIC16InstrInfo.cpp PIC16InstrInfo.h Message-ID: <200901210902.n0L92mvF030145@zion.cs.uiuc.edu> Author: sgupta Date: Wed Jan 21 03:02:46 2009 New Revision: 62681 URL: http://llvm.org/viewvc/llvm-project?rev=62681&view=rev Log: Fixed build warnings. Restoring changes done in 62600, they were lost in 62655. Modified: llvm/trunk/lib/Target/PIC16/PIC16InstrInfo.cpp llvm/trunk/lib/Target/PIC16/PIC16InstrInfo.h Modified: llvm/trunk/lib/Target/PIC16/PIC16InstrInfo.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PIC16/PIC16InstrInfo.cpp?rev=62681&r1=62680&r2=62681&view=diff ============================================================================== --- llvm/trunk/lib/Target/PIC16/PIC16InstrInfo.cpp (original) +++ llvm/trunk/lib/Target/PIC16/PIC16InstrInfo.cpp Wed Jan 21 03:02:46 2009 @@ -138,8 +138,9 @@ } bool PIC16InstrInfo::isMoveInstr(const MachineInstr &MI, - unsigned &SrcReg, - unsigned &DestReg) const { + unsigned &SrcReg, unsigned &DestReg, + unsigned &SrcSubIdx, unsigned &DstSubIdx) const { + SrcSubIdx = DstSubIdx = 0; // No sub-registers. if (MI.getOpcode() == PIC16::copy_fsr || MI.getOpcode() == PIC16::copy_w) { Modified: llvm/trunk/lib/Target/PIC16/PIC16InstrInfo.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PIC16/PIC16InstrInfo.h?rev=62681&r1=62680&r2=62681&view=diff ============================================================================== --- llvm/trunk/lib/Target/PIC16/PIC16InstrInfo.h (original) +++ llvm/trunk/lib/Target/PIC16/PIC16InstrInfo.h Wed Jan 21 03:02:46 2009 @@ -61,8 +61,8 @@ const TargetRegisterClass *DestRC, const TargetRegisterClass *SrcRC) const; virtual bool isMoveInstr(const MachineInstr &MI, - unsigned &SrcReg, - unsigned &DestReg) const; + unsigned &SrcReg, unsigned &DstReg, + unsigned &SrcSubIdx, unsigned &DstSubIdx) const; }; From Sanjiv.Gupta at microchip.com Wed Jan 21 03:07:57 2009 From: Sanjiv.Gupta at microchip.com (Sanjiv.Gupta at microchip.com) Date: Wed, 21 Jan 2009 02:07:57 -0700 Subject: [llvm-commits] Warnings in PIC16 build References: <200901210936.14610.baldrick@free.fr> Message-ID: Thanks. I fixed them in 62681. -----Original Message----- From: Duncan Sands [mailto:baldrick at free.fr] Sent: Wed 1/21/2009 2:06 PM To: Sanjiv Kumar Gupta - I00171 Cc: llvm-commits at cs.uiuc.edu Subject: Warnings in PIC16 build Hi Sanjiv, my gcc gives: llvm[3]: Compiling PIC16AsmPrinter.cpp for Debug+Checks build In file included from llvm/lib/Target/PIC16/PIC16TargetMachine.h:18, from llvm/lib/Target/PIC16/PIC16AsmPrinter.h:19, from llvm/lib/Target/PIC16/PIC16AsmPrinter.cpp:15: llvm/include/llvm/Target/TargetInstrInfo.h:95: warning: 'virtual bool llvm::TargetInstrInfo::isMoveInstr(const llvm::MachineInstr&, unsigned int&, unsigned int&, unsigned int&, unsigned int&) const' was hidden llvm/lib/Target/PIC16/PIC16InstrInfo.h:65: warning: by 'virtual bool llvm::PIC16InstrInfo::isMoveInstr(const llvm::MachineInstr&, unsigned int&, unsigned int&) const' Ciao, Duncan. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20090121/e25b571a/attachment.html From baldrick at free.fr Wed Jan 21 03:41:49 2009 From: baldrick at free.fr (Duncan Sands) Date: Wed, 21 Jan 2009 09:41:49 -0000 Subject: [llvm-commits] [llvm] r62682 - /llvm/trunk/test/CodeGen/CellSPU/shift_ops.ll Message-ID: <200901210941.n0L9fpO0001282@zion.cs.uiuc.edu> Author: baldrick Date: Wed Jan 21 03:41:42 2009 New Revision: 62682 URL: http://llvm.org/viewvc/llvm-project?rev=62682&view=rev Log: Don't rely on grep -w working. Modified: llvm/trunk/test/CodeGen/CellSPU/shift_ops.ll Modified: llvm/trunk/test/CodeGen/CellSPU/shift_ops.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/CellSPU/shift_ops.ll?rev=62682&r1=62681&r2=62682&view=diff ============================================================================== --- llvm/trunk/test/CodeGen/CellSPU/shift_ops.ll (original) +++ llvm/trunk/test/CodeGen/CellSPU/shift_ops.ll Wed Jan 21 03:41:42 2009 @@ -1,20 +1,20 @@ ; RUN: llvm-as -o - %s | llc -march=cellspu > %t1.s -; RUN: grep -w shlh %t1.s | count 9 -; RUN: grep -w shlhi %t1.s | count 3 -; RUN: grep -w shl %t1.s | count 9 -; RUN: grep -w shli %t1.s | count 3 -; RUN: grep -w xshw %t1.s | count 5 -; RUN: grep -w and %t1.s | count 5 -; RUN: grep -w andi %t1.s | count 2 -; RUN: grep -w rotmi %t1.s | count 2 -; RUN: grep -w rotqmbyi %t1.s | count 1 -; RUN: grep -w rotqmbii %t1.s | count 2 -; RUN: grep -w rotqmby %t1.s | count 1 -; RUN: grep -w rotqmbi %t1.s | count 1 -; RUN: grep -w rotqbyi %t1.s | count 1 -; RUN: grep -w rotqbii %t1.s | count 2 -; RUN: grep -w rotqbybi %t1.s | count 1 -; RUN: grep -w sfi %t1.s | count 3 +; RUN: grep {shlh } %t1.s | count 9 +; RUN: grep {shlhi } %t1.s | count 3 +; RUN: grep {shl } %t1.s | count 9 +; RUN: grep {shli } %t1.s | count 3 +; RUN: grep {xshw } %t1.s | count 5 +; RUN: grep {and } %t1.s | count 5 +; RUN: grep {andi } %t1.s | count 2 +; RUN: grep {rotmi } %t1.s | count 2 +; RUN: grep {rotqmbyi } %t1.s | count 1 +; RUN: grep {rotqmbii } %t1.s | count 2 +; RUN: grep {rotqmby } %t1.s | count 1 +; RUN: grep {rotqmbi } %t1.s | count 1 +; RUN: grep {rotqbyi } %t1.s | count 1 +; RUN: grep {rotqbii } %t1.s | count 2 +; RUN: grep {rotqbybi } %t1.s | count 1 +; RUN: grep {sfi } %t1.s | count 3 target datalayout = "E-p:32:32:128-f64:64:128-f32:32:128-i64:32:128-i32:32:128-i16:16:128-i8:8:128-i1:8:128-a0:0:128-v128:128:128-s0:128:128" target triple = "spu" From baldrick at free.fr Wed Jan 21 05:37:39 2009 From: baldrick at free.fr (Duncan Sands) Date: Wed, 21 Jan 2009 11:37:39 -0000 Subject: [llvm-commits] [llvm] r62683 - in /llvm/trunk/test: CodeGen/Generic/2008-07-29-EHLabel.ll FrontendC/2008-07-29-EHLabel.ll Message-ID: <200901211137.n0LBbeNQ008600@zion.cs.uiuc.edu> Author: baldrick Date: Wed Jan 21 05:37:31 2009 New Revision: 62683 URL: http://llvm.org/viewvc/llvm-project?rev=62683&view=rev Log: Let's try to have our cake and eat it to: move this test into FrontendC to ensure that llvm-gcc is available; assemble using "llvm-gcc -xassembler" rather than "as". Added: llvm/trunk/test/FrontendC/2008-07-29-EHLabel.ll (props changed) - copied unchanged from r59640, llvm/trunk/test/CodeGen/Generic/2008-07-29-EHLabel.ll Removed: llvm/trunk/test/CodeGen/Generic/2008-07-29-EHLabel.ll Removed: llvm/trunk/test/CodeGen/Generic/2008-07-29-EHLabel.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Generic/2008-07-29-EHLabel.ll?rev=62682&view=auto ============================================================================== --- llvm/trunk/test/CodeGen/Generic/2008-07-29-EHLabel.ll (original) +++ llvm/trunk/test/CodeGen/Generic/2008-07-29-EHLabel.ll (removed) @@ -1,282 +0,0 @@ -; RUN: llvm-as < %s | llc -; PR2609 - %struct..0._11 = type { i32 } - %struct..1__pthread_mutex_s = type { i32, i32, i32, i32, i32, %struct..0._11 } - %struct.pthread_attr_t = type { i32, [32 x i8] } - %struct.pthread_mutex_t = type { %struct..1__pthread_mutex_s } - %"struct.std::__ctype_abstract_base" = type { %"struct.std::locale::facet" } - %"struct.std::basic_ios >" = type { %"struct.std::ios_base", %"struct.std::basic_ostream >"*, i8, i8, %"struct.std::basic_streambuf >"*, %"struct.std::ctype"*, %"struct.std::__ctype_abstract_base"*, %"struct.std::__ctype_abstract_base"* } - %"struct.std::basic_istream >" = type { i32 (...)**, i32, %"struct.std::basic_ios >" } - %"struct.std::basic_istream >::sentry" = type { i8 } - %"struct.std::basic_ostream >" = type { i32 (...)**, %"struct.std::basic_ios >" } - %"struct.std::basic_streambuf >" = type { i32 (...)**, i8*, i8*, i8*, i8*, i8*, i8*, %"struct.std::locale" } - %"struct.std::ctype" = type { %"struct.std::locale::facet", i32*, i8, i32*, i32*, i16*, i8, [256 x i8], [256 x i8], i8 } - %"struct.std::ios_base" = type { i32 (...)**, i32, i32, i32, i32, i32, %"struct.std::ios_base::_Callback_list"*, %"struct.std::ios_base::_Words", [8 x %"struct.std::ios_base::_Words"], i32, %"struct.std::ios_base::_Words"*, %"struct.std::locale" } - %"struct.std::ios_base::_Callback_list" = type { %"struct.std::ios_base::_Callback_list"*, void (i32, %"struct.std::ios_base"*, i32)*, i32, i32 } - %"struct.std::ios_base::_Words" = type { i8*, i32 } - %"struct.std::locale" = type { %"struct.std::locale::_Impl"* } - %"struct.std::locale::_Impl" = type { i32, %"struct.std::locale::facet"**, i32, %"struct.std::locale::facet"**, i8** } - %"struct.std::locale::facet" = type { i32 (...)**, i32 } - - at _ZL20__gthrw_pthread_oncePiPFvvE = alias weak i32 (i32*, void ()*)* @pthread_once ; [#uses=0] - at _ZL27__gthrw_pthread_getspecificj = alias weak i8* (i32)* @pthread_getspecific ; [#uses=0] - at _ZL27__gthrw_pthread_setspecificjPKv = alias weak i32 (i32, i8*)* @pthread_setspecific ; [#uses=0] - at _ZL22__gthrw_pthread_createPmPK14pthread_attr_tPFPvS3_ES3_ = alias weak i32 (i32*, %struct.pthread_attr_t*, i8* (i8*)*, i8*)* @pthread_create ; [#uses=0] - at _ZL22__gthrw_pthread_cancelm = alias weak i32 (i32)* @pthread_cancel ; [#uses=0] - at _ZL26__gthrw_pthread_mutex_lockP15pthread_mutex_t = alias weak i32 (%struct.pthread_mutex_t*)* @pthread_mutex_lock ; [#uses=0] - at _ZL29__gthrw_pthread_mutex_trylockP15pthread_mutex_t = alias weak i32 (%struct.pthread_mutex_t*)* @pthread_mutex_trylock ; [#uses=0] - at _ZL28__gthrw_pthread_mutex_unlockP15pthread_mutex_t = alias weak i32 (%struct.pthread_mutex_t*)* @pthread_mutex_unlock ; [#uses=0] - at _ZL26__gthrw_pthread_mutex_initP15pthread_mutex_tPK19pthread_mutexattr_t = alias weak i32 (%struct.pthread_mutex_t*, %struct..0._11*)* @pthread_mutex_init ; [#uses=0] - at _ZL26__gthrw_pthread_key_createPjPFvPvE = alias weak i32 (i32*, void (i8*)*)* @pthread_key_create ; [#uses=0] - at _ZL26__gthrw_pthread_key_deletej = alias weak i32 (i32)* @pthread_key_delete ; [#uses=0] - at _ZL30__gthrw_pthread_mutexattr_initP19pthread_mutexattr_t = alias weak i32 (%struct..0._11*)* @pthread_mutexattr_init ; [#uses=0] - at _ZL33__gthrw_pthread_mutexattr_settypeP19pthread_mutexattr_ti = alias weak i32 (%struct..0._11*, i32)* @pthread_mutexattr_settype ; [#uses=0] - at _ZL33__gthrw_pthread_mutexattr_destroyP19pthread_mutexattr_t = alias weak i32 (%struct..0._11*)* @pthread_mutexattr_destroy ; [#uses=0] - -define %"struct.std::basic_istream >"* @_ZNSi7getlineEPcic(%"struct.std::basic_istream >"* %this, i8* %__s, i32 %__n, i8 signext %__delim) { -entry: - %__cerb = alloca %"struct.std::basic_istream >::sentry" ; <%"struct.std::basic_istream >::sentry"*> [#uses=2] - getelementptr %"struct.std::basic_istream >"* %this, i32 0, i32 1 ; :0 [#uses=7] - store i32 0, i32* %0, align 4 - call void @_ZNSi6sentryC1ERSib( %"struct.std::basic_istream >::sentry"* %__cerb, %"struct.std::basic_istream >"* %this, i8 zeroext 1 ) - getelementptr %"struct.std::basic_istream >::sentry"* %__cerb, i32 0, i32 0 ; :1 [#uses=1] - load i8* %1, align 8 ; :2 [#uses=1] - %toBool = icmp eq i8 %2, 0 ; [#uses=1] - br i1 %toBool, label %bb162, label %bb - -bb: ; preds = %entry - zext i8 %__delim to i32 ; :3 [#uses=1] - getelementptr %"struct.std::basic_istream >"* %this, i32 0, i32 0 ; :4 [#uses=1] - load i32 (...)*** %4, align 4 ; :5 [#uses=1] - getelementptr i32 (...)** %5, i32 -3 ; :6 [#uses=1] - bitcast i32 (...)** %6 to i32* ; :7 [#uses=1] - load i32* %7, align 4 ; :8 [#uses=1] - bitcast %"struct.std::basic_istream >"* %this to i8* ; :9 [#uses=1] - %ctg2186 = getelementptr i8* %9, i32 %8 ; [#uses=1] - bitcast i8* %ctg2186 to %"struct.std::basic_ios >"* ; <%"struct.std::basic_ios >"*>:10 [#uses=1] - getelementptr %"struct.std::basic_ios >"* %10, i32 0, i32 4 ; <%"struct.std::basic_streambuf >"**>:11 [#uses=1] - load %"struct.std::basic_streambuf >"** %11, align 4 ; <%"struct.std::basic_streambuf >"*>:12 [#uses=9] - getelementptr %"struct.std::basic_streambuf >"* %12, i32 0, i32 2 ; :13 [#uses=10] - load i8** %13, align 4 ; :14 [#uses=2] - getelementptr %"struct.std::basic_streambuf >"* %12, i32 0, i32 3 ; :15 [#uses=6] - load i8** %15, align 4 ; :16 [#uses=1] - icmp ult i8* %14, %16 ; :17 [#uses=1] - br i1 %17, label %bb81, label %bb82 - -bb81: ; preds = %bb - load i8* %14, align 1 ; :18 [#uses=1] - zext i8 %18 to i32 ; :19 [#uses=1] - %.pre = getelementptr %"struct.std::basic_streambuf >"* %12, i32 0, i32 0 ; [#uses=1] - br label %bb119.preheader - -bb82: ; preds = %bb - getelementptr %"struct.std::basic_streambuf >"* %12, i32 0, i32 0 ; :20 [#uses=2] - load i32 (...)*** %20, align 4 ; :21 [#uses=1] - getelementptr i32 (...)** %21, i32 9 ; :22 [#uses=1] - load i32 (...)** %22, align 4 ; :23 [#uses=1] - bitcast i32 (...)* %23 to i32 (%"struct.std::basic_streambuf >"*)* ; >"*)*>:24 [#uses=1] - invoke i32 %24( %"struct.std::basic_streambuf >"* %12 ) - to label %bb119.preheader unwind label %lpad ; :25 [#uses=1] - -bb119.preheader: ; preds = %bb82, %bb81 - %.pre-phi = phi i32 (...)*** [ %.pre, %bb81 ], [ %20, %bb82 ] ; [#uses=4] - %__c79.0.ph = phi i32 [ %19, %bb81 ], [ %25, %bb82 ] ; [#uses=1] - sext i8 %__delim to i32 ; :26 [#uses=1] - br label %bb119 - -bb84: ; preds = %bb119 - sub i32 %__n, %82 ; :27 [#uses=1] - add i32 %27, -1 ; :28 [#uses=2] - load i8** %15, align 4 ; :29 [#uses=1] - ptrtoint i8* %29 to i32 ; :30 [#uses=1] - load i8** %13, align 4 ; :31 [#uses=3] - ptrtoint i8* %31 to i32 ; :32 [#uses=2] - sub i32 %30, %32 ; :33 [#uses=2] - icmp slt i32 %28, %33 ; :34 [#uses=1] - select i1 %34, i32 %28, i32 %33 ; :35 [#uses=3] - icmp sgt i32 %35, 1 ; :36 [#uses=1] - br i1 %36, label %bb90, label %bb99 - -bb90: ; preds = %bb84 - call i8* @memchr( i8* %31, i32 %26, i32 %35 ) nounwind readonly ; :37 [#uses=2] - icmp eq i8* %37, null ; :38 [#uses=1] - br i1 %38, label %bb93, label %bb92 - -bb92: ; preds = %bb90 - ptrtoint i8* %37 to i32 ; :39 [#uses=1] - sub i32 %39, %32 ; :40 [#uses=1] - br label %bb93 - -bb93: ; preds = %bb92, %bb90 - %__size.0 = phi i32 [ %40, %bb92 ], [ %35, %bb90 ] ; [#uses=4] - call void @llvm.memcpy.i32( i8* %__s_addr.0, i8* %31, i32 %__size.0, i32 1 ) - getelementptr i8* %__s_addr.0, i32 %__size.0 ; :41 [#uses=3] - load i8** %13, align 4 ; :42 [#uses=1] - getelementptr i8* %42, i32 %__size.0 ; :43 [#uses=1] - store i8* %43, i8** %13, align 4 - load i32* %0, align 4 ; :44 [#uses=1] - add i32 %44, %__size.0 ; :45 [#uses=1] - store i32 %45, i32* %0, align 4 - load i8** %13, align 4 ; :46 [#uses=2] - load i8** %15, align 4 ; :47 [#uses=1] - icmp ult i8* %46, %47 ; :48 [#uses=1] - br i1 %48, label %bb95, label %bb96 - -bb95: ; preds = %bb93 - load i8* %46, align 1 ; :49 [#uses=1] - zext i8 %49 to i32 ; :50 [#uses=1] - br label %bb119 - -bb96: ; preds = %bb93 - load i32 (...)*** %.pre-phi, align 4 ; :51 [#uses=1] - getelementptr i32 (...)** %51, i32 9 ; :52 [#uses=1] - load i32 (...)** %52, align 4 ; :53 [#uses=1] - bitcast i32 (...)* %53 to i32 (%"struct.std::basic_streambuf >"*)* ; >"*)*>:54 [#uses=1] - invoke i32 %54( %"struct.std::basic_streambuf >"* %12 ) - to label %bb119 unwind label %lpad ; :55 [#uses=1] - -bb99: ; preds = %bb84 - trunc i32 %__c79.0 to i8 ; :56 [#uses=1] - store i8 %56, i8* %__s_addr.0, align 1 - getelementptr i8* %__s_addr.0, i32 1 ; :57 [#uses=5] - load i32* %0, align 4 ; :58 [#uses=1] - add i32 %58, 1 ; :59 [#uses=1] - store i32 %59, i32* %0, align 4 - load i8** %13, align 4 ; :60 [#uses=3] - load i8** %15, align 4 ; :61 [#uses=1] - icmp ult i8* %60, %61 ; :62 [#uses=1] - br i1 %62, label %bb101, label %bb102 - -bb101: ; preds = %bb99 - load i8* %60, align 1 ; :63 [#uses=1] - zext i8 %63 to i32 ; :64 [#uses=1] - getelementptr i8* %60, i32 1 ; :65 [#uses=1] - store i8* %65, i8** %13, align 4 - br label %bb104 - -bb102: ; preds = %bb99 - load i32 (...)*** %.pre-phi, align 4 ; :66 [#uses=1] - getelementptr i32 (...)** %66, i32 10 ; :67 [#uses=1] - load i32 (...)** %67, align 4 ; :68 [#uses=1] - bitcast i32 (...)* %68 to i32 (%"struct.std::basic_streambuf >"*)* ; >"*)*>:69 [#uses=1] - invoke i32 %69( %"struct.std::basic_streambuf >"* %12 ) - to label %bb104 unwind label %lpad ; :70 [#uses=1] - -bb104: ; preds = %bb102, %bb101 - %__ret44.0 = phi i32 [ %64, %bb101 ], [ %70, %bb102 ] ; [#uses=1] - icmp eq i32 %__ret44.0, -1 ; :71 [#uses=1] - br i1 %71, label %bb119, label %bb112 - -bb112: ; preds = %bb104 - load i8** %13, align 4 ; :72 [#uses=2] - load i8** %15, align 4 ; :73 [#uses=1] - icmp ult i8* %72, %73 ; :74 [#uses=1] - br i1 %74, label %bb114, label %bb115 - -bb114: ; preds = %bb112 - load i8* %72, align 1 ; :75 [#uses=1] - zext i8 %75 to i32 ; :76 [#uses=1] - br label %bb119 - -bb115: ; preds = %bb112 - load i32 (...)*** %.pre-phi, align 4 ; :77 [#uses=1] - getelementptr i32 (...)** %77, i32 9 ; :78 [#uses=1] - load i32 (...)** %78, align 4 ; :79 [#uses=1] - bitcast i32 (...)* %79 to i32 (%"struct.std::basic_streambuf >"*)* ; >"*)*>:80 [#uses=1] - invoke i32 %80( %"struct.std::basic_streambuf >"* %12 ) - to label %bb119 unwind label %lpad ; :81 [#uses=1] - -bb119: ; preds = %bb115, %bb114, %bb104, %bb96, %bb95, %bb119.preheader - %__c79.0 = phi i32 [ %__c79.0.ph, %bb119.preheader ], [ %50, %bb95 ], [ %76, %bb114 ], [ %55, %bb96 ], [ -1, %bb104 ], [ %81, %bb115 ] ; [#uses=3] - %__s_addr.0 = phi i8* [ %__s, %bb119.preheader ], [ %41, %bb95 ], [ %57, %bb114 ], [ %41, %bb96 ], [ %57, %bb104 ], [ %57, %bb115 ] ; [#uses=5] - load i32* %0, align 4 ; :82 [#uses=2] - add i32 %82, 1 ; :83 [#uses=2] - %.not = icmp sge i32 %83, %__n ; [#uses=1] - icmp eq i32 %__c79.0, -1 ; :84 [#uses=3] - icmp eq i32 %__c79.0, %3 ; :85 [#uses=2] - %or.cond = or i1 %84, %85 ; [#uses=1] - %or.cond188 = or i1 %or.cond, %.not ; [#uses=1] - br i1 %or.cond188, label %bb141, label %bb84 - -bb141: ; preds = %bb119 - %.not194 = xor i1 %85, true ; [#uses=1] - %brmerge = or i1 %84, %.not194 ; [#uses=1] - %.mux = select i1 %84, i32 2, i32 4 ; [#uses=0] - br i1 %brmerge, label %bb162, label %bb146 - -bb146: ; preds = %bb141 - store i32 %83, i32* %0, align 4 - load i8** %13, align 4 ; :86 [#uses=2] - load i8** %15, align 4 ; :87 [#uses=1] - icmp ult i8* %86, %87 ; :88 [#uses=1] - br i1 %88, label %bb148, label %bb149 - -bb148: ; preds = %bb146 - getelementptr i8* %86, i32 1 ; :89 [#uses=1] - store i8* %89, i8** %13, align 4 - ret %"struct.std::basic_istream >"* %this - -bb149: ; preds = %bb146 - load i32 (...)*** %.pre-phi, align 4 ; :90 [#uses=1] - getelementptr i32 (...)** %90, i32 10 ; :91 [#uses=1] - load i32 (...)** %91, align 4 ; :92 [#uses=1] - bitcast i32 (...)* %92 to i32 (%"struct.std::basic_streambuf >"*)* ; >"*)*>:93 [#uses=1] - invoke i32 %93( %"struct.std::basic_streambuf >"* %12 ) - to label %bb162 unwind label %lpad ; :94 [#uses=0] - -bb162: ; preds = %bb149, %bb141, %entry - ret %"struct.std::basic_istream >"* %this - -lpad: ; preds = %bb149, %bb115, %bb102, %bb96, %bb82 - %__s_addr.1 = phi i8* [ %__s, %bb82 ], [ %__s_addr.0, %bb149 ], [ %41, %bb96 ], [ %57, %bb102 ], [ %57, %bb115 ] ; [#uses=0] - call void @__cxa_rethrow( ) noreturn - unreachable -} - -declare i8* @__cxa_begin_catch(i8*) nounwind - -declare i8* @llvm.eh.exception() nounwind - -declare i32 @llvm.eh.selector.i32(i8*, i8*, ...) nounwind - -declare void @__cxa_rethrow() noreturn - -declare void @__cxa_end_catch() - -declare i32 @__gxx_personality_v0(...) - -declare void @_ZNSi6sentryC1ERSib(%"struct.std::basic_istream >::sentry"*, %"struct.std::basic_istream >"*, i8 zeroext ) - -declare i8* @memchr(i8*, i32, i32) nounwind readonly - -declare void @llvm.memcpy.i32(i8*, i8*, i32, i32) nounwind - -declare void @_ZNSt9basic_iosIcSt11char_traitsIcEE5clearESt12_Ios_Iostate(%"struct.std::basic_ios >"*, i32) - -declare extern_weak i32 @pthread_once(i32*, void ()*) - -declare extern_weak i8* @pthread_getspecific(i32) - -declare extern_weak i32 @pthread_setspecific(i32, i8*) - -declare extern_weak i32 @pthread_create(i32*, %struct.pthread_attr_t*, i8* (i8*)*, i8*) - -declare extern_weak i32 @pthread_cancel(i32) - -declare extern_weak i32 @pthread_mutex_lock(%struct.pthread_mutex_t*) - -declare extern_weak i32 @pthread_mutex_trylock(%struct.pthread_mutex_t*) - -declare extern_weak i32 @pthread_mutex_unlock(%struct.pthread_mutex_t*) - -declare extern_weak i32 @pthread_mutex_init(%struct.pthread_mutex_t*, %struct..0._11*) - -declare extern_weak i32 @pthread_key_create(i32*, void (i8*)*) - -declare extern_weak i32 @pthread_key_delete(i32) - -declare extern_weak i32 @pthread_mutexattr_init(%struct..0._11*) - -declare extern_weak i32 @pthread_mutexattr_settype(%struct..0._11*, i32) - -declare extern_weak i32 @pthread_mutexattr_destroy(%struct..0._11*) Propchange: llvm/trunk/test/FrontendC/2008-07-29-EHLabel.ll ------------------------------------------------------------------------------ svn:mergeinfo = From baldrick at free.fr Wed Jan 21 05:40:52 2009 From: baldrick at free.fr (Duncan Sands) Date: Wed, 21 Jan 2009 12:40:52 +0100 Subject: [llvm-commits] [llvm] r62619 - /llvm/trunk/test/CodeGen/Generic/2008-07-29-EHLabel.ll In-Reply-To: References: <200901202141.n0KLfrbH001793@zion.cs.uiuc.edu> Message-ID: <200901211240.52482.baldrick@free.fr> Hi, > > Ok, how can we solve this issue? The test harness isn't set up to > > know > > about *any* assembler, much less one for a particular target. Can't > > this > > use 'grep' like anything other test? > > Probably. While that looks like a bug I might have introduced, the > analysis, > fix, and testcase are all Duncan's; I'll let him answer. I've changed it so it assembles using "%llvmgcc -xassembler" in the hope that this will always work (thanks to Dan for this idea). The problem is that llvm-gcc may not be available, so I've moved the test to FrontendC (yes, this is a hack) so it will only be run if llvm-gcc is around. Ciao, Duncan. From baldrick at free.fr Wed Jan 21 05:46:01 2009 From: baldrick at free.fr (Duncan Sands) Date: Wed, 21 Jan 2009 12:46:01 +0100 Subject: [llvm-commits] Invalid memory access due to debug info which building gcc In-Reply-To: References: <200901161533.05528.baldrick@free.fr> <200901192120.18708.baldrick@free.fr> Message-ID: <200901211246.01427.baldrick@free.fr> > Pl. try and see if rev. 62555 helps or not. If not then please let me > know. Yes, it is now fixed. Thanks! Duncan. From baldrick at free.fr Wed Jan 21 05:51:30 2009 From: baldrick at free.fr (Duncan Sands) Date: Wed, 21 Jan 2009 11:51:30 -0000 Subject: [llvm-commits] [llvm] r62684 - /llvm/trunk/test/FrontendC/2009-01-21-InvalidIterator.c Message-ID: <200901211151.n0LBpWPU008967@zion.cs.uiuc.edu> Author: baldrick Date: Wed Jan 21 05:51:17 2009 New Revision: 62684 URL: http://llvm.org/viewvc/llvm-project?rev=62684&view=rev Log: This was causing invalid memory accesses when generating debug info in the compiler. Added: llvm/trunk/test/FrontendC/2009-01-21-InvalidIterator.c Added: llvm/trunk/test/FrontendC/2009-01-21-InvalidIterator.c URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/FrontendC/2009-01-21-InvalidIterator.c?rev=62684&view=auto ============================================================================== --- llvm/trunk/test/FrontendC/2009-01-21-InvalidIterator.c (added) +++ llvm/trunk/test/FrontendC/2009-01-21-InvalidIterator.c Wed Jan 21 05:51:17 2009 @@ -0,0 +1,74 @@ +// RUN: %llvmgcc %s -S -g + +typedef long unsigned int size_t; +typedef unsigned short int uint16_t; +typedef unsigned int uint32_t; +typedef unsigned long int uint64_t; +typedef uint16_t Elf64_Half; +typedef uint32_t Elf64_Word; +typedef uint64_t Elf64_Xword; +typedef uint64_t Elf64_Addr; +typedef uint64_t Elf64_Off; +typedef struct +{ + Elf64_Word p_type; + Elf64_Off p_offset; + Elf64_Addr p_vaddr; + Elf64_Xword p_align; +} +Elf64_Phdr; +struct dl_phdr_info +{ + const char *dlpi_name; + const Elf64_Phdr *dlpi_phdr; + Elf64_Half dlpi_phnum; + unsigned long long int dlpi_adds; +}; +typedef unsigned _Unwind_Ptr; +struct object +{ + union + { + const struct dwarf_fde *single; + struct dwarf_fde **array; + struct fde_vector *sort; + } + u; + union + { + struct + { + } + b; + } + s; + struct object *next; +}; +typedef int sword; +typedef unsigned int uword; +struct dwarf_fde +{ + uword length; + sword CIE_delta; + unsigned char pc_begin[]; +}; +typedef struct dwarf_fde fde; +struct unw_eh_callback_data +{ + const fde *ret; + struct frame_hdr_cache_element *link; +} +frame_hdr_cache[8]; + +_Unwind_Ptr +base_from_cb_data (struct unw_eh_callback_data *data) +{ +} + +void +_Unwind_IteratePhdrCallback (struct dl_phdr_info *info, size_t size, void *ptr) +{ + const unsigned char *p; + const struct unw_eh_frame_hdr *hdr; + struct object ob; +} From foldr at codedgers.com Wed Jan 21 07:04:02 2009 From: foldr at codedgers.com (Mikhail Glushenkov) Date: Wed, 21 Jan 2009 13:04:02 -0000 Subject: [llvm-commits] [llvm] r62685 - in /llvm/trunk: test/LLVMC/HookWithArguments.td tools/llvmc/doc/LLVMC-Reference.rst utils/TableGen/LLVMCConfigurationEmitter.cpp Message-ID: <200901211304.n0LD42x2010791@zion.cs.uiuc.edu> Author: foldr Date: Wed Jan 21 07:04:00 2009 New Revision: 62685 URL: http://llvm.org/viewvc/llvm-project?rev=62685&view=rev Log: Allow hooks with arguments. Added: llvm/trunk/test/LLVMC/HookWithArguments.td Modified: llvm/trunk/tools/llvmc/doc/LLVMC-Reference.rst llvm/trunk/utils/TableGen/LLVMCConfigurationEmitter.cpp Added: llvm/trunk/test/LLVMC/HookWithArguments.td URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/LLVMC/HookWithArguments.td?rev=62685&view=auto ============================================================================== --- llvm/trunk/test/LLVMC/HookWithArguments.td (added) +++ llvm/trunk/test/LLVMC/HookWithArguments.td Wed Jan 21 07:04:00 2009 @@ -0,0 +1,16 @@ +// Check that hooks with arguments work. +// RUN: tblgen -I $srcroot/include --gen-llvmc %s -o %t +// RUN: grep {Hook(const char\\* Arg0, const char\\* Arg1, const char\\* Arg2);} %t | count 1 +// RUN: grep "/path" %t | count 1 +// RUN: grep "VARIABLE" %t | count 1 +// RUN: grep "/2path" %t | count 1 + +include "llvm/CompilerDriver/Common.td" + +def dummy_tool : Tool<[ +(cmd_line "$CALL(Hook, 'Arg1', 'Arg2', 'Arg3 Arg3Cont')/path arg1 $ENV(VARIABLE)/2path arg2 $INFILE"), +(in_language "dummy"), +(out_language "dummy") +]>; + +def DummyGraph : CompilationGraph<[SimpleEdge<"root", "dummy_tool">]>; Modified: llvm/trunk/tools/llvmc/doc/LLVMC-Reference.rst URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvmc/doc/LLVMC-Reference.rst?rev=62685&r1=62684&r2=62685&view=diff ============================================================================== --- llvm/trunk/tools/llvmc/doc/LLVMC-Reference.rst (original) +++ llvm/trunk/tools/llvmc/doc/LLVMC-Reference.rst Wed Jan 21 07:04:00 2009 @@ -560,16 +560,21 @@ ------------------------------- Normally, LLVMC executes programs from the system ``PATH``. Sometimes, -this is not sufficient: for example, we may want to specify tool names -in the configuration file. This can be achieved via the mechanism of -hooks - to write your own hooks, just add their definitions to the -``PluginMain.cpp`` or drop a ``.cpp`` file into the -``$LLVMC_DIR/driver`` directory. Hooks should live in the ``hooks`` -namespace and have the signature ``std::string hooks::MyHookName -(void)``. They can be used from the ``cmd_line`` tool property:: +this is not sufficient: for example, we may want to specify tool paths +or names in the configuration file. This can be easily achieved via +the hooks mechanism. To write your own hooks, just add their +definitions to the ``PluginMain.cpp`` or drop a ``.cpp`` file into the +your plugin directory. Hooks should live in the ``hooks`` namespace +and have the signature ``const char* hooks::MyHookName ([const char* +Arg0 [ const char* Arg2 [, ...]]])``. They can be used from the +``cmd_line`` tool property:: (cmd_line "$CALL(MyHook)/path/to/file -o $CALL(AnotherHook)") +To pass arguments to hooks, use the following syntax:: + + (cmd_line "$CALL(MyHook, 'Arg1', 'Arg2', 'Arg # 3')/path/to/file -o1 -o2") + It is also possible to use environment variables in the same manner:: (cmd_line "$ENV(VAR1)/path/to/file -o $ENV(VAR2)") Modified: llvm/trunk/utils/TableGen/LLVMCConfigurationEmitter.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/LLVMCConfigurationEmitter.cpp?rev=62685&r1=62684&r2=62685&view=diff ============================================================================== --- llvm/trunk/utils/TableGen/LLVMCConfigurationEmitter.cpp (original) +++ llvm/trunk/utils/TableGen/LLVMCConfigurationEmitter.cpp Wed Jan 21 07:04:00 2009 @@ -118,6 +118,15 @@ return ret; } +/// oneOf - Does the input string contain this character? +bool oneOf(const char* lst, char c) { + while (*lst) { + if (*lst++ == c) + return true; + } + return false; +} + //===----------------------------------------------------------------------===// /// Back-end specific code @@ -1041,39 +1050,157 @@ } } +/// TokenizeCmdline - converts from "$CALL(HookName, 'Arg1', 'Arg2')/path" to +/// ["$CALL(", "HookName", "Arg1", "Arg2", ")/path"] . +/// Helper function used by EmitCmdLineVecFill and. +void TokenizeCmdline(const std::string& CmdLine, StrVector& Out) { + const char* Delimiters = " \t\n\v\f\r"; + enum TokenizerState + { Normal, SpecialCommand, InsideSpecialCommand, InsideQuotationMarks } + cur_st = Normal; + Out.push_back(""); + + std::string::size_type B = CmdLine.find_first_not_of(Delimiters), + E = CmdLine.size(); + if (B == std::string::npos) + throw "Empty command-line string!"; + for (; B != E; ++B) { + char cur_ch = CmdLine[B]; + + switch (cur_st) { + case Normal: + if (cur_ch == '$') { + cur_st = SpecialCommand; + break; + } + if (oneOf(Delimiters, cur_ch)) { + // Skip whitespace + B = CmdLine.find_first_not_of(Delimiters, B); + if (B == std::string::npos) { + B = E-1; + continue; + } + --B; + Out.push_back(""); + continue; + } + break; + + + case SpecialCommand: + if (oneOf(Delimiters, cur_ch)) { + cur_st = Normal; + Out.push_back(""); + continue; + } + if (cur_ch == '(') { + Out.push_back(""); + cur_st = InsideSpecialCommand; + continue; + } + break; + + case InsideSpecialCommand: + if (oneOf(Delimiters, cur_ch)) { + continue; + } + if (cur_ch == '\'') { + cur_st = InsideQuotationMarks; + Out.push_back(""); + continue; + } + if (cur_ch == ')') { + cur_st = Normal; + Out.push_back(""); + } + if (cur_ch == ',') { + continue; + } + + break; + + case InsideQuotationMarks: + if (cur_ch == '\'') { + cur_st = InsideSpecialCommand; + continue; + } + break; + } + + Out.back().push_back(cur_ch); + } +} + +template +void checkedIncrement(I& P, I E, S ErrorString) { + ++P; + if (P == E) + throw ErrorString; +} + /// SubstituteSpecialCommands - Perform string substitution for $CALL /// and $ENV. Helper function used by EmitCmdLineVecFill(). -std::string SubstituteSpecialCommands(const std::string& cmd) { - size_t cparen = cmd.find(")"); - std::string ret; +StrVector::const_iterator SubstituteSpecialCommands +(StrVector::const_iterator Pos, StrVector::const_iterator End, std::ostream& O) +{ + + const std::string& cmd = *Pos; - if (cmd.find("$CALL(") == 0) { - if (cmd.size() == 6) + if (cmd == "$CALL") { + checkedIncrement(Pos, End, "Syntax error in $CALL invocation!"); + const std::string& CmdName = *Pos; + + if (CmdName == ")") throw std::string("$CALL invocation: empty argument list!"); - ret += "hooks::"; - ret += std::string(cmd.begin() + 6, cmd.begin() + cparen); - ret += "()"; - } - else if (cmd.find("$ENV(") == 0) { - if (cmd.size() == 5) - throw std::string("$ENV invocation: empty argument list!"); - - ret += "checkCString(std::getenv(\""; - ret += std::string(cmd.begin() + 5, cmd.begin() + cparen); - ret += "\"))"; + O << "hooks::"; + O << CmdName << "("; + + + bool firstIteration = true; + while (true) { + checkedIncrement(Pos, End, "Syntax error in $CALL invocation!"); + const std::string& Arg = *Pos; + assert(Arg.size() != 0); + + if (Arg[0] == ')') + break; + + if (firstIteration) + firstIteration = false; + else + O << ", "; + + O << '"' << Arg << '"'; + } + + O << ')'; + + } + else if (cmd == "$ENV") { + checkedIncrement(Pos, End, "Syntax error in $ENV invocation!"); + const std::string& EnvName = *Pos; + + if (EnvName == ")") + throw "$ENV invocation: empty argument list!"; + + O << "checkCString(std::getenv(\""; + O << EnvName; + O << "\"))"; + + checkedIncrement(Pos, End, "Syntax error in $ENV invocation!"); } else { throw "Unknown special command: " + cmd; } - if (cmd.begin() + cparen + 1 != cmd.end()) { - ret += " + std::string(\""; - ret += (cmd.c_str() + cparen + 1); - ret += "\")"; - } + const std::string& Leftover = *Pos; + assert(Leftover.at(0) == ')'); + if (Leftover.size() != 1) + O << " + std::string(\"" << (Leftover.c_str() + 1) << "\")"; + O << ')'; - return ret; + return Pos; } /// EmitCmdLineVecFill - Emit code that fills in the command line @@ -1082,14 +1209,28 @@ bool IsJoin, const char* IndentLevel, std::ostream& O) { StrVector StrVec; - SplitString(InitPtrToString(CmdLine), StrVec); + TokenizeCmdline(InitPtrToString(CmdLine), StrVec); + if (StrVec.empty()) throw "Tool " + ToolName + " has empty command line!"; - StrVector::const_iterator I = StrVec.begin(); - ++I; - for (StrVector::const_iterator E = StrVec.end(); I != E; ++I) { + StrVector::const_iterator I = StrVec.begin(), E = StrVec.end(); + + // If there is a hook invocation on the place of the first command, skip it. + if (StrVec[0][0] == '$') { + while (I != E && (*I)[0] != ')' ) + ++I; + + // Skip the ')' symbol. + ++I; + } + else { + ++I; + } + + for (; I != E; ++I) { const std::string& cmd = *I; + // std::cerr << cmd; O << IndentLevel; if (cmd.at(0) == '$') { if (cmd == "$INFILE") { @@ -1105,7 +1246,8 @@ O << "vec.push_back(out_file);\n"; } else { - O << "vec.push_back(" << SubstituteSpecialCommands(cmd); + O << "vec.push_back("; + I = SubstituteSpecialCommands(I, E, O); O << ");\n"; } } @@ -1113,10 +1255,13 @@ O << "vec.push_back(\"" << cmd << "\");\n"; } } - O << IndentLevel << "cmd = " - << ((StrVec[0][0] == '$') ? SubstituteSpecialCommands(StrVec[0]) - : "\"" + StrVec[0] + "\"") - << ";\n"; + O << IndentLevel << "cmd = "; + + if (StrVec[0][0] == '$') + SubstituteSpecialCommands(StrVec.begin(), StrVec.end(), O); + else + O << '"' << StrVec[0] << '"'; + O << ";\n"; } /// EmitCmdLineVecFillCallback - A function object wrapper around @@ -1650,22 +1795,39 @@ /// $CALL(HookName) in the provided command line string. Helper /// function used by FillInHookNames(). class ExtractHookNames { - llvm::StringSet<>& HookNames_; + llvm::StringMap& HookNames_; public: - ExtractHookNames(llvm::StringSet<>& HookNames) - : HookNames_(HookNames_) {} + ExtractHookNames(llvm::StringMap& HookNames) + : HookNames_(HookNames) {} void operator()(const Init* CmdLine) { StrVector cmds; - llvm::SplitString(InitPtrToString(CmdLine), cmds); + TokenizeCmdline(InitPtrToString(CmdLine), cmds); for (StrVector::const_iterator B = cmds.begin(), E = cmds.end(); B != E; ++B) { const std::string& cmd = *B; - if (cmd.find("$CALL(") == 0) { - if (cmd.size() == 6) - throw std::string("$CALL invocation: empty argument list!"); - HookNames_.insert(std::string(cmd.begin() + 6, - cmd.begin() + cmd.find(")"))); + + if (cmd == "$CALL") { + unsigned NumArgs = 0; + checkedIncrement(B, E, "Syntax error in $CALL invocation!"); + const std::string& HookName = *B; + + + if (HookName.at(0) == ')') + throw "$CALL invoked with no arguments!"; + + while (++B != E && B->at(0) != ')') { + ++NumArgs; + } + + StringMap::const_iterator H = HookNames_.find(HookName); + + if (H != HookNames_.end() && H->second != NumArgs) + throw "Overloading of hooks is not allowed. Overloaded hook: " + + HookName; + else + HookNames_[HookName] = NumArgs; + } } } @@ -1674,7 +1836,7 @@ /// FillInHookNames - Actually extract the hook names from all command /// line strings. Helper function used by EmitHookDeclarations(). void FillInHookNames(const ToolDescriptions& ToolDescs, - llvm::StringSet<>& HookNames) + llvm::StringMap& HookNames) { // For all command lines: for (ToolDescriptions::const_iterator B = ToolDescs.begin(), @@ -1695,16 +1857,23 @@ /// property records and emit hook function declaration for each /// instance of $CALL(HookName). void EmitHookDeclarations(const ToolDescriptions& ToolDescs, std::ostream& O) { - llvm::StringSet<> HookNames; + llvm::StringMap HookNames; + FillInHookNames(ToolDescs, HookNames); if (HookNames.empty()) return; O << "namespace hooks {\n"; - for (StringSet<>::const_iterator B = HookNames.begin(), E = HookNames.end(); - B != E; ++B) - O << Indent1 << "std::string " << B->first() << "();\n"; + for (StringMap::const_iterator B = HookNames.begin(), + E = HookNames.end(); B != E; ++B) { + O << Indent1 << "const char* " << B->first() << "("; + + for (unsigned i = 0, j = B->second; i < j; ++i) { + O << "const char* Arg" << i << (i+1 == j ? "" : ", "); + } + O <<");\n"; + } O << "}\n\n"; } From foldr at codedgers.com Wed Jan 21 07:04:33 2009 From: foldr at codedgers.com (Mikhail Glushenkov) Date: Wed, 21 Jan 2009 13:04:33 -0000 Subject: [llvm-commits] [llvm] r62686 - in /llvm/trunk: tools/llvmc/doc/LLVMC-Reference.rst utils/TableGen/LLVMCConfigurationEmitter.cpp Message-ID: <200901211304.n0LD4XFj010822@zion.cs.uiuc.edu> Author: foldr Date: Wed Jan 21 07:04:33 2009 New Revision: 62686 URL: http://llvm.org/viewvc/llvm-project?rev=62686&view=rev Log: Change the hook API back to prevent memory leaks. Modified: llvm/trunk/tools/llvmc/doc/LLVMC-Reference.rst llvm/trunk/utils/TableGen/LLVMCConfigurationEmitter.cpp Modified: llvm/trunk/tools/llvmc/doc/LLVMC-Reference.rst URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvmc/doc/LLVMC-Reference.rst?rev=62686&r1=62685&r2=62686&view=diff ============================================================================== --- llvm/trunk/tools/llvmc/doc/LLVMC-Reference.rst (original) +++ llvm/trunk/tools/llvmc/doc/LLVMC-Reference.rst Wed Jan 21 07:04:33 2009 @@ -565,7 +565,7 @@ the hooks mechanism. To write your own hooks, just add their definitions to the ``PluginMain.cpp`` or drop a ``.cpp`` file into the your plugin directory. Hooks should live in the ``hooks`` namespace -and have the signature ``const char* hooks::MyHookName ([const char* +and have the signature ``std::string hooks::MyHookName ([const char* Arg0 [ const char* Arg2 [, ...]]])``. They can be used from the ``cmd_line`` tool property:: Modified: llvm/trunk/utils/TableGen/LLVMCConfigurationEmitter.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/LLVMCConfigurationEmitter.cpp?rev=62686&r1=62685&r2=62686&view=diff ============================================================================== --- llvm/trunk/utils/TableGen/LLVMCConfigurationEmitter.cpp (original) +++ llvm/trunk/utils/TableGen/LLVMCConfigurationEmitter.cpp Wed Jan 21 07:04:33 2009 @@ -1866,7 +1866,7 @@ O << "namespace hooks {\n"; for (StringMap::const_iterator B = HookNames.begin(), E = HookNames.end(); B != E; ++B) { - O << Indent1 << "const char* " << B->first() << "("; + O << Indent1 << "std::string " << B->first() << "("; for (unsigned i = 0, j = B->second; i < j; ++i) { O << "const char* Arg" << i << (i+1 == j ? "" : ", "); From foldr at codedgers.com Wed Jan 21 07:05:00 2009 From: foldr at codedgers.com (Mikhail Glushenkov) Date: Wed, 21 Jan 2009 13:05:00 -0000 Subject: [llvm-commits] [llvm] r62687 - in /llvm/trunk/tools/llvmc: driver/Makefile plugins/Makefile Message-ID: <200901211305.n0LD50Vi010853@zion.cs.uiuc.edu> Author: foldr Date: Wed Jan 21 07:05:00 2009 New Revision: 62687 URL: http://llvm.org/viewvc/llvm-project?rev=62687&view=rev Log: Fix 'llvm-config --libs' output. Change the naming scheme for llvmc plugins so that they do not appear in 'llvm-config --libs' output. Modified: llvm/trunk/tools/llvmc/driver/Makefile llvm/trunk/tools/llvmc/plugins/Makefile Modified: llvm/trunk/tools/llvmc/driver/Makefile URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvmc/driver/Makefile?rev=62687&r1=62686&r2=62687&view=diff ============================================================================== --- llvm/trunk/tools/llvmc/driver/Makefile (original) +++ llvm/trunk/tools/llvmc/driver/Makefile Wed Jan 21 07:05:00 2009 @@ -13,7 +13,7 @@ REQUIRES_EH := 1 ifneq ($(BUILTIN_PLUGINS),) -USEDLIBS = $(patsubst %,LLVMC%,$(BUILTIN_PLUGINS)) +USEDLIBS = $(patsubst %,plugin_llvmc_%,$(BUILTIN_PLUGINS)) endif include $(LEVEL)/Makefile.common Modified: llvm/trunk/tools/llvmc/plugins/Makefile URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvmc/plugins/Makefile?rev=62687&r1=62686&r2=62687&view=diff ============================================================================== --- llvm/trunk/tools/llvmc/plugins/Makefile (original) +++ llvm/trunk/tools/llvmc/plugins/Makefile Wed Jan 21 07:05:00 2009 @@ -21,7 +21,7 @@ LEVEL = ../../../.. -LIBRARYNAME := $(patsubst %,LLVMC%,$(LLVMC_PLUGIN)) +LIBRARYNAME := $(patsubst %,plugin_llvmc_%,$(LLVMC_PLUGIN)) REQUIRES_EH = 1 ifndef BUILTIN_LLVMC_PLUGIN From foldr at codedgers.com Wed Jan 21 07:14:02 2009 From: foldr at codedgers.com (Mikhail Glushenkov) Date: Wed, 21 Jan 2009 13:14:02 -0000 Subject: [llvm-commits] [llvm] r62688 - in /llvm/trunk: docs/CommandGuide/llvmc.pod lib/Support/CommandLine.cpp Message-ID: <200901211314.n0LDE2oe011191@zion.cs.uiuc.edu> Author: foldr Date: Wed Jan 21 07:14:02 2009 New Revision: 62688 URL: http://llvm.org/viewvc/llvm-project?rev=62688&view=rev Log: Mimic gcc behaviour with regard to response files. Modified: llvm/trunk/docs/CommandGuide/llvmc.pod llvm/trunk/lib/Support/CommandLine.cpp Modified: llvm/trunk/docs/CommandGuide/llvmc.pod URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/CommandGuide/llvmc.pod?rev=62688&r1=62687&r2=62688&view=diff ============================================================================== --- llvm/trunk/docs/CommandGuide/llvmc.pod (original) +++ llvm/trunk/docs/CommandGuide/llvmc.pod Wed Jan 21 07:14:02 2009 @@ -78,8 +78,24 @@ Print version information and exit. +=item B<@>I + +Read command-line options from I. The options read are inserted +in place of the original @I option. If I does not exist, or +cannot be read, then the option will be treated literally, and not +removed. + +Options in I are separated by whitespace. A whitespace character +may be included in an option by surrounding the entire option in +either single or double quotes. Any character (including a backslash) +may be included by prefixing the character to be included with a +backslash. The file may itself contain additional @I options; +any such options will be processed recursively. + + =back + =head2 Control Options By default, LLVMC is built with some standard configuration libraries Modified: llvm/trunk/lib/Support/CommandLine.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/CommandLine.cpp?rev=62688&r1=62687&r2=62688&view=diff ============================================================================== --- llvm/trunk/lib/Support/CommandLine.cpp (original) +++ llvm/trunk/lib/Support/CommandLine.cpp Wed Jan 21 07:14:02 2009 @@ -388,23 +388,22 @@ // Check that the response file is not empty (mmap'ing empty // files can be problematic). const sys::FileStatus *FileStat = respFile.getFileStatus(); - if (!FileStat) - continue; - if (FileStat->getSize() == 0) - continue; - - // Mmap the response file into memory. - OwningPtr - respFilePtr(MemoryBuffer::getFile(respFile.c_str())); - - if (respFilePtr == 0) - continue; + if (FileStat && FileStat->getSize() != 0) { - ParseCStringVector(newArgv, respFilePtr->getBufferStart()); - } - else { - newArgv.push_back(strdup(arg)); + // Mmap the response file into memory. + OwningPtr + respFilePtr(MemoryBuffer::getFile(respFile.c_str())); + + // If we could open the file, parse its contents, otherwise + // pass the @file option verbatim. + // TODO: support recursion. + if (respFilePtr != 0) { + ParseCStringVector(newArgv, respFilePtr->getBufferStart()); + continue; + } + } } + newArgv.push_back(strdup(arg)); } } From gohman at apple.com Wed Jan 21 08:50:16 2009 From: gohman at apple.com (Dan Gohman) Date: Wed, 21 Jan 2009 14:50:16 -0000 Subject: [llvm-commits] [llvm] r62691 - in /llvm/trunk: lib/Target/X86/X86ISelDAGToDAG.cpp test/CodeGen/X86/pr3366.ll Message-ID: <200901211450.n0LEoGjj014085@zion.cs.uiuc.edu> Author: djg Date: Wed Jan 21 08:50:16 2009 New Revision: 62691 URL: http://llvm.org/viewvc/llvm-project?rev=62691&view=rev Log: Fix a recent regression. ClrOpcode is not set for i8; for i8, if we want to clear %ah to zero before a division, just use a zero-extending mov to %al. This fixes PR3366. Added: llvm/trunk/test/CodeGen/X86/pr3366.ll Modified: llvm/trunk/lib/Target/X86/X86ISelDAGToDAG.cpp Modified: llvm/trunk/lib/Target/X86/X86ISelDAGToDAG.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86ISelDAGToDAG.cpp?rev=62691&r1=62690&r2=62691&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/X86ISelDAGToDAG.cpp (original) +++ llvm/trunk/lib/Target/X86/X86ISelDAGToDAG.cpp Wed Jan 21 08:50:16 2009 @@ -1381,9 +1381,10 @@ SDValue Tmp0, Tmp1, Tmp2, Tmp3; bool foldedLoad = TryFoldLoad(N, N1, Tmp0, Tmp1, Tmp2, Tmp3); + bool signBitIsZero = CurDAG->SignBitIsZero(N0); SDValue InFlag; - if (NVT == MVT::i8 && !isSigned) { + if (NVT == MVT::i8 && (!isSigned || signBitIsZero)) { // Special case for div8, just use a move with zero extension to AX to // clear the upper 8 bits (AH). SDValue Tmp0, Tmp1, Tmp2, Tmp3, Move, Chain; @@ -1405,7 +1406,7 @@ InFlag = CurDAG->getCopyToReg(CurDAG->getEntryNode(), LoReg, N0, SDValue()).getValue(1); - if (isSigned && !CurDAG->SignBitIsZero(N0)) { + if (isSigned && !signBitIsZero) { // Sign extend the low part into the high part. InFlag = SDValue(CurDAG->getTargetNode(SExtOpcode, MVT::Flag, InFlag), 0); Added: llvm/trunk/test/CodeGen/X86/pr3366.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/pr3366.ll?rev=62691&view=auto ============================================================================== --- llvm/trunk/test/CodeGen/X86/pr3366.ll (added) +++ llvm/trunk/test/CodeGen/X86/pr3366.ll Wed Jan 21 08:50:16 2009 @@ -0,0 +1,21 @@ +; RUN: llvm-as < %s | llc -march=x86 | grep movzbl +; PR3366 + +define void @_ada_c34002a() nounwind { +entry: + %0 = load i8* null, align 1 + %1 = sdiv i8 90, %0 + %2 = icmp ne i8 %1, 3 + %3 = zext i1 %2 to i8 + %toBool449 = icmp ne i8 %3, 0 + %4 = or i1 false, %toBool449 + %5 = zext i1 %4 to i8 + %toBool450 = icmp ne i8 %5, 0 + br i1 %toBool450, label %bb451, label %bb457 + +bb451: + br label %bb457 + +bb457: + unreachable +} From gohman at apple.com Wed Jan 21 09:17:51 2009 From: gohman at apple.com (Dan Gohman) Date: Wed, 21 Jan 2009 15:17:51 -0000 Subject: [llvm-commits] [llvm] r62692 - in /llvm/trunk: lib/CodeGen/SelectionDAG/DAGCombiner.cpp test/CodeGen/X86/pr3317.ll Message-ID: <200901211517.n0LFHppn014964@zion.cs.uiuc.edu> Author: djg Date: Wed Jan 21 09:17:51 2009 New Revision: 62692 URL: http://llvm.org/viewvc/llvm-project?rev=62692&view=rev Log: Simplify ReduceLoadWidth's logic: it doesn't need several different special cases after producing the new reduced-width load, because the new load already has the needed adjustments built into it. This fixes several bugs due to the special cases, including PR3317. Added: llvm/trunk/test/CodeGen/X86/pr3317.ll Modified: llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp Modified: llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp?rev=62692&r1=62691&r2=62692&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp Wed Jan 21 09:17:51 2009 @@ -511,6 +511,9 @@ DOUT << "\nReplacing.1 "; DEBUG(N->dump(&DAG)); DOUT << "\nWith: "; DEBUG(To[0].getNode()->dump(&DAG)); DOUT << " and " << NumTo-1 << " other values\n"; + DEBUG(for (unsigned i = 0, e = NumTo; i != e; ++i) + assert(N->getValueType(i) == To[i].getValueType() && + "Cannot combine value to value of different type!")); WorkListRemover DeadNodes(*this); DAG.ReplaceAllUsesWith(N, To, &DeadNodes); @@ -3310,7 +3313,7 @@ ISD::LoadExtType ExtType = ISD::NON_EXTLOAD; SDValue N0 = N->getOperand(0); MVT VT = N->getValueType(0); - MVT EVT = N->getValueType(0); + MVT EVT = VT; // This transformation isn't valid for vector loads. if (VT.isVector()) @@ -3327,7 +3330,6 @@ unsigned EVTBits = EVT.getSizeInBits(); unsigned ShAmt = 0; - bool CombineSRL = false; if (N0.getOpcode() == ISD::SRL && N0.hasOneUse()) { if (ConstantSDNode *N01 = dyn_cast(N0.getOperand(1))) { ShAmt = N01->getZExtValue(); @@ -3336,7 +3338,6 @@ N0 = N0.getOperand(0); if (N0.getValueType().getSizeInBits() <= EVTBits) return SDValue(); - CombineSRL = true; } } } @@ -3368,22 +3369,12 @@ : DAG.getExtLoad(ExtType, VT, LN0->getChain(), NewPtr, LN0->getSrcValue(), LN0->getSrcValueOffset() + PtrOff, EVT, LN0->isVolatile(), NewAlign); - AddToWorkList(Load.getNode()); - if (CombineSRL) { - WorkListRemover DeadNodes(*this); - DAG.ReplaceAllUsesOfValueWith(N0.getValue(1), Load.getValue(1), - &DeadNodes); - CombineTo(N->getOperand(0).getNode(), Load); - } else - CombineTo(N0.getNode(), Load, Load.getValue(1)); - - if (ShAmt) { - if (Opc == ISD::SIGN_EXTEND_INREG) - return DAG.getNode(Opc, VT, Load, N->getOperand(1)); - else - return DAG.getNode(Opc, VT, Load); - } - return SDValue(N, 0); // Return N so it doesn't get rechecked! + // Replace the old load's chain with the new load's chain. + WorkListRemover DeadNodes(*this); + DAG.ReplaceAllUsesOfValueWith(N0.getValue(1), Load.getValue(1), + &DeadNodes); + // Return the new loaded value. + return Load; } return SDValue(); Added: llvm/trunk/test/CodeGen/X86/pr3317.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/pr3317.ll?rev=62692&view=auto ============================================================================== --- llvm/trunk/test/CodeGen/X86/pr3317.ll (added) +++ llvm/trunk/test/CodeGen/X86/pr3317.ll Wed Jan 21 09:17:51 2009 @@ -0,0 +1,46 @@ +; RUN: llvm-as < %s | llc -march=x86 +; PR3317 + + %ArraySInt16 = type { %JavaObject, i8*, [0 x i16] } + %ArraySInt8 = type { %JavaObject, i8*, [0 x i8] } + %Attribut = type { %ArraySInt16*, i32, i32 } + %CacheNode = type { i8*, %JavaCommonClass*, %CacheNode*, %Enveloppe* } + %Enveloppe = type { %CacheNode*, %ArraySInt16*, %ArraySInt16*, i8, %JavaClass*, %CacheNode } + %JavaArray = type { %JavaObject, i8* } + %JavaClass = type { %JavaCommonClass, i32, %VT*, [1 x %TaskClassMirror], i8*, %JavaField*, i16, %JavaField*, i16, %JavaMethod*, i16, %JavaMethod*, i16, i8*, %ArraySInt8*, i8*, %Attribut*, i16, %JavaClass**, i16, %JavaClass*, i16, i8, i32, i32, i8*, void (i8*)* } + %JavaCommonClass = type { %JavaCommonClass**, i32, [1 x %JavaObject*], i16, %JavaClass**, i16, %ArraySInt16*, %JavaClass*, i8* } + %JavaField = type { i8*, i16, %ArraySInt16*, %ArraySInt16*, %Attribut*, i16, %JavaClass*, i32, i16, i8* } + %JavaMethod = type { i8*, i16, %Attribut*, i16, %Enveloppe*, i16, %JavaClass*, %ArraySInt16*, %ArraySInt16*, i8, i8*, i32, i8* } + %JavaObject = type { %VT*, %JavaCommonClass*, i8* } + %TaskClassMirror = type { i32, i8* } + %UTF8 = type { %JavaObject, i8*, [0 x i16] } + %VT = type [0 x i32 (...)*] + +declare void @jnjvmNullPointerException() + +define i32 @JnJVM_java_rmi_activation_ActivationGroupID_hashCode__(%JavaObject* nocapture) nounwind { +start: + %1 = getelementptr %JavaObject* %0, i64 1, i32 1 ; <%JavaCommonClass**> [#uses=1] + %2 = load %JavaCommonClass** %1 ; <%JavaCommonClass*> [#uses=4] + %3 = icmp eq %JavaCommonClass* %2, null ; [#uses=1] + br i1 %3, label %verifyNullExit1, label %verifyNullCont2 + +verifyNullExit1: ; preds = %start + tail call void @jnjvmNullPointerException() + unreachable + +verifyNullCont2: ; preds = %start + %4 = bitcast %JavaCommonClass* %2 to { %JavaObject, i16, i32, i64 }* ; <{ %JavaObject, i16, i32, i64 }*> [#uses=1] + %5 = getelementptr { %JavaObject, i16, i32, i64 }* %4, i64 0, i32 2 ; [#uses=1] + %6 = load i32* %5 ; [#uses=1] + %7 = getelementptr %JavaCommonClass* %2, i64 0, i32 4 ; <%JavaClass***> [#uses=1] + %8 = bitcast %JavaClass*** %7 to i64* ; [#uses=1] + %9 = load i64* %8 ; [#uses=1] + %10 = trunc i64 %9 to i32 ; [#uses=1] + %11 = getelementptr %JavaCommonClass* %2, i64 0, i32 3 ; [#uses=1] + %12 = load i16* %11 ; [#uses=1] + %13 = sext i16 %12 to i32 ; [#uses=1] + %14 = xor i32 %10, %6 ; [#uses=1] + %15 = xor i32 %14, %13 ; [#uses=1] + ret i32 %15 +} From neil at daikokuya.co.uk Wed Jan 21 09:34:11 2009 From: neil at daikokuya.co.uk (Neil Booth) Date: Thu, 22 Jan 2009 00:34:11 +0900 Subject: [llvm-commits] [llvm] r62645 - in /llvm/trunk: include/llvm/ADT/APFloat.h lib/Support/APFloat.cpp lib/Transforms/Scalar/InstructionCombining.cpp lib/VMCore/ConstantFold.cpp test/Transforms/InstCombine/2009-01-19-fmod-constant-float-specials. ll In-Reply-To: <200901210035.n0L0ZKU8008095@zion.cs.uiuc.edu> References: <200901210035.n0L0ZKU8008095@zion.cs.uiuc.edu> Message-ID: <20090121153411.GH14812@daikokuya.co.uk> Dale Johannesen wrote:- > Author: johannes > Date: Tue Jan 20 18:35:19 2009 > New Revision: 62645 > > URL: http://llvm.org/viewvc/llvm-project?rev=62645&view=rev > Log: > Make special cases (0 inf nan) work for frem. > Besides APFloat, this involved removing code > from two places that thought they knew the > result of frem(0., x) but were wrong. Cool. Neil. From criswell at uiuc.edu Wed Jan 21 10:03:36 2009 From: criswell at uiuc.edu (John Criswell) Date: Wed, 21 Jan 2009 16:03:36 -0000 Subject: [llvm-commits] [poolalloc] r62693 - /poolalloc/trunk/include/dsa/DataStructure.h Message-ID: <200901211603.n0LG3aWK016763@zion.cs.uiuc.edu> Author: criswell Date: Wed Jan 21 10:03:35 2009 New Revision: 62693 URL: http://llvm.org/viewvc/llvm-project?rev=62693&view=rev Log: The Top-Down DSA pass copies the DSGraph of the Bottom-Up DSA pass; therefore, it can mark it as a preserved pass. This fixes the DSA alias analysis pass. Modified: poolalloc/trunk/include/dsa/DataStructure.h Modified: poolalloc/trunk/include/dsa/DataStructure.h URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/include/dsa/DataStructure.h?rev=62693&r1=62692&r2=62693&view=diff ============================================================================== --- poolalloc/trunk/include/dsa/DataStructure.h (original) +++ poolalloc/trunk/include/dsa/DataStructure.h Wed Jan 21 10:03:35 2009 @@ -355,10 +355,12 @@ /// getAnalysisUsage - This obviously provides a data structure graph. /// virtual void getAnalysisUsage(AnalysisUsage &AU) const { - if (useEQBU) + if (useEQBU) { AU.addRequired(); - else + } else { AU.addRequired(); + AU.addPreserved(); + } AU.addPreserved(); AU.setPreservesCFG(); } From dpatel at apple.com Wed Jan 21 11:49:18 2009 From: dpatel at apple.com (Devang Patel) Date: Wed, 21 Jan 2009 09:49:18 -0800 Subject: [llvm-commits] [llvm] r62555 - /llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp In-Reply-To: <175C9F4E-4F5A-4710-BC0B-5B1B6E227BE9@apple.com> References: <200901200058.n0K0wtJV015379@zion.cs.uiuc.edu> <175C9F4E-4F5A-4710-BC0B-5B1B6E227BE9@apple.com> Message-ID: On Jan 20, 2009, at 10:28 PM, Chris Lattner wrote: > > On Jan 19, 2009, at 4:58 PM, Devang Patel wrote: > >> Author: dpatel >> Date: Mon Jan 19 18:58:55 2009 >> New Revision: 62555 >> >> URL: http://llvm.org/viewvc/llvm-project?rev=62555&view=rev >> Log: >> Do not use DenseMap because the iterator is invalidated while >> constructing types. After all there was a reason why std::map was >> used initially! > > Aha! Can you change the code to just not depend on this? yup, we can. > In other > words, instead of: > > DIE *&Entry = GVToDieMap[GV]; > ... > something that could invalidate Entry > ... > > Entry = ... > > Just do: > > DIE *&Entry = GVToDieMap[GV]; > ... > something that could invalidate Entry > ... > > GVToDieMap[GV] = ... > > ? > > DenseMap is much much faster for pointer pairs than std::map. > > > -Chris > >> >> >> >> Modified: >> llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp >> >> Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp >> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp?rev=62555&r1=62554&r2=62555&view=diff >> >> = >> = >> = >> = >> = >> = >> = >> = >> = >> ===================================================================== >> --- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp (original) >> +++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp Mon Jan 19 >> 18:58:55 2009 >> @@ -779,11 +779,11 @@ >> >> /// GVToDieMap - Tracks the mapping of unit level debug informaton >> /// variables to debug information entries. >> - DenseMap GVToDieMap; >> + std::map GVToDieMap; >> >> /// GVToDIEntryMap - Tracks the mapping of unit level debug >> informaton >> /// descriptors to debug information entries using a DIEntry proxy. >> - DenseMap GVToDIEntryMap; >> + std::map GVToDIEntryMap; >> >> /// Globals - A map of globally visible named entities for this >> unit. >> /// >> >> >> _______________________________________________ >> 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 - Devang From sabre at nondot.org Wed Jan 21 12:09:25 2009 From: sabre at nondot.org (Chris Lattner) Date: Wed, 21 Jan 2009 18:09:25 -0000 Subject: [llvm-commits] [llvm] r62695 - in /llvm/trunk/lib: Support/APInt.cpp Transforms/Scalar/InstructionCombining.cpp Message-ID: <200901211809.n0LI9PbC021468@zion.cs.uiuc.edu> Author: lattner Date: Wed Jan 21 12:09:24 2009 New Revision: 62695 URL: http://llvm.org/viewvc/llvm-project?rev=62695&view=rev Log: Remove uses of uint32_t in favor of 'unsigned' for better compatibility with cygwin. Patch by Jay Foad! Modified: llvm/trunk/lib/Support/APInt.cpp llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp Modified: llvm/trunk/lib/Support/APInt.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/APInt.cpp?rev=62695&r1=62694&r2=62695&view=diff ============================================================================== --- llvm/trunk/lib/Support/APInt.cpp (original) +++ llvm/trunk/lib/Support/APInt.cpp Wed Jan 21 12:09:24 2009 @@ -27,7 +27,7 @@ /// A utility function for allocating memory, checking for allocation failures, /// and ensuring the contents are zeroed. -inline static uint64_t* getClearedMemory(uint32_t numWords) { +inline static uint64_t* getClearedMemory(unsigned numWords) { uint64_t * result = new uint64_t[numWords]; assert(result && "APInt memory allocation fails!"); memset(result, 0, numWords * sizeof(uint64_t)); @@ -36,13 +36,13 @@ /// A utility function for allocating memory and checking for allocation /// failure. The content is not zeroed. -inline static uint64_t* getMemory(uint32_t numWords) { +inline static uint64_t* getMemory(unsigned numWords) { uint64_t * result = new uint64_t[numWords]; assert(result && "APInt memory allocation fails!"); return result; } -void APInt::initSlowCase(uint32_t numBits, uint64_t val, bool isSigned) { +void APInt::initSlowCase(unsigned numBits, uint64_t val, bool isSigned) { pVal = getClearedMemory(getNumWords()); pVal[0] = val; if (isSigned && int64_t(val) < 0) @@ -56,7 +56,7 @@ } -APInt::APInt(uint32_t numBits, uint32_t numWords, const uint64_t bigVal[]) +APInt::APInt(unsigned numBits, unsigned numWords, const uint64_t bigVal[]) : BitWidth(numBits), VAL(0) { assert(BitWidth && "bitwidth too small"); assert(bigVal && "Null pointer detected!"); @@ -66,7 +66,7 @@ // Get memory, cleared to 0 pVal = getClearedMemory(getNumWords()); // Calculate the number of words to copy - uint32_t words = std::min(numWords, getNumWords()); + unsigned words = std::min(numWords, getNumWords()); // Copy the words from bigVal to pVal memcpy(pVal, bigVal, words * APINT_WORD_SIZE); } @@ -74,7 +74,7 @@ clearUnusedBits(); } -APInt::APInt(uint32_t numbits, const char StrStart[], uint32_t slen, +APInt::APInt(unsigned numbits, const char StrStart[], unsigned slen, uint8_t radix) : BitWidth(numbits), VAL(0) { assert(BitWidth && "bitwidth too small"); @@ -132,7 +132,7 @@ return; } - uint32_t NumWords = getNumWords(); + unsigned NumWords = getNumWords(); for (unsigned i = 0; i < NumWords; ++i) ID.AddInteger(pVal[i]); } @@ -141,8 +141,8 @@ /// "digit" integer array, x[]. x[] is modified to reflect the addition and /// 1 is returned if there is a carry out, otherwise 0 is returned. /// @returns the carry of the addition. -static bool add_1(uint64_t dest[], uint64_t x[], uint32_t len, uint64_t y) { - for (uint32_t i = 0; i < len; ++i) { +static bool add_1(uint64_t dest[], uint64_t x[], unsigned len, uint64_t y) { + for (unsigned i = 0; i < len; ++i) { dest[i] = y + x[i]; if (dest[i] < y) y = 1; // Carry one to next digit. @@ -169,8 +169,8 @@ /// is 1 if "borrowing" exhausted the digits in x, or 0 if x was not exhausted. /// In other words, if y > x then this function returns 1, otherwise 0. /// @returns the borrow out of the subtraction -static bool sub_1(uint64_t x[], uint32_t len, uint64_t y) { - for (uint32_t i = 0; i < len; ++i) { +static bool sub_1(uint64_t x[], unsigned len, uint64_t y) { + for (unsigned i = 0; i < len; ++i) { uint64_t X = x[i]; x[i] -= y; if (y > X) @@ -197,9 +197,9 @@ /// @returns the carry out from the addition /// @brief General addition of 64-bit integer arrays static bool add(uint64_t *dest, const uint64_t *x, const uint64_t *y, - uint32_t len) { + unsigned len) { bool carry = false; - for (uint32_t i = 0; i< len; ++i) { + for (unsigned i = 0; i< len; ++i) { uint64_t limit = std::min(x[i],y[i]); // must come first in case dest == x dest[i] = x[i] + y[i] + carry; carry = dest[i] < limit || (carry && dest[i] == limit); @@ -224,9 +224,9 @@ /// @returns returns the borrow out. /// @brief Generalized subtraction of 64-bit integer arrays. static bool sub(uint64_t *dest, const uint64_t *x, const uint64_t *y, - uint32_t len) { + unsigned len) { bool borrow = false; - for (uint32_t i = 0; i < len; ++i) { + for (unsigned i = 0; i < len; ++i) { uint64_t x_tmp = borrow ? x[i] - 1 : x[i]; borrow = y[i] > x_tmp || (borrow && x[i] == 0); dest[i] = x_tmp - y[i]; @@ -250,13 +250,13 @@ /// into dest. /// @returns the carry out of the multiplication. /// @brief Multiply a multi-digit APInt by a single digit (64-bit) integer. -static uint64_t mul_1(uint64_t dest[], uint64_t x[], uint32_t len, uint64_t y) { +static uint64_t mul_1(uint64_t dest[], uint64_t x[], unsigned len, uint64_t y) { // Split y into high 32-bit part (hy) and low 32-bit part (ly) uint64_t ly = y & 0xffffffffULL, hy = y >> 32; uint64_t carry = 0; // For each digit of x. - for (uint32_t i = 0; i < len; ++i) { + for (unsigned i = 0; i < len; ++i) { // Split x into high and low words uint64_t lx = x[i] & 0xffffffffULL; uint64_t hx = x[i] >> 32; @@ -284,13 +284,13 @@ /// Multiplies integer array x by integer array y and stores the result into /// the integer array dest. Note that dest's size must be >= xlen + ylen. /// @brief Generalized multiplicate of integer arrays. -static void mul(uint64_t dest[], uint64_t x[], uint32_t xlen, uint64_t y[], - uint32_t ylen) { +static void mul(uint64_t dest[], uint64_t x[], unsigned xlen, uint64_t y[], + unsigned ylen) { dest[xlen] = mul_1(dest, x, xlen, y[0]); - for (uint32_t i = 1; i < ylen; ++i) { + for (unsigned i = 1; i < ylen; ++i) { uint64_t ly = y[i] & 0xffffffffULL, hy = y[i] >> 32; uint64_t carry = 0, lx = 0, hx = 0; - for (uint32_t j = 0; j < xlen; ++j) { + for (unsigned j = 0; j < xlen; ++j) { lx = x[j] & 0xffffffffULL; hx = x[j] >> 32; // hasCarry - A flag to indicate if has carry. @@ -323,15 +323,15 @@ } // Get some bit facts about LHS and check for zero - uint32_t lhsBits = getActiveBits(); - uint32_t lhsWords = !lhsBits ? 0 : whichWord(lhsBits - 1) + 1; + unsigned lhsBits = getActiveBits(); + unsigned lhsWords = !lhsBits ? 0 : whichWord(lhsBits - 1) + 1; if (!lhsWords) // 0 * X ===> 0 return *this; // Get some bit facts about RHS and check for zero - uint32_t rhsBits = RHS.getActiveBits(); - uint32_t rhsWords = !rhsBits ? 0 : whichWord(rhsBits - 1) + 1; + unsigned rhsBits = RHS.getActiveBits(); + unsigned rhsWords = !rhsBits ? 0 : whichWord(rhsBits - 1) + 1; if (!rhsWords) { // X * 0 ===> 0 clear(); @@ -339,7 +339,7 @@ } // Allocate space for the result - uint32_t destWords = rhsWords + lhsWords; + unsigned destWords = rhsWords + lhsWords; uint64_t *dest = getMemory(destWords); // Perform the long multiply @@ -347,7 +347,7 @@ // Copy result back into *this clear(); - uint32_t wordsToCopy = destWords >= getNumWords() ? getNumWords() : destWords; + unsigned wordsToCopy = destWords >= getNumWords() ? getNumWords() : destWords; memcpy(pVal, dest, wordsToCopy * APINT_WORD_SIZE); // delete dest array and return @@ -361,8 +361,8 @@ VAL &= RHS.VAL; return *this; } - uint32_t numWords = getNumWords(); - for (uint32_t i = 0; i < numWords; ++i) + unsigned numWords = getNumWords(); + for (unsigned i = 0; i < numWords; ++i) pVal[i] &= RHS.pVal[i]; return *this; } @@ -373,8 +373,8 @@ VAL |= RHS.VAL; return *this; } - uint32_t numWords = getNumWords(); - for (uint32_t i = 0; i < numWords; ++i) + unsigned numWords = getNumWords(); + for (unsigned i = 0; i < numWords; ++i) pVal[i] |= RHS.pVal[i]; return *this; } @@ -386,32 +386,32 @@ this->clearUnusedBits(); return *this; } - uint32_t numWords = getNumWords(); - for (uint32_t i = 0; i < numWords; ++i) + unsigned numWords = getNumWords(); + for (unsigned i = 0; i < numWords; ++i) pVal[i] ^= RHS.pVal[i]; return clearUnusedBits(); } APInt APInt::AndSlowCase(const APInt& RHS) const { - uint32_t numWords = getNumWords(); + unsigned numWords = getNumWords(); uint64_t* val = getMemory(numWords); - for (uint32_t i = 0; i < numWords; ++i) + for (unsigned i = 0; i < numWords; ++i) val[i] = pVal[i] & RHS.pVal[i]; return APInt(val, getBitWidth()); } APInt APInt::OrSlowCase(const APInt& RHS) const { - uint32_t numWords = getNumWords(); + unsigned numWords = getNumWords(); uint64_t *val = getMemory(numWords); - for (uint32_t i = 0; i < numWords; ++i) + for (unsigned i = 0; i < numWords; ++i) val[i] = pVal[i] | RHS.pVal[i]; return APInt(val, getBitWidth()); } APInt APInt::XorSlowCase(const APInt& RHS) const { - uint32_t numWords = getNumWords(); + unsigned numWords = getNumWords(); uint64_t *val = getMemory(numWords); - for (uint32_t i = 0; i < numWords; ++i) + for (unsigned i = 0; i < numWords; ++i) val[i] = pVal[i] ^ RHS.pVal[i]; // 0^0==1 so clear the high bits in case they got set. @@ -422,7 +422,7 @@ if (isSingleWord()) return !VAL; - for (uint32_t i = 0; i < getNumWords(); ++i) + for (unsigned i = 0; i < getNumWords(); ++i) if (pVal[i]) return false; return true; @@ -455,15 +455,15 @@ return Result.clearUnusedBits(); } -bool APInt::operator[](uint32_t bitPosition) const { +bool APInt::operator[](unsigned bitPosition) const { return (maskBit(bitPosition) & (isSingleWord() ? VAL : pVal[whichWord(bitPosition)])) != 0; } bool APInt::EqualSlowCase(const APInt& RHS) const { // Get some facts about the number of bits used in the two operands. - uint32_t n1 = getActiveBits(); - uint32_t n2 = RHS.getActiveBits(); + unsigned n1 = getActiveBits(); + unsigned n2 = RHS.getActiveBits(); // If the number of bits isn't the same, they aren't equal if (n1 != n2) @@ -481,7 +481,7 @@ } bool APInt::EqualSlowCase(uint64_t Val) const { - uint32_t n = getActiveBits(); + unsigned n = getActiveBits(); if (n <= APINT_BITS_PER_WORD) return pVal[0] == Val; else @@ -494,8 +494,8 @@ return VAL < RHS.VAL; // Get active bit length of both operands - uint32_t n1 = getActiveBits(); - uint32_t n2 = RHS.getActiveBits(); + unsigned n1 = getActiveBits(); + unsigned n2 = RHS.getActiveBits(); // If magnitude of LHS is less than RHS, return true. if (n1 < n2) @@ -510,7 +510,7 @@ return pVal[0] < RHS.pVal[0]; // Otherwise, compare all words - uint32_t topWord = whichWord(std::max(n1,n2)-1); + unsigned topWord = whichWord(std::max(n1,n2)-1); for (int i = topWord; i >= 0; --i) { if (pVal[i] > RHS.pVal[i]) return false; @@ -556,7 +556,7 @@ return lhs.ult(rhs); } -APInt& APInt::set(uint32_t bitPosition) { +APInt& APInt::set(unsigned bitPosition) { if (isSingleWord()) VAL |= maskBit(bitPosition); else @@ -566,7 +566,7 @@ /// Set the given bit to 0 whose position is given as "bitPosition". /// @brief Set a given bit to 0. -APInt& APInt::clear(uint32_t bitPosition) { +APInt& APInt::clear(unsigned bitPosition) { if (isSingleWord()) VAL &= ~maskBit(bitPosition); else @@ -579,19 +579,19 @@ /// Toggle a given bit to its opposite value whose position is given /// as "bitPosition". /// @brief Toggles a given bit to its opposite value. -APInt& APInt::flip(uint32_t bitPosition) { +APInt& APInt::flip(unsigned bitPosition) { assert(bitPosition < BitWidth && "Out of the bit-width range!"); if ((*this)[bitPosition]) clear(bitPosition); else set(bitPosition); return *this; } -uint32_t APInt::getBitsNeeded(const char* str, uint32_t slen, uint8_t radix) { +unsigned APInt::getBitsNeeded(const char* str, unsigned slen, uint8_t radix) { assert(str != 0 && "Invalid value string"); assert(slen > 0 && "Invalid string length"); // Each computation below needs to know if its negative - uint32_t isNegative = str[0] == '-'; + unsigned isNegative = str[0] == '-'; if (isNegative) { slen--; str++; @@ -614,7 +614,7 @@ // Compute a sufficient number of bits that is always large enough but might // be too large. This avoids the assertion in the constructor. - uint32_t sufficient = slen*64/18; + unsigned sufficient = slen*64/18; // Convert to the actual binary value. APInt tmp(sufficient, str, slen, radix); @@ -631,18 +631,18 @@ if (isSingleWord()) hash += VAL << 6; // clear separation of up to 64 bits else - for (uint32_t i = 0; i < getNumWords(); ++i) + for (unsigned i = 0; i < getNumWords(); ++i) hash += pVal[i] << 6; // clear sepration of up to 64 bits return hash; } /// HiBits - This function returns the high "numBits" bits of this APInt. -APInt APInt::getHiBits(uint32_t numBits) const { +APInt APInt::getHiBits(unsigned numBits) const { return APIntOps::lshr(*this, BitWidth - numBits); } /// LoBits - This function returns the low "numBits" bits of this APInt. -APInt APInt::getLoBits(uint32_t numBits) const { +APInt APInt::getLoBits(unsigned numBits) const { return APIntOps::lshr(APIntOps::shl(*this, BitWidth - numBits), BitWidth - numBits); } @@ -651,9 +651,9 @@ return (!!*this) && !(*this & (*this - APInt(BitWidth,1))); } -uint32_t APInt::countLeadingZerosSlowCase() const { - uint32_t Count = 0; - for (uint32_t i = getNumWords(); i > 0u; --i) { +unsigned APInt::countLeadingZerosSlowCase() const { + unsigned Count = 0; + for (unsigned i = getNumWords(); i > 0u; --i) { if (pVal[i-1] == 0) Count += APINT_BITS_PER_WORD; else { @@ -661,14 +661,14 @@ break; } } - uint32_t remainder = BitWidth % APINT_BITS_PER_WORD; + unsigned remainder = BitWidth % APINT_BITS_PER_WORD; if (remainder) Count -= APINT_BITS_PER_WORD - remainder; return std::min(Count, BitWidth); } -static uint32_t countLeadingOnes_64(uint64_t V, uint32_t skip) { - uint32_t Count = 0; +static unsigned countLeadingOnes_64(uint64_t V, unsigned skip) { + unsigned Count = 0; if (skip) V <<= skip; while (V && (V & (1ULL << 63))) { @@ -678,14 +678,14 @@ return Count; } -uint32_t APInt::countLeadingOnes() const { +unsigned APInt::countLeadingOnes() const { if (isSingleWord()) return countLeadingOnes_64(VAL, APINT_BITS_PER_WORD - BitWidth); - uint32_t highWordBits = BitWidth % APINT_BITS_PER_WORD; - uint32_t shift = (highWordBits == 0 ? 0 : APINT_BITS_PER_WORD - highWordBits); + unsigned highWordBits = BitWidth % APINT_BITS_PER_WORD; + unsigned shift = (highWordBits == 0 ? 0 : APINT_BITS_PER_WORD - highWordBits); int i = getNumWords() - 1; - uint32_t Count = countLeadingOnes_64(pVal[i], shift); + unsigned Count = countLeadingOnes_64(pVal[i], shift); if (Count == highWordBits) { for (i--; i >= 0; --i) { if (pVal[i] == -1ULL) @@ -699,11 +699,11 @@ return Count; } -uint32_t APInt::countTrailingZeros() const { +unsigned APInt::countTrailingZeros() const { if (isSingleWord()) - return std::min(uint32_t(CountTrailingZeros_64(VAL)), BitWidth); - uint32_t Count = 0; - uint32_t i = 0; + return std::min(unsigned(CountTrailingZeros_64(VAL)), BitWidth); + unsigned Count = 0; + unsigned i = 0; for (; i < getNumWords() && pVal[i] == 0; ++i) Count += APINT_BITS_PER_WORD; if (i < getNumWords()) @@ -711,9 +711,9 @@ return std::min(Count, BitWidth); } -uint32_t APInt::countTrailingOnesSlowCase() const { - uint32_t Count = 0; - uint32_t i = 0; +unsigned APInt::countTrailingOnesSlowCase() const { + unsigned Count = 0; + unsigned i = 0; for (; i < getNumWords() && pVal[i] == -1ULL; ++i) Count += APINT_BITS_PER_WORD; if (i < getNumWords()) @@ -721,9 +721,9 @@ return std::min(Count, BitWidth); } -uint32_t APInt::countPopulationSlowCase() const { - uint32_t Count = 0; - for (uint32_t i = 0; i < getNumWords(); ++i) +unsigned APInt::countPopulationSlowCase() const { + unsigned Count = 0; + for (unsigned i = 0; i < getNumWords(); ++i) Count += CountPopulation_64(pVal[i]); return Count; } @@ -733,9 +733,9 @@ if (BitWidth == 16) return APInt(BitWidth, ByteSwap_16(uint16_t(VAL))); else if (BitWidth == 32) - return APInt(BitWidth, ByteSwap_32(uint32_t(VAL))); + return APInt(BitWidth, ByteSwap_32(unsigned(VAL))); else if (BitWidth == 48) { - uint32_t Tmp1 = uint32_t(VAL >> 16); + unsigned Tmp1 = unsigned(VAL >> 16); Tmp1 = ByteSwap_32(Tmp1); uint16_t Tmp2 = uint16_t(VAL); Tmp2 = ByteSwap_16(Tmp2); @@ -745,7 +745,7 @@ else { APInt Result(BitWidth, 0); char *pByte = (char*)Result.pVal; - for (uint32_t i = 0; i < BitWidth / APINT_WORD_SIZE / 2; ++i) { + for (unsigned i = 0; i < BitWidth / APINT_WORD_SIZE / 2; ++i) { char Tmp = pByte[i]; pByte[i] = pByte[BitWidth / APINT_WORD_SIZE - 1 - i]; pByte[BitWidth / APINT_WORD_SIZE - i - 1] = Tmp; @@ -765,7 +765,7 @@ return A; } -APInt llvm::APIntOps::RoundDoubleToAPInt(double Double, uint32_t width) { +APInt llvm::APIntOps::RoundDoubleToAPInt(double Double, unsigned width) { union { double D; uint64_t I; @@ -797,7 +797,7 @@ // Otherwise, we have to shift the mantissa bits up to the right location APInt Tmp(width, mantissa); - Tmp = Tmp.shl((uint32_t)exp - 52); + Tmp = Tmp.shl((unsigned)exp - 52); return isNeg ? -Tmp : Tmp; } @@ -826,7 +826,7 @@ APInt Tmp(isNeg ? -(*this) : (*this)); // Figure out how many bits we're using. - uint32_t n = Tmp.getActiveBits(); + unsigned n = Tmp.getActiveBits(); // The exponent (without bias normalization) is just the number of bits // we are using. Note that the sign bit is gone since we constructed the @@ -868,12 +868,12 @@ } // Truncate to new width. -APInt &APInt::trunc(uint32_t width) { +APInt &APInt::trunc(unsigned width) { assert(width < BitWidth && "Invalid APInt Truncate request"); assert(width && "Can't truncate to 0 bits"); - uint32_t wordsBefore = getNumWords(); + unsigned wordsBefore = getNumWords(); BitWidth = width; - uint32_t wordsAfter = getNumWords(); + unsigned wordsAfter = getNumWords(); if (wordsBefore != wordsAfter) { if (wordsAfter == 1) { uint64_t *tmp = pVal; @@ -881,7 +881,7 @@ delete [] tmp; } else { uint64_t *newVal = getClearedMemory(wordsAfter); - for (uint32_t i = 0; i < wordsAfter; ++i) + for (unsigned i = 0; i < wordsAfter; ++i) newVal[i] = pVal[i]; delete [] pVal; pVal = newVal; @@ -891,7 +891,7 @@ } // Sign extend to a new width. -APInt &APInt::sext(uint32_t width) { +APInt &APInt::sext(unsigned width) { assert(width > BitWidth && "Invalid APInt SignExtend request"); // If the sign bit isn't set, this is the same as zext. if (!isNegative()) { @@ -900,14 +900,14 @@ } // The sign bit is set. First, get some facts - uint32_t wordsBefore = getNumWords(); - uint32_t wordBits = BitWidth % APINT_BITS_PER_WORD; + unsigned wordsBefore = getNumWords(); + unsigned wordBits = BitWidth % APINT_BITS_PER_WORD; BitWidth = width; - uint32_t wordsAfter = getNumWords(); + unsigned wordsAfter = getNumWords(); // Mask the high order word appropriately if (wordsBefore == wordsAfter) { - uint32_t newWordBits = width % APINT_BITS_PER_WORD; + unsigned newWordBits = width % APINT_BITS_PER_WORD; // The extension is contained to the wordsBefore-1th word. uint64_t mask = ~0ULL; if (newWordBits) @@ -925,11 +925,11 @@ if (wordsBefore == 1) newVal[0] = VAL | mask; else { - for (uint32_t i = 0; i < wordsBefore; ++i) + for (unsigned i = 0; i < wordsBefore; ++i) newVal[i] = pVal[i]; newVal[wordsBefore-1] |= mask; } - for (uint32_t i = wordsBefore; i < wordsAfter; i++) + for (unsigned i = wordsBefore; i < wordsAfter; i++) newVal[i] = -1ULL; if (wordsBefore != 1) delete [] pVal; @@ -938,17 +938,17 @@ } // Zero extend to a new width. -APInt &APInt::zext(uint32_t width) { +APInt &APInt::zext(unsigned width) { assert(width > BitWidth && "Invalid APInt ZeroExtend request"); - uint32_t wordsBefore = getNumWords(); + unsigned wordsBefore = getNumWords(); BitWidth = width; - uint32_t wordsAfter = getNumWords(); + unsigned wordsAfter = getNumWords(); if (wordsBefore != wordsAfter) { uint64_t *newVal = getClearedMemory(wordsAfter); if (wordsBefore == 1) newVal[0] = VAL; else - for (uint32_t i = 0; i < wordsBefore; ++i) + for (unsigned i = 0; i < wordsBefore; ++i) newVal[i] = pVal[i]; if (wordsBefore != 1) delete [] pVal; @@ -957,7 +957,7 @@ return *this; } -APInt &APInt::zextOrTrunc(uint32_t width) { +APInt &APInt::zextOrTrunc(unsigned width) { if (BitWidth < width) return zext(width); if (BitWidth > width) @@ -965,7 +965,7 @@ return *this; } -APInt &APInt::sextOrTrunc(uint32_t width) { +APInt &APInt::sextOrTrunc(unsigned width) { if (BitWidth < width) return sext(width); if (BitWidth > width) @@ -976,12 +976,12 @@ /// Arithmetic right-shift this APInt by shiftAmt. /// @brief Arithmetic right-shift function. APInt APInt::ashr(const APInt &shiftAmt) const { - return ashr((uint32_t)shiftAmt.getLimitedValue(BitWidth)); + return ashr((unsigned)shiftAmt.getLimitedValue(BitWidth)); } /// Arithmetic right-shift this APInt by shiftAmt. /// @brief Arithmetic right-shift function. -APInt APInt::ashr(uint32_t shiftAmt) const { +APInt APInt::ashr(unsigned shiftAmt) const { assert(shiftAmt <= BitWidth && "Invalid shift amount"); // Handle a degenerate case if (shiftAmt == 0) @@ -992,7 +992,7 @@ if (shiftAmt == BitWidth) return APInt(BitWidth, 0); // undefined else { - uint32_t SignBit = APINT_BITS_PER_WORD - BitWidth; + unsigned SignBit = APINT_BITS_PER_WORD - BitWidth; return APInt(BitWidth, (((int64_t(VAL) << SignBit) >> SignBit) >> shiftAmt)); } @@ -1012,17 +1012,17 @@ uint64_t * val = new uint64_t[getNumWords()]; // Compute some values needed by the following shift algorithms - uint32_t wordShift = shiftAmt % APINT_BITS_PER_WORD; // bits to shift per word - uint32_t offset = shiftAmt / APINT_BITS_PER_WORD; // word offset for shift - uint32_t breakWord = getNumWords() - 1 - offset; // last word affected - uint32_t bitsInWord = whichBit(BitWidth); // how many bits in last word? + unsigned wordShift = shiftAmt % APINT_BITS_PER_WORD; // bits to shift per word + unsigned offset = shiftAmt / APINT_BITS_PER_WORD; // word offset for shift + unsigned breakWord = getNumWords() - 1 - offset; // last word affected + unsigned bitsInWord = whichBit(BitWidth); // how many bits in last word? if (bitsInWord == 0) bitsInWord = APINT_BITS_PER_WORD; // If we are shifting whole words, just move whole words if (wordShift == 0) { // Move the words containing significant bits - for (uint32_t i = 0; i <= breakWord; ++i) + for (unsigned i = 0; i <= breakWord; ++i) val[i] = pVal[i+offset]; // move whole word // Adjust the top significant word for sign bit fill, if negative @@ -1031,7 +1031,7 @@ val[breakWord] |= ~0ULL << bitsInWord; // set high bits } else { // Shift the low order words - for (uint32_t i = 0; i < breakWord; ++i) { + for (unsigned i = 0; i < breakWord; ++i) { // This combines the shifted corresponding word with the low bits from // the next word (shifted into this word's high bits). val[i] = (pVal[i+offset] >> wordShift) | @@ -1057,7 +1057,7 @@ // Remaining words are 0 or -1, just assign them. uint64_t fillValue = (isNegative() ? -1ULL : 0); - for (uint32_t i = breakWord+1; i < getNumWords(); ++i) + for (unsigned i = breakWord+1; i < getNumWords(); ++i) val[i] = fillValue; return APInt(val, BitWidth).clearUnusedBits(); } @@ -1065,12 +1065,12 @@ /// Logical right-shift this APInt by shiftAmt. /// @brief Logical right-shift function. APInt APInt::lshr(const APInt &shiftAmt) const { - return lshr((uint32_t)shiftAmt.getLimitedValue(BitWidth)); + return lshr((unsigned)shiftAmt.getLimitedValue(BitWidth)); } /// Logical right-shift this APInt by shiftAmt. /// @brief Logical right-shift function. -APInt APInt::lshr(uint32_t shiftAmt) const { +APInt APInt::lshr(unsigned shiftAmt) const { if (isSingleWord()) { if (shiftAmt == BitWidth) return APInt(BitWidth, 0); @@ -1104,28 +1104,28 @@ } // Compute some values needed by the remaining shift algorithms - uint32_t wordShift = shiftAmt % APINT_BITS_PER_WORD; - uint32_t offset = shiftAmt / APINT_BITS_PER_WORD; + unsigned wordShift = shiftAmt % APINT_BITS_PER_WORD; + unsigned offset = shiftAmt / APINT_BITS_PER_WORD; // If we are shifting whole words, just move whole words if (wordShift == 0) { - for (uint32_t i = 0; i < getNumWords() - offset; ++i) + for (unsigned i = 0; i < getNumWords() - offset; ++i) val[i] = pVal[i+offset]; - for (uint32_t i = getNumWords()-offset; i < getNumWords(); i++) + for (unsigned i = getNumWords()-offset; i < getNumWords(); i++) val[i] = 0; return APInt(val,BitWidth).clearUnusedBits(); } // Shift the low order words - uint32_t breakWord = getNumWords() - offset -1; - for (uint32_t i = 0; i < breakWord; ++i) + unsigned breakWord = getNumWords() - offset -1; + for (unsigned i = 0; i < breakWord; ++i) val[i] = (pVal[i+offset] >> wordShift) | (pVal[i+offset+1] << (APINT_BITS_PER_WORD - wordShift)); // Shift the break word. val[breakWord] = pVal[breakWord+offset] >> wordShift; // Remaining words are 0 - for (uint32_t i = breakWord+1; i < getNumWords(); ++i) + for (unsigned i = breakWord+1; i < getNumWords(); ++i) val[i] = 0; return APInt(val, BitWidth).clearUnusedBits(); } @@ -1134,10 +1134,10 @@ /// @brief Left-shift function. APInt APInt::shl(const APInt &shiftAmt) const { // It's undefined behavior in C to shift by BitWidth or greater. - return shl((uint32_t)shiftAmt.getLimitedValue(BitWidth)); + return shl((unsigned)shiftAmt.getLimitedValue(BitWidth)); } -APInt APInt::shlSlowCase(uint32_t shiftAmt) const { +APInt APInt::shlSlowCase(unsigned shiftAmt) const { // If all the bits were shifted out, the result is 0. This avoids issues // with shifting by the size of the integer type, which produces undefined // results. We define these "undefined results" to always be 0. @@ -1156,7 +1156,7 @@ // If we are shifting less than a word, do it the easy way if (shiftAmt < APINT_BITS_PER_WORD) { uint64_t carry = 0; - for (uint32_t i = 0; i < getNumWords(); i++) { + for (unsigned i = 0; i < getNumWords(); i++) { val[i] = pVal[i] << shiftAmt | carry; carry = pVal[i] >> (APINT_BITS_PER_WORD - shiftAmt); } @@ -1164,20 +1164,20 @@ } // Compute some values needed by the remaining shift algorithms - uint32_t wordShift = shiftAmt % APINT_BITS_PER_WORD; - uint32_t offset = shiftAmt / APINT_BITS_PER_WORD; + unsigned wordShift = shiftAmt % APINT_BITS_PER_WORD; + unsigned offset = shiftAmt / APINT_BITS_PER_WORD; // If we are shifting whole words, just move whole words if (wordShift == 0) { - for (uint32_t i = 0; i < offset; i++) + for (unsigned i = 0; i < offset; i++) val[i] = 0; - for (uint32_t i = offset; i < getNumWords(); i++) + for (unsigned i = offset; i < getNumWords(); i++) val[i] = pVal[i-offset]; return APInt(val,BitWidth).clearUnusedBits(); } // Copy whole words from this to Result. - uint32_t i = getNumWords() - 1; + unsigned i = getNumWords() - 1; for (; i > offset; --i) val[i] = pVal[i-offset] << wordShift | pVal[i-offset-1] >> (APINT_BITS_PER_WORD - wordShift); @@ -1188,10 +1188,10 @@ } APInt APInt::rotl(const APInt &rotateAmt) const { - return rotl((uint32_t)rotateAmt.getLimitedValue(BitWidth)); + return rotl((unsigned)rotateAmt.getLimitedValue(BitWidth)); } -APInt APInt::rotl(uint32_t rotateAmt) const { +APInt APInt::rotl(unsigned rotateAmt) const { if (rotateAmt == 0) return *this; // Don't get too fancy, just use existing shift/or facilities @@ -1203,10 +1203,10 @@ } APInt APInt::rotr(const APInt &rotateAmt) const { - return rotr((uint32_t)rotateAmt.getLimitedValue(BitWidth)); + return rotr((unsigned)rotateAmt.getLimitedValue(BitWidth)); } -APInt APInt::rotr(uint32_t rotateAmt) const { +APInt APInt::rotr(unsigned rotateAmt) const { if (rotateAmt == 0) return *this; // Don't get too fancy, just use existing shift/or facilities @@ -1227,7 +1227,7 @@ APInt APInt::sqrt() const { // Determine the magnitude of the value. - uint32_t magnitude = getActiveBits(); + unsigned magnitude = getActiveBits(); // Use a fast table for some small values. This also gets rid of some // rounding errors in libc sqrt for small values. @@ -1264,7 +1264,7 @@ // was adapted to APINt from a wikipedia article on such computations. // See http://www.wikipedia.org/ and go to the page named // Calculate_an_integer_square_root. - uint32_t nbits = BitWidth, i = 4; + unsigned nbits = BitWidth, i = 4; APInt testy(BitWidth, 16); APInt x_old(BitWidth, 1); APInt x_new(BitWidth, 0); @@ -1355,8 +1355,8 @@ /// from "Art of Computer Programming, Volume 2", section 4.3.1, p. 272. The /// variables here have the same names as in the algorithm. Comments explain /// the algorithm and any deviation from it. -static void KnuthDiv(uint32_t *u, uint32_t *v, uint32_t *q, uint32_t* r, - uint32_t m, uint32_t n) { +static void KnuthDiv(unsigned *u, unsigned *v, unsigned *q, unsigned* r, + unsigned m, unsigned n) { assert(u && "Must provide dividend"); assert(v && "Must provide divisor"); assert(q && "Must provide quotient"); @@ -1383,17 +1383,17 @@ // and v so that its high bits are shifted to the top of v's range without // overflow. Note that this can require an extra word in u so that u must // be of length m+n+1. - uint32_t shift = CountLeadingZeros_32(v[n-1]); - uint32_t v_carry = 0; - uint32_t u_carry = 0; + unsigned shift = CountLeadingZeros_32(v[n-1]); + unsigned v_carry = 0; + unsigned u_carry = 0; if (shift) { - for (uint32_t i = 0; i < m+n; ++i) { - uint32_t u_tmp = u[i] >> (32 - shift); + for (unsigned i = 0; i < m+n; ++i) { + unsigned u_tmp = u[i] >> (32 - shift); u[i] = (u[i] << shift) | u_carry; u_carry = u_tmp; } - for (uint32_t i = 0; i < n; ++i) { - uint32_t v_tmp = v[i] >> (32 - shift); + for (unsigned i = 0; i < n; ++i) { + unsigned v_tmp = v[i] >> (32 - shift); v[i] = (v[i] << shift) | v_carry; v_carry = v_tmp; } @@ -1436,7 +1436,7 @@ // consists of a simple multiplication by a one-place number, combined with // a subtraction. bool isNeg = false; - for (uint32_t i = 0; i < n; ++i) { + for (unsigned i = 0; i < n; ++i) { uint64_t u_tmp = uint64_t(u[j+i]) | (uint64_t(u[j+i+1]) << 32); uint64_t subtrahend = uint64_t(qp) * uint64_t(v[i]); bool borrow = subtrahend > u_tmp; @@ -1445,9 +1445,9 @@ << ", borrow = " << borrow << '\n'); uint64_t result = u_tmp - subtrahend; - uint32_t k = j + i; - u[k++] = (uint32_t)(result & (b-1)); // subtract low word - u[k++] = (uint32_t)(result >> 32); // subtract high word + unsigned k = j + i; + u[k++] = (unsigned)(result & (b-1)); // subtract low word + u[k++] = (unsigned)(result >> 32); // subtract high word while (borrow && k <= m+n) { // deal with borrow to the left borrow = u[k] == 0; u[k]--; @@ -1467,7 +1467,7 @@ // if (isNeg) { bool carry = true; // true because b's complement is "complement + 1" - for (uint32_t i = 0; i <= m+n; ++i) { + for (unsigned i = 0; i <= m+n; ++i) { u[i] = ~u[i] + carry; // b's complement carry = carry && u[i] == 0; } @@ -1478,7 +1478,7 @@ // D5. [Test remainder.] Set q[j] = qp. If the result of step D4 was // negative, go to step D6; otherwise go on to step D7. - q[j] = (uint32_t)qp; + q[j] = (unsigned)qp; if (isNeg) { // D6. [Add back]. The probability that this step is necessary is very // small, on the order of only 2/b. Make sure that test data accounts for @@ -1488,8 +1488,8 @@ // A carry will occur to the left of u[j+n], and it should be ignored // since it cancels with the borrow that occurred in D4. bool carry = false; - for (uint32_t i = 0; i < n; i++) { - uint32_t limit = std::min(u[j+i],v[i]); + for (unsigned i = 0; i < n; i++) { + unsigned limit = std::min(u[j+i],v[i]); u[j+i] += v[i] + carry; carry = u[j+i] < limit || (carry && u[j+i] == limit); } @@ -1514,7 +1514,7 @@ // multiplication by d by using a shift left. So, all we have to do is // shift right here. In order to mak if (shift) { - uint32_t carry = 0; + unsigned carry = 0; DEBUG(cerr << "KnuthDiv: remainder:"); for (int i = n-1; i >= 0; i--) { r[i] = (u[i] >> shift) | carry; @@ -1534,8 +1534,8 @@ #endif } -void APInt::divide(const APInt LHS, uint32_t lhsWords, - const APInt &RHS, uint32_t rhsWords, +void APInt::divide(const APInt LHS, unsigned lhsWords, + const APInt &RHS, unsigned rhsWords, APInt *Quotient, APInt *Remainder) { assert(lhsWords >= rhsWords && "Fractional result"); @@ -1547,17 +1547,17 @@ // can't use 64-bit operands here because we don't have native results of // 128-bits. Furthremore, casting the 64-bit values to 32-bit values won't // work on large-endian machines. - uint64_t mask = ~0ull >> (sizeof(uint32_t)*8); - uint32_t n = rhsWords * 2; - uint32_t m = (lhsWords * 2) - n; + uint64_t mask = ~0ull >> (sizeof(unsigned)*8); + unsigned n = rhsWords * 2; + unsigned m = (lhsWords * 2) - n; // Allocate space for the temporary values we need either on the stack, if // it will fit, or on the heap if it won't. - uint32_t SPACE[128]; - uint32_t *U = 0; - uint32_t *V = 0; - uint32_t *Q = 0; - uint32_t *R = 0; + unsigned SPACE[128]; + unsigned *U = 0; + unsigned *V = 0; + unsigned *Q = 0; + unsigned *R = 0; if ((Remainder?4:3)*n+2*m+1 <= 128) { U = &SPACE[0]; V = &SPACE[m+n+1]; @@ -1565,34 +1565,34 @@ if (Remainder) R = &SPACE[(m+n+1) + n + (m+n)]; } else { - U = new uint32_t[m + n + 1]; - V = new uint32_t[n]; - Q = new uint32_t[m+n]; + U = new unsigned[m + n + 1]; + V = new unsigned[n]; + Q = new unsigned[m+n]; if (Remainder) - R = new uint32_t[n]; + R = new unsigned[n]; } // Initialize the dividend - memset(U, 0, (m+n+1)*sizeof(uint32_t)); + memset(U, 0, (m+n+1)*sizeof(unsigned)); for (unsigned i = 0; i < lhsWords; ++i) { uint64_t tmp = (LHS.getNumWords() == 1 ? LHS.VAL : LHS.pVal[i]); - U[i * 2] = (uint32_t)(tmp & mask); - U[i * 2 + 1] = (uint32_t)(tmp >> (sizeof(uint32_t)*8)); + U[i * 2] = (unsigned)(tmp & mask); + U[i * 2 + 1] = (unsigned)(tmp >> (sizeof(unsigned)*8)); } U[m+n] = 0; // this extra word is for "spill" in the Knuth algorithm. // Initialize the divisor - memset(V, 0, (n)*sizeof(uint32_t)); + memset(V, 0, (n)*sizeof(unsigned)); for (unsigned i = 0; i < rhsWords; ++i) { uint64_t tmp = (RHS.getNumWords() == 1 ? RHS.VAL : RHS.pVal[i]); - V[i * 2] = (uint32_t)(tmp & mask); - V[i * 2 + 1] = (uint32_t)(tmp >> (sizeof(uint32_t)*8)); + V[i * 2] = (unsigned)(tmp & mask); + V[i * 2 + 1] = (unsigned)(tmp >> (sizeof(unsigned)*8)); } // initialize the quotient and remainder - memset(Q, 0, (m+n) * sizeof(uint32_t)); + memset(Q, 0, (m+n) * sizeof(unsigned)); if (Remainder) - memset(R, 0, n * sizeof(uint32_t)); + memset(R, 0, n * sizeof(unsigned)); // Now, adjust m and n for the Knuth division. n is the number of words in // the divisor. m is the number of words by which the dividend exceeds the @@ -1613,8 +1613,8 @@ // are using base 2^32 instead of base 10. assert(n != 0 && "Divide by zero?"); if (n == 1) { - uint32_t divisor = V[0]; - uint32_t remainder = 0; + unsigned divisor = V[0]; + unsigned remainder = 0; for (int i = m+n-1; i >= 0; i--) { uint64_t partial_dividend = uint64_t(remainder) << 32 | U[i]; if (partial_dividend == 0) { @@ -1622,13 +1622,13 @@ remainder = 0; } else if (partial_dividend < divisor) { Q[i] = 0; - remainder = (uint32_t)partial_dividend; + remainder = (unsigned)partial_dividend; } else if (partial_dividend == divisor) { Q[i] = 1; remainder = 0; } else { - Q[i] = (uint32_t)(partial_dividend / divisor); - remainder = (uint32_t)(partial_dividend - (Q[i] * divisor)); + Q[i] = (unsigned)(partial_dividend / divisor); + remainder = (unsigned)(partial_dividend - (Q[i] * divisor)); } } if (R) @@ -1720,11 +1720,11 @@ } // Get some facts about the LHS and RHS number of bits and words - uint32_t rhsBits = RHS.getActiveBits(); - uint32_t rhsWords = !rhsBits ? 0 : (APInt::whichWord(rhsBits - 1) + 1); + unsigned rhsBits = RHS.getActiveBits(); + unsigned rhsWords = !rhsBits ? 0 : (APInt::whichWord(rhsBits - 1) + 1); assert(rhsWords && "Divided by zero???"); - uint32_t lhsBits = this->getActiveBits(); - uint32_t lhsWords = !lhsBits ? 0 : (APInt::whichWord(lhsBits - 1) + 1); + unsigned lhsBits = this->getActiveBits(); + unsigned lhsWords = !lhsBits ? 0 : (APInt::whichWord(lhsBits - 1) + 1); // Deal with some degenerate cases if (!lhsWords) @@ -1755,12 +1755,12 @@ } // Get some facts about the LHS - uint32_t lhsBits = getActiveBits(); - uint32_t lhsWords = !lhsBits ? 0 : (whichWord(lhsBits - 1) + 1); + unsigned lhsBits = getActiveBits(); + unsigned lhsWords = !lhsBits ? 0 : (whichWord(lhsBits - 1) + 1); // Get some facts about the RHS - uint32_t rhsBits = RHS.getActiveBits(); - uint32_t rhsWords = !rhsBits ? 0 : (APInt::whichWord(rhsBits - 1) + 1); + unsigned rhsBits = RHS.getActiveBits(); + unsigned rhsWords = !rhsBits ? 0 : (APInt::whichWord(rhsBits - 1) + 1); assert(rhsWords && "Performing remainder operation by zero ???"); // Check the degenerate cases @@ -1787,10 +1787,10 @@ void APInt::udivrem(const APInt &LHS, const APInt &RHS, APInt &Quotient, APInt &Remainder) { // Get some size facts about the dividend and divisor - uint32_t lhsBits = LHS.getActiveBits(); - uint32_t lhsWords = !lhsBits ? 0 : (APInt::whichWord(lhsBits - 1) + 1); - uint32_t rhsBits = RHS.getActiveBits(); - uint32_t rhsWords = !rhsBits ? 0 : (APInt::whichWord(rhsBits - 1) + 1); + unsigned lhsBits = LHS.getActiveBits(); + unsigned lhsWords = !lhsBits ? 0 : (APInt::whichWord(lhsBits - 1) + 1); + unsigned rhsBits = RHS.getActiveBits(); + unsigned rhsWords = !rhsBits ? 0 : (APInt::whichWord(rhsBits - 1) + 1); // Check the degenerate cases if (lhsWords == 0) { @@ -1824,7 +1824,7 @@ divide(LHS, lhsWords, RHS, rhsWords, &Quotient, &Remainder); } -void APInt::fromString(uint32_t numbits, const char *str, uint32_t slen, +void APInt::fromString(unsigned numbits, const char *str, unsigned slen, uint8_t radix) { // Check our assumptions here assert((radix == 10 || radix == 8 || radix == 16 || radix == 2) && @@ -1843,7 +1843,7 @@ pVal = getClearedMemory(getNumWords()); // Figure out if we can shift instead of multiply - uint32_t shift = (radix == 16 ? 4 : radix == 8 ? 3 : radix == 2 ? 1 : 0); + unsigned shift = (radix == 16 ? 4 : radix == 8 ? 3 : radix == 2 ? 1 : 0); // Set up an APInt for the digit to add outside the loop so we don't // constantly construct/destruct it. @@ -1853,7 +1853,7 @@ // Enter digit traversal loop for (unsigned i = 0; i < slen; i++) { // Get a digit - uint32_t digit = 0; + unsigned digit = 0; char cdigit = str[i]; if (radix == 16) { if (!isxdigit(cdigit)) @@ -1967,7 +1967,7 @@ APInt tmp2(Tmp.getBitWidth(), 0); divide(Tmp, Tmp.getNumWords(), divisor, divisor.getNumWords(), &tmp2, &APdigit); - uint32_t Digit = (uint32_t)APdigit.getZExtValue(); + unsigned Digit = (unsigned)APdigit.getZExtValue(); assert(Digit < Radix && "divide failed"); Str.push_back(Digits[Digit]); Tmp = tmp2; Modified: llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp?rev=62695&r1=62694&r2=62695&view=diff ============================================================================== --- llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp (original) +++ llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp Wed Jan 21 12:09:24 2009 @@ -1284,7 +1284,7 @@ KnownZero2, KnownOne2, Depth+1)) return true; - uint32_t Leaders = KnownZero2.countLeadingOnes(); + unsigned Leaders = KnownZero2.countLeadingOnes(); if (SimplifyDemandedBits(I->getOperand(1), AllOnes, KnownZero2, KnownOne2, Depth+1)) return true; From dpatel at apple.com Wed Jan 21 12:09:35 2009 From: dpatel at apple.com (Devang Patel) Date: Wed, 21 Jan 2009 18:09:35 -0000 Subject: [llvm-commits] [llvm-gcc-4.2] r62696 - /llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp Message-ID: <200901211809.n0LI9ZCv021485@zion.cs.uiuc.edu> Author: dpatel Date: Wed Jan 21 12:09:35 2009 New Revision: 62696 URL: http://llvm.org/viewvc/llvm-project?rev=62696&view=rev Log: typedef int A; typedef A B; B b; Do not forget to emit typeinfo for A here. Modified: llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp Modified: llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp?rev=62696&r1=62695&r2=62696&view=diff ============================================================================== --- llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp (original) +++ llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp Wed Jan 21 12:09:35 2009 @@ -334,8 +334,12 @@ return Slot; DIType MainTy; - if (type != TYPE_MAIN_VARIANT(type)) - MainTy = getOrCreateType(TYPE_MAIN_VARIANT(type)); + if (type != TYPE_MAIN_VARIANT(type)) { + if (TYPE_NEXT_VARIANT(type) && type != TYPE_NEXT_VARIANT(type)) + MainTy = getOrCreateType(TYPE_NEXT_VARIANT(type)); + else if (TYPE_MAIN_VARIANT(type)) + MainTy = getOrCreateType(TYPE_MAIN_VARIANT(type)); + } // Get the name and location early to assist debugging. const char *TypeName = GetNodeName(type); From sabre at nondot.org Wed Jan 21 12:11:10 2009 From: sabre at nondot.org (Chris Lattner) Date: Wed, 21 Jan 2009 18:11:10 -0000 Subject: [llvm-commits] [llvm] r62697 - in /llvm/trunk: include/llvm-c/ExecutionEngine.h lib/ExecutionEngine/ExecutionEngineBindings.cpp Message-ID: <200901211811.n0LIBBib021559@zion.cs.uiuc.edu> Author: lattner Date: Wed Jan 21 12:11:10 2009 New Revision: 62697 URL: http://llvm.org/viewvc/llvm-project?rev=62697&view=rev Log: add getPointerToGlobal to the C bindings, patch by Lennart Augustsson! PR3364 Modified: llvm/trunk/include/llvm-c/ExecutionEngine.h llvm/trunk/lib/ExecutionEngine/ExecutionEngineBindings.cpp Modified: llvm/trunk/include/llvm-c/ExecutionEngine.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm-c/ExecutionEngine.h?rev=62697&r1=62696&r2=62697&view=diff ============================================================================== --- llvm/trunk/include/llvm-c/ExecutionEngine.h (original) +++ llvm/trunk/include/llvm-c/ExecutionEngine.h Wed Jan 21 12:11:10 2009 @@ -95,6 +95,8 @@ void LLVMAddGlobalMapping(LLVMExecutionEngineRef EE, LLVMValueRef Global, void* Addr); +void *LLVMGetPointerToGlobal(LLVMExecutionEngineRef EE, LLVMValueRef Global); + #ifdef __cplusplus } Modified: llvm/trunk/lib/ExecutionEngine/ExecutionEngineBindings.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/ExecutionEngineBindings.cpp?rev=62697&r1=62696&r2=62697&view=diff ============================================================================== --- llvm/trunk/lib/ExecutionEngine/ExecutionEngineBindings.cpp (original) +++ llvm/trunk/lib/ExecutionEngine/ExecutionEngineBindings.cpp Wed Jan 21 12:11:10 2009 @@ -199,3 +199,7 @@ void* Addr) { unwrap(EE)->addGlobalMapping(unwrap(Global), Addr); } + +void *LLVMGetPointerToGlobal(LLVMExecutionEngineRef EE, LLVMValueRef Global) { + return unwrap(EE)->getPointerToGlobal(unwrap(Global)); +} From clattner at apple.com Wed Jan 21 12:29:46 2009 From: clattner at apple.com (Chris Lattner) Date: Wed, 21 Jan 2009 10:29:46 -0800 Subject: [llvm-commits] [llvm] r62683 - in /llvm/trunk/test: CodeGen/Generic/2008-07-29-EHLabel.ll FrontendC/2008-07-29-EHLabel.ll In-Reply-To: <200901211137.n0LBbeNQ008600@zion.cs.uiuc.edu> References: <200901211137.n0LBbeNQ008600@zion.cs.uiuc.edu> Message-ID: <4DBF2DC4-9160-41BD-86EA-7674E6ECE88C@apple.com> On Jan 21, 2009, at 3:37 AM, Duncan Sands wrote: > Author: baldrick > Date: Wed Jan 21 05:37:31 2009 > New Revision: 62683 > > URL: http://llvm.org/viewvc/llvm-project?rev=62683&view=rev > Log: > Let's try to have our cake and eat it to: move > this test into FrontendC to ensure that llvm-gcc > is available; assemble using "llvm-gcc -xassembler" > rather than "as". Okay, this is better... but now we have a .ll file in FrontendC, which doesn't make any sense. Can you just add the original c++ file to frontendc++? -Chris From sabre at nondot.org Wed Jan 21 12:38:18 2009 From: sabre at nondot.org (Chris Lattner) Date: Wed, 21 Jan 2009 18:38:18 -0000 Subject: [llvm-commits] [llvm] r62699 - /llvm/trunk/lib/Target/CellSPU/AsmPrinter/SPUAsmPrinter.cpp Message-ID: <200901211838.n0LIcIwm022817@zion.cs.uiuc.edu> Author: lattner Date: Wed Jan 21 12:38:18 2009 New Revision: 62699 URL: http://llvm.org/viewvc/llvm-project?rev=62699&view=rev Log: fix warning in release-asserts mode and spelling of assert. Modified: llvm/trunk/lib/Target/CellSPU/AsmPrinter/SPUAsmPrinter.cpp Modified: llvm/trunk/lib/Target/CellSPU/AsmPrinter/SPUAsmPrinter.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/CellSPU/AsmPrinter/SPUAsmPrinter.cpp?rev=62699&r1=62698&r2=62699&view=diff ============================================================================== --- llvm/trunk/lib/Target/CellSPU/AsmPrinter/SPUAsmPrinter.cpp (original) +++ llvm/trunk/lib/Target/CellSPU/AsmPrinter/SPUAsmPrinter.cpp Wed Jan 21 12:38:18 2009 @@ -185,9 +185,8 @@ void printDFormAddr(const MachineInstr *MI, unsigned OpNo) { - const MachineOperand &MO = MI->getOperand(OpNo); - assert(MO.isImm() && - "printDFormAddr first operand is not immedate"); + assert(MI->getOperand(OpNo).isImm() && + "printDFormAddr first operand is not immediate"); int64_t value = int64_t(MI->getOperand(OpNo).getImm()); int16_t value16 = int16_t(value); assert((value16 >= -(1 << (9+4)) && value16 <= (1 << (9+4)) - 1) From baldrick at free.fr Wed Jan 21 13:38:08 2009 From: baldrick at free.fr (Duncan Sands) Date: Wed, 21 Jan 2009 20:38:08 +0100 Subject: [llvm-commits] [llvm] r62683 - in /llvm/trunk/test: CodeGen/Generic/2008-07-29-EHLabel.ll FrontendC/2008-07-29-EHLabel.ll In-Reply-To: <4DBF2DC4-9160-41BD-86EA-7674E6ECE88C@apple.com> References: <200901211137.n0LBbeNQ008600@zion.cs.uiuc.edu> <4DBF2DC4-9160-41BD-86EA-7674E6ECE88C@apple.com> Message-ID: <200901212038.08430.baldrick@free.fr> Hi Chris, > Okay, this is better... but now we have a .ll file in FrontendC, which > doesn't make any sense. it's odd, that's true, but personally I can live with it :) > Can you just add the original c++ file to frontendc++? I could (I think it is libstdc++-v3/src/istream.cc from llvm-gcc) but I can see two problems: it is 600 lines of C++, which would make it by far the largest test in FrontendC++; and it is a less direct test: the .ll directly tickled llc the right (= wrong) way, while due to changes in IR generation etc the .cpp might not. Your call :) Ciao, Duncan. From dpatel at apple.com Wed Jan 21 13:40:28 2009 From: dpatel at apple.com (Devang Patel) Date: Wed, 21 Jan 2009 19:40:28 -0000 Subject: [llvm-commits] [llvm-gcc-4.2] r62709 - /llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp Message-ID: <200901211940.n0LJeSBP025148@zion.cs.uiuc.edu> Author: dpatel Date: Wed Jan 21 13:40:27 2009 New Revision: 62709 URL: http://llvm.org/viewvc/llvm-project?rev=62709&view=rev Log: Fix subprogram debug info. Encode argument types properly. Modified: llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp Modified: llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp?rev=62709&r1=62708&r2=62709&view=diff ============================================================================== --- llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp (original) +++ llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp Wed Jan 21 13:40:27 2009 @@ -217,12 +217,34 @@ std::string Filename, Directory; DirectoryAndFile(Loc.file, Directory, Filename); const char *LinkageName = getLinkageName(FnDecl); - DIType FnTy = getOrCreateType(TREE_TYPE(TREE_TYPE(FnDecl))); + + tree func_type = TREE_TYPE(FnDecl); + llvm::SmallVector ArgTys; + // Add the result type at least. + ArgTys.push_back(getOrCreateType(TREE_TYPE(func_type))); + + // Set up remainder of arguments. + for (tree arg = TYPE_ARG_TYPES(func_type); arg; arg = TREE_CHAIN(arg)) { + tree formal_type = TREE_VALUE(arg); + if (formal_type == void_type_node) break; + ArgTys.push_back(getOrCreateType(formal_type)); + } + + llvm::DIArray FnTypeArray = + DebugFactory.GetOrCreateArray(&ArgTys[0], ArgTys.size()); + + llvm::DICompositeType FnTy = + DebugFactory.CreateCompositeType(llvm::dwarf::DW_TAG_subroutine_type, + MainCompileUnit, "", + MainCompileUnit, 0, 0, 0, 0, 0, + llvm::DIType(), FnTypeArray); + DISubprogram SP = DebugFactory.CreateSubprogram(MainCompileUnit, Fn->getNameStr(), Fn->getNameStr(), LinkageName, MainCompileUnit, CurLineNo, - FnTy, Fn->hasInternalLinkage(), + FnTy, + Fn->hasInternalLinkage(), true /*definition*/, &Filename, &Directory); From clattner at apple.com Wed Jan 21 13:41:55 2009 From: clattner at apple.com (Chris Lattner) Date: Wed, 21 Jan 2009 11:41:55 -0800 Subject: [llvm-commits] [llvm] r62683 - in /llvm/trunk/test: CodeGen/Generic/2008-07-29-EHLabel.ll FrontendC/2008-07-29-EHLabel.ll In-Reply-To: <200901212038.08430.baldrick@free.fr> References: <200901211137.n0LBbeNQ008600@zion.cs.uiuc.edu> <4DBF2DC4-9160-41BD-86EA-7674E6ECE88C@apple.com> <200901212038.08430.baldrick@free.fr> Message-ID: <89521BCE-CA57-4A75-9DA1-E079D4146A33@apple.com> On Jan 21, 2009, at 11:38 AM, Duncan Sands wrote: > Hi Chris, > >> Okay, this is better... but now we have a .ll file in FrontendC, >> which >> doesn't make any sense. > > it's odd, that's true, but personally I can live with it :) > >> Can you just add the original c++ file to frontendc++? > > I could (I think it is libstdc++-v3/src/istream.cc from llvm-gcc) > but I can see two problems: it is 600 lines of C++, which would > make it by far the largest test in FrontendC++; and it is a less > direct test: the .ll directly tickled llc the right (= wrong) way, > while due to changes in IR generation etc the .cpp might not. Your > call :) Keeping it a .ll file is fine I guess, thanks duncan, -Chris From evan.cheng at apple.com Wed Jan 21 13:45:31 2009 From: evan.cheng at apple.com (Evan Cheng) Date: Wed, 21 Jan 2009 19:45:31 -0000 Subject: [llvm-commits] [llvm] r62710 - /llvm/trunk/lib/Target/X86/X86Instr64bit.td Message-ID: <200901211945.n0LJjVUO025363@zion.cs.uiuc.edu> Author: evancheng Date: Wed Jan 21 13:45:31 2009 New Revision: 62710 URL: http://llvm.org/viewvc/llvm-project?rev=62710&view=rev Log: Also favors NOT64r. Modified: llvm/trunk/lib/Target/X86/X86Instr64bit.td Modified: llvm/trunk/lib/Target/X86/X86Instr64bit.td URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86Instr64bit.td?rev=62710&r1=62709&r2=62710&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/X86Instr64bit.td (original) +++ llvm/trunk/lib/Target/X86/X86Instr64bit.td Wed Jan 21 13:45:31 2009 @@ -766,7 +766,7 @@ // Logical Instructions... // -let isTwoAddress = 1 in +let isTwoAddress = 1 , AddedComplexity = 15 in def NOT64r : RI<0xF7, MRM2r, (outs GR64:$dst), (ins GR64:$src), "not{q}\t$dst", [(set GR64:$dst, (not GR64:$src))]>; def NOT64m : RI<0xF7, MRM2m, (outs), (ins i64mem:$dst), "not{q}\t$dst", From dalej at apple.com Wed Jan 21 14:32:56 2009 From: dalej at apple.com (Dale Johannesen) Date: Wed, 21 Jan 2009 20:32:56 -0000 Subject: [llvm-commits] [llvm] r62712 - in /llvm/trunk: include/llvm/ADT/FoldingSet.h include/llvm/Support/MathExtras.h lib/Support/APFloat.cpp lib/Support/FoldingSet.cpp lib/VMCore/AsmWriter.cpp test/Transforms/InstCombine/2009-01-19-fmod-constant-float-specials.ll Message-ID: <200901212032.n0LKWuxH027406@zion.cs.uiuc.edu> Author: johannes Date: Wed Jan 21 14:32:55 2009 New Revision: 62712 URL: http://llvm.org/viewvc/llvm-project?rev=62712&view=rev Log: Do not use host floating point types when emitting ASCII IR; loading and storing these can change the bits of NaNs on some hosts. Remove or add warnings at a few other places using host floating point; this is a bad thing to do in general. Modified: llvm/trunk/include/llvm/ADT/FoldingSet.h llvm/trunk/include/llvm/Support/MathExtras.h llvm/trunk/lib/Support/APFloat.cpp llvm/trunk/lib/Support/FoldingSet.cpp llvm/trunk/lib/VMCore/AsmWriter.cpp llvm/trunk/test/Transforms/InstCombine/2009-01-19-fmod-constant-float-specials.ll Modified: llvm/trunk/include/llvm/ADT/FoldingSet.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ADT/FoldingSet.h?rev=62712&r1=62711&r2=62712&view=diff ============================================================================== --- llvm/trunk/include/llvm/ADT/FoldingSet.h (original) +++ llvm/trunk/include/llvm/ADT/FoldingSet.h Wed Jan 21 14:32:55 2009 @@ -225,8 +225,6 @@ void AddInteger(unsigned long I); void AddInteger(long long I); void AddInteger(unsigned long long I); - void AddFloat(float F); - void AddDouble(double D); void AddString(const std::string &String); void AddString(const char* String); Modified: llvm/trunk/include/llvm/Support/MathExtras.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/MathExtras.h?rev=62712&r1=62711&r2=62712&view=diff ============================================================================== --- llvm/trunk/include/llvm/Support/MathExtras.h (original) +++ llvm/trunk/include/llvm/Support/MathExtras.h Wed Jan 21 14:32:55 2009 @@ -361,7 +361,9 @@ } /// DoubleToBits - This function takes a double and returns the bit -/// equivalent 64-bit integer. +/// equivalent 64-bit integer. Note that copying doubles around +/// changes the bits of NaNs on some hosts, notably x86, so this +/// routine cannot be used if these bits are needed. inline uint64_t DoubleToBits(double Double) { union { uint64_t L; @@ -372,7 +374,9 @@ } /// FloatToBits - This function takes a float and returns the bit -/// equivalent 32-bit integer. +/// equivalent 32-bit integer. Note that copying floats around +/// changes the bits of NaNs on some hosts, notably x86, so this +/// routine cannot be used if these bits are needed. inline uint32_t FloatToBits(float Float) { union { uint32_t I; Modified: llvm/trunk/lib/Support/APFloat.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/APFloat.cpp?rev=62712&r1=62711&r2=62712&view=diff ============================================================================== --- llvm/trunk/lib/Support/APFloat.cpp (original) +++ llvm/trunk/lib/Support/APFloat.cpp Wed Jan 21 14:32:55 2009 @@ -599,7 +599,8 @@ } /* Make this number a NaN, with an arbitrary but deterministic value - for the significand. */ + for the significand. If double or longer, this is a signalling NaN, + which may not be ideal. */ void APFloat::makeNaN(void) { Modified: llvm/trunk/lib/Support/FoldingSet.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/FoldingSet.cpp?rev=62712&r1=62711&r2=62712&view=diff ============================================================================== --- llvm/trunk/lib/Support/FoldingSet.cpp (original) +++ llvm/trunk/lib/Support/FoldingSet.cpp Wed Jan 21 14:32:55 2009 @@ -61,12 +61,6 @@ if ((uint64_t)(int)I != I) Bits.push_back(unsigned(I >> 32)); } -void FoldingSetNodeID::AddFloat(float F) { - Bits.push_back(FloatToBits(F)); -} -void FoldingSetNodeID::AddDouble(double D) { - AddInteger(DoubleToBits(D)); -} void FoldingSetNodeID::AddString(const char *String) { unsigned Size = static_cast(strlen(String)); Modified: llvm/trunk/lib/VMCore/AsmWriter.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/AsmWriter.cpp?rev=62712&r1=62711&r2=62712&view=diff ============================================================================== --- llvm/trunk/lib/VMCore/AsmWriter.cpp (original) +++ llvm/trunk/lib/VMCore/AsmWriter.cpp Wed Jan 21 14:32:55 2009 @@ -640,6 +640,7 @@ // make sure that we only output it in exponential format if we can parse // the value back and get the same value. // + bool ignored; bool isDouble = &CFP->getValueAPF().getSemantics()==&APFloat::IEEEdouble; double Val = isDouble ? CFP->getValueAPF().convertToDouble() : CFP->getValueAPF().convertToFloat(); @@ -659,11 +660,20 @@ } } // Otherwise we could not reparse it to exactly the same value, so we must - // output the string in hexadecimal format! + // output the string in hexadecimal format! Note that loading and storing + // floating point types changes the bits of NaNs on some hosts, notably + // x86, so we must not use these types. assert(sizeof(double) == sizeof(uint64_t) && "assuming that double is 64 bits!"); char Buffer[40]; - Out << "0x" << utohex_buffer(uint64_t(DoubleToBits(Val)), Buffer+40); + APFloat apf = CFP->getValueAPF(); + // Floats are represented in ASCII IR as double, convert. + if (!isDouble) + apf.convert(APFloat::IEEEdouble, APFloat::rmNearestTiesToEven, + &ignored); + Out << "0x" << + utohex_buffer(uint64_t(apf.bitcastToAPInt().getZExtValue()), + Buffer+40); return; } Modified: llvm/trunk/test/Transforms/InstCombine/2009-01-19-fmod-constant-float-specials.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/2009-01-19-fmod-constant-float-specials.ll?rev=62712&r1=62711&r2=62712&view=diff ============================================================================== --- llvm/trunk/test/Transforms/InstCombine/2009-01-19-fmod-constant-float-specials.ll (original) +++ llvm/trunk/test/Transforms/InstCombine/2009-01-19-fmod-constant-float-specials.ll Wed Jan 21 14:32:55 2009 @@ -1,8 +1,8 @@ ; RUN: llvm-as < %s | opt -simplifycfg -instcombine | llvm-dis | grep 0x7FF8000000000000 | count 7 -; RUN: llvm-as < %s | opt -simplifycfg -instcombine | llvm-dis | grep 0x7FF80000FFFFFFFF | count 5 +; RUN: llvm-as < %s | opt -simplifycfg -instcombine | llvm-dis | grep 0x7FF00000FFFFFFFF | count 5 ; RUN: llvm-as < %s | opt -simplifycfg -instcombine | llvm-dis | grep {0\\.0} | count 3 ; RUN: llvm-as < %s | opt -simplifycfg -instcombine | llvm-dis | grep {3\\.5} | count 1 -; XFAIL: x86_64 +; ; ModuleID = 'apf.c' 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:128:128" From gohman at apple.com Wed Jan 21 14:50:09 2009 From: gohman at apple.com (Dan Gohman) Date: Wed, 21 Jan 2009 20:50:09 -0000 Subject: [llvm-commits] [llvm] r62713 - /llvm/trunk/include/llvm/CodeGen/SelectionDAG.h Message-ID: <200901212050.n0LKo9tO028038@zion.cs.uiuc.edu> Author: djg Date: Wed Jan 21 14:50:09 2009 New Revision: 62713 URL: http://llvm.org/viewvc/llvm-project?rev=62713&view=rev Log: Add a comment to SelectionDAG::ReplaceAllUsesWith to describe a subtle iteraction with SelectionDAG CSE. Modified: llvm/trunk/include/llvm/CodeGen/SelectionDAG.h Modified: llvm/trunk/include/llvm/CodeGen/SelectionDAG.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/SelectionDAG.h?rev=62713&r1=62712&r2=62713&view=diff ============================================================================== --- llvm/trunk/include/llvm/CodeGen/SelectionDAG.h (original) +++ llvm/trunk/include/llvm/CodeGen/SelectionDAG.h Wed Jan 21 14:50:09 2009 @@ -680,6 +680,11 @@ /// informed about nodes that are deleted and modified due to recursive /// changes in the dag. /// + /// These functions only replace all existing uses. It's possible that as + /// these replacements are being performed, CSE may cause the From node + /// to be given new uses. These new uses of From are left in place, and + /// not automatically transfered to To. + /// void ReplaceAllUsesWith(SDValue From, SDValue Op, DAGUpdateListener *UpdateListener = 0); void ReplaceAllUsesWith(SDNode *From, SDNode *To, From isanbard at gmail.com Wed Jan 21 15:02:27 2009 From: isanbard at gmail.com (Bill Wendling) Date: Wed, 21 Jan 2009 21:02:27 -0000 Subject: [llvm-commits] [llvm] r62714 - /llvm/trunk/test/CodeGen/X86/limited-prec.ll Message-ID: <200901212102.n0LL2RIA028508@zion.cs.uiuc.edu> Author: void Date: Wed Jan 21 15:02:27 2009 New Revision: 62714 URL: http://llvm.org/viewvc/llvm-project?rev=62714&view=rev Log: Run this through -simplifycfg and -mem2reg to test only what we need to test. Modified: llvm/trunk/test/CodeGen/X86/limited-prec.ll Modified: llvm/trunk/test/CodeGen/X86/limited-prec.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/limited-prec.ll?rev=62714&r1=62713&r2=62714&view=diff ============================================================================== --- llvm/trunk/test/CodeGen/X86/limited-prec.ll (original) +++ llvm/trunk/test/CodeGen/X86/limited-prec.ll Wed Jan 21 15:02:27 2009 @@ -1,133 +1,56 @@ -; RUN: llvm-as < %s | llc -limit-float-precision=6 -march=x86 | \ -; RUN: not grep exp | not grep log | not grep pow -; RUN: llvm-as < %s | llc -limit-float-precision=12 -march=x86 | \ -; RUN: not grep exp | not grep log | not grep pow -; RUN: llvm-as < %s | llc -limit-float-precision=18 -march=x86 | \ -; RUN: not grep exp | not grep log | not grep pow +; ModuleID = '' target triple = "i386-apple-darwin9.5" define float @f1(float %x) nounwind noinline { entry: - %x_addr = alloca float ; [#uses=2] - %retval = alloca float ; [#uses=2] - %0 = alloca float ; [#uses=2] - %"alloca point" = bitcast i32 0 to i32 ; [#uses=0] - store float %x, float* %x_addr - %1 = load float* %x_addr, align 4 ; [#uses=1] - %2 = call float @llvm.exp.f32(float %1) ; [#uses=1] - store float %2, float* %0, align 4 - %3 = load float* %0, align 4 ; [#uses=1] - store float %3, float* %retval, align 4 - br label %return - -return: ; preds = %entry - %retval1 = load float* %retval ; [#uses=1] - ret float %retval1 + %"alloca point" = bitcast i32 0 to i32 ; [#uses=0] + %0 = call float @llvm.exp.f32(float %x) ; [#uses=1] + ret float %0 } declare float @llvm.exp.f32(float) nounwind readonly define float @f2(float %x) nounwind noinline { entry: - %x_addr = alloca float ; [#uses=2] - %retval = alloca float ; [#uses=2] - %0 = alloca float ; [#uses=2] - %"alloca point" = bitcast i32 0 to i32 ; [#uses=0] - store float %x, float* %x_addr - %1 = load float* %x_addr, align 4 ; [#uses=1] - %2 = call float @llvm.exp2.f32(float %1) ; [#uses=1] - store float %2, float* %0, align 4 - %3 = load float* %0, align 4 ; [#uses=1] - store float %3, float* %retval, align 4 - br label %return - -return: ; preds = %entry - %retval1 = load float* %retval ; [#uses=1] - ret float %retval1 + %"alloca point" = bitcast i32 0 to i32 ; [#uses=0] + %0 = call float @llvm.exp2.f32(float %x) ; [#uses=1] + ret float %0 } declare float @llvm.exp2.f32(float) nounwind readonly define float @f3(float %x) nounwind noinline { entry: - %x_addr = alloca float ; [#uses=2] - %retval = alloca float ; [#uses=2] - %0 = alloca float ; [#uses=2] - %"alloca point" = bitcast i32 0 to i32 ; [#uses=0] - store float %x, float* %x_addr - %1 = load float* %x_addr, align 4 ; [#uses=1] - %2 = call float @llvm.pow.f32(float 1.000000e+01, float %1) ; [#uses=1] - store float %2, float* %0, align 4 - %3 = load float* %0, align 4 ; [#uses=1] - store float %3, float* %retval, align 4 - br label %return - -return: ; preds = %entry - %retval1 = load float* %retval ; [#uses=1] - ret float %retval1 + %"alloca point" = bitcast i32 0 to i32 ; [#uses=0] + %0 = call float @llvm.pow.f32(float 1.000000e+01, float %x) ; [#uses=1] + ret float %0 } declare float @llvm.pow.f32(float, float) nounwind readonly define float @f4(float %x) nounwind noinline { entry: - %x_addr = alloca float ; [#uses=2] - %retval = alloca float ; [#uses=2] - %0 = alloca float ; [#uses=2] - %"alloca point" = bitcast i32 0 to i32 ; [#uses=0] - store float %x, float* %x_addr - %1 = load float* %x_addr, align 4 ; [#uses=1] - %2 = call float @llvm.log.f32(float %1) ; [#uses=1] - store float %2, float* %0, align 4 - %3 = load float* %0, align 4 ; [#uses=1] - store float %3, float* %retval, align 4 - br label %return - -return: ; preds = %entry - %retval1 = load float* %retval ; [#uses=1] - ret float %retval1 + %"alloca point" = bitcast i32 0 to i32 ; [#uses=0] + %0 = call float @llvm.log.f32(float %x) ; [#uses=1] + ret float %0 } declare float @llvm.log.f32(float) nounwind readonly define float @f5(float %x) nounwind noinline { entry: - %x_addr = alloca float ; [#uses=2] - %retval = alloca float ; [#uses=2] - %0 = alloca float ; [#uses=2] - %"alloca point" = bitcast i32 0 to i32 ; [#uses=0] - store float %x, float* %x_addr - %1 = load float* %x_addr, align 4 ; [#uses=1] - %2 = call float @llvm.log2.f32(float %1) ; [#uses=1] - store float %2, float* %0, align 4 - %3 = load float* %0, align 4 ; [#uses=1] - store float %3, float* %retval, align 4 - br label %return - -return: ; preds = %entry - %retval1 = load float* %retval ; [#uses=1] - ret float %retval1 + %"alloca point" = bitcast i32 0 to i32 ; [#uses=0] + %0 = call float @llvm.log2.f32(float %x) ; [#uses=1] + ret float %0 } declare float @llvm.log2.f32(float) nounwind readonly define float @f6(float %x) nounwind noinline { entry: - %x_addr = alloca float ; [#uses=2] - %retval = alloca float ; [#uses=2] - %0 = alloca float ; [#uses=2] - %"alloca point" = bitcast i32 0 to i32 ; [#uses=0] - store float %x, float* %x_addr - %1 = load float* %x_addr, align 4 ; [#uses=1] - %2 = call float @llvm.log10.f32(float %1) ; [#uses=1] - store float %2, float* %0, align 4 - %3 = load float* %0, align 4 ; [#uses=1] - store float %3, float* %retval, align 4 - br label %return - -return: ; preds = %entry - %retval1 = load float* %retval ; [#uses=1] - ret float %retval1 + %"alloca point" = bitcast i32 0 to i32 ; [#uses=0] + %0 = call float @llvm.log10.f32(float %x) ; [#uses=1] + ret float %0 } declare float @llvm.log10.f32(float) nounwind readonly From wendling at apple.com Wed Jan 21 14:59:07 2009 From: wendling at apple.com (Bill Wendling) Date: Wed, 21 Jan 2009 12:59:07 -0800 Subject: [llvm-commits] [llvm] r62572 - /llvm/trunk/test/CodeGen/X86/limited-prec.ll In-Reply-To: <4368A490-53C4-48F3-AEF8-2A897C5A423F@apple.com> References: <200901200624.n0K6O0sv025809@zion.cs.uiuc.edu> <4368A490-53C4-48F3-AEF8-2A897C5A423F@apple.com> Message-ID: Done. -bw On Jan 20, 2009, at 10:39 PM, Chris Lattner wrote: > > On Jan 19, 2009, at 10:24 PM, Bill Wendling wrote: > >> Author: void >> Date: Tue Jan 20 00:23:59 2009 >> New Revision: 62572 >> >> URL: http://llvm.org/viewvc/llvm-project?rev=62572&view=rev >> Log: >> Testcase for limited precision stuff. > > Hi Bill, please run the testcase through simplifycfg + mem2reg to > clean it up, unless you really want the unoptimized code. > > -Chris > >> >> >> Added: >> llvm/trunk/test/CodeGen/X86/limited-prec.ll >> >> Added: llvm/trunk/test/CodeGen/X86/limited-prec.ll >> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/limited-prec.ll?rev=62572&view=auto >> >> = >> = >> = >> = >> = >> = >> = >> = >> = >> ===================================================================== >> --- llvm/trunk/test/CodeGen/X86/limited-prec.ll (added) >> +++ llvm/trunk/test/CodeGen/X86/limited-prec.ll Tue Jan 20 00:23:59 >> 2009 >> @@ -0,0 +1,133 @@ >> +; RUN: llvm-as < %s | llc -limit-float-precision=6 -march=x86 | \ >> +; RUN: not grep exp | not grep log | not grep pow >> +; RUN: llvm-as < %s | llc -limit-float-precision=12 -march=x86 | \ >> +; RUN: not grep exp | not grep log | not grep pow >> +; RUN: llvm-as < %s | llc -limit-float-precision=18 -march=x86 | \ >> +; RUN: not grep exp | not grep log | not grep pow >> +target triple = "i386-apple-darwin9.5" >> + >> +define float @f1(float %x) nounwind noinline { >> +entry: >> + %x_addr = alloca float ; [#uses=2] >> + %retval = alloca float ; [#uses=2] >> + %0 = alloca float ; [#uses=2] >> + %"alloca point" = bitcast i32 0 to i32 ; [#uses=0] >> + store float %x, float* %x_addr >> + %1 = load float* %x_addr, align 4 ; [#uses=1] >> + %2 = call float @llvm.exp.f32(float %1) ; [#uses=1] >> + store float %2, float* %0, align 4 >> + %3 = load float* %0, align 4 ; [#uses=1] >> + store float %3, float* %retval, align 4 >> + br label %return >> + >> +return: ; preds = %entry >> + %retval1 = load float* %retval ; [#uses=1] >> + ret float %retval1 >> +} >> + >> +declare float @llvm.exp.f32(float) nounwind readonly >> + >> +define float @f2(float %x) nounwind noinline { >> +entry: >> + %x_addr = alloca float ; [#uses=2] >> + %retval = alloca float ; [#uses=2] >> + %0 = alloca float ; [#uses=2] >> + %"alloca point" = bitcast i32 0 to i32 ; [#uses=0] >> + store float %x, float* %x_addr >> + %1 = load float* %x_addr, align 4 ; [#uses=1] >> + %2 = call float @llvm.exp2.f32(float %1) ; [#uses=1] >> + store float %2, float* %0, align 4 >> + %3 = load float* %0, align 4 ; [#uses=1] >> + store float %3, float* %retval, align 4 >> + br label %return >> + >> +return: ; preds = %entry >> + %retval1 = load float* %retval ; [#uses=1] >> + ret float %retval1 >> +} >> + >> +declare float @llvm.exp2.f32(float) nounwind readonly >> + >> +define float @f3(float %x) nounwind noinline { >> +entry: >> + %x_addr = alloca float ; [#uses=2] >> + %retval = alloca float ; [#uses=2] >> + %0 = alloca float ; [#uses=2] >> + %"alloca point" = bitcast i32 0 to i32 ; [#uses=0] >> + store float %x, float* %x_addr >> + %1 = load float* %x_addr, align 4 ; [#uses=1] >> + %2 = call float @llvm.pow.f32(float 1.000000e+01, float %1) ; >> [#uses=1] >> + store float %2, float* %0, align 4 >> + %3 = load float* %0, align 4 ; [#uses=1] >> + store float %3, float* %retval, align 4 >> + br label %return >> + >> +return: ; preds = %entry >> + %retval1 = load float* %retval ; [#uses=1] >> + ret float %retval1 >> +} >> + >> +declare float @llvm.pow.f32(float, float) nounwind readonly >> + >> +define float @f4(float %x) nounwind noinline { >> +entry: >> + %x_addr = alloca float ; [#uses=2] >> + %retval = alloca float ; [#uses=2] >> + %0 = alloca float ; [#uses=2] >> + %"alloca point" = bitcast i32 0 to i32 ; [#uses=0] >> + store float %x, float* %x_addr >> + %1 = load float* %x_addr, align 4 ; [#uses=1] >> + %2 = call float @llvm.log.f32(float %1) ; [#uses=1] >> + store float %2, float* %0, align 4 >> + %3 = load float* %0, align 4 ; [#uses=1] >> + store float %3, float* %retval, align 4 >> + br label %return >> + >> +return: ; preds = %entry >> + %retval1 = load float* %retval ; [#uses=1] >> + ret float %retval1 >> +} >> + >> +declare float @llvm.log.f32(float) nounwind readonly >> + >> +define float @f5(float %x) nounwind noinline { >> +entry: >> + %x_addr = alloca float ; [#uses=2] >> + %retval = alloca float ; [#uses=2] >> + %0 = alloca float ; [#uses=2] >> + %"alloca point" = bitcast i32 0 to i32 ; [#uses=0] >> + store float %x, float* %x_addr >> + %1 = load float* %x_addr, align 4 ; [#uses=1] >> + %2 = call float @llvm.log2.f32(float %1) ; [#uses=1] >> + store float %2, float* %0, align 4 >> + %3 = load float* %0, align 4 ; [#uses=1] >> + store float %3, float* %retval, align 4 >> + br label %return >> + >> +return: ; preds = %entry >> + %retval1 = load float* %retval ; [#uses=1] >> + ret float %retval1 >> +} >> + >> +declare float @llvm.log2.f32(float) nounwind readonly >> + >> +define float @f6(float %x) nounwind noinline { >> +entry: >> + %x_addr = alloca float ; [#uses=2] >> + %retval = alloca float ; [#uses=2] >> + %0 = alloca float ; [#uses=2] >> + %"alloca point" = bitcast i32 0 to i32 ; [#uses=0] >> + store float %x, float* %x_addr >> + %1 = load float* %x_addr, align 4 ; [#uses=1] >> + %2 = call float @llvm.log10.f32(float %1) ; [#uses=1] >> + store float %2, float* %0, align 4 >> + %3 = load float* %0, align 4 ; [#uses=1] >> + store float %3, float* %retval, align 4 >> + br label %return >> + >> +return: ; preds = %entry >> + %retval1 = load float* %retval ; [#uses=1] >> + ret float %retval1 >> +} >> + >> +declare float @llvm.log10.f32(float) nounwind readonly >> >> >> _______________________________________________ >> llvm-commits mailing list >> llvm-commits at cs.uiuc.edu >> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits > From dpatel at apple.com Wed Jan 21 15:27:21 2009 From: dpatel at apple.com (Devang Patel) Date: Wed, 21 Jan 2009 21:27:21 -0000 Subject: [llvm-commits] [llvm-gcc-4.2] r62715 - /llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp Message-ID: <200901212127.n0LLRLTw029314@zion.cs.uiuc.edu> Author: dpatel Date: Wed Jan 21 15:27:21 2009 New Revision: 62715 URL: http://llvm.org/viewvc/llvm-project?rev=62715&view=rev Log: Ignore nameless fields. Modified: llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp Modified: llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp?rev=62715&r1=62714&r2=62715&view=diff ============================================================================== --- llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp (original) +++ llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp Wed Jan 21 15:27:21 2009 @@ -627,11 +627,16 @@ if (DECL_P(Member) && DECL_IGNORED_P(Member)) continue; if (TREE_CODE(Member) == FIELD_DECL) { + if (DECL_FIELD_OFFSET(Member) == 0 || TREE_CODE(DECL_FIELD_OFFSET(Member)) != INTEGER_CST) // FIXME: field with variable position, skip it for now. continue; + /* Ignore nameless fields. */ + if (DECL_NAME (Member) == NULL_TREE) + continue; + // Get the location of the member. expanded_location MemLoc = GetNodeLocation(Member, false); std::string MemFilename, MemDirectory; From isanbard at gmail.com Wed Jan 21 15:28:03 2009 From: isanbard at gmail.com (Bill Wendling) Date: Wed, 21 Jan 2009 21:28:03 -0000 Subject: [llvm-commits] [llvm] r62716 - /llvm/trunk/test/CodeGen/X86/limited-prec.ll Message-ID: <200901212128.n0LLS4EH029361@zion.cs.uiuc.edu> Author: void Date: Wed Jan 21 15:28:03 2009 New Revision: 62716 URL: http://llvm.org/viewvc/llvm-project?rev=62716&view=rev Log: Now with RUN line. Modified: llvm/trunk/test/CodeGen/X86/limited-prec.ll Modified: llvm/trunk/test/CodeGen/X86/limited-prec.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/limited-prec.ll?rev=62716&r1=62715&r2=62716&view=diff ============================================================================== --- llvm/trunk/test/CodeGen/X86/limited-prec.ll (original) +++ llvm/trunk/test/CodeGen/X86/limited-prec.ll Wed Jan 21 15:28:03 2009 @@ -1,5 +1,9 @@ -; ModuleID = '' -target triple = "i386-apple-darwin9.5" +; RUN: llvm-as < %s | llc -limit-float-precision=6 -march=x86 | \ +; RUN: not grep exp | not grep log | not grep pow +; RUN: llvm-as < %s | llc -limit-float-precision=12 -march=x86 | \ +; RUN: not grep exp | not grep log | not grep pow +; RUN: llvm-as < %s | llc -limit-float-precision=18 -march=x86 | \ +; RUN: not grep exp | not grep log | not grep pow define float @f1(float %x) nounwind noinline { entry: From gohman at apple.com Wed Jan 21 15:30:25 2009 From: gohman at apple.com (Dan Gohman) Date: Wed, 21 Jan 2009 21:30:25 -0000 Subject: [llvm-commits] [llvm] r62717 - /llvm/trunk/utils/vim/vimrc Message-ID: <200901212130.n0LLUP4c029438@zion.cs.uiuc.edu> Author: djg Date: Wed Jan 21 15:30:25 2009 New Revision: 62717 URL: http://llvm.org/viewvc/llvm-project?rev=62717&view=rev Log: Only set cindent for C and C++ source files. Modified: llvm/trunk/utils/vim/vimrc Modified: llvm/trunk/utils/vim/vimrc URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/vim/vimrc?rev=62717&r1=62716&r2=62717&view=diff ============================================================================== --- llvm/trunk/utils/vim/vimrc (original) +++ llvm/trunk/utils/vim/vimrc Wed Jan 21 15:30:25 2009 @@ -22,9 +22,16 @@ highlight WhitespaceEOL ctermbg=DarkYellow guibg=DarkYellow match WhitespaceEOL /\s\+$/ +" Enable filetype detection +filetype on + " Optional " C/C++ programming helpers -set cindent +augroup csrc + au! + autocmd FileType * set nocindent smartindent + autocmd FileType c,cpp set cindent +augroup END " Set a few indentation parameters. See the VIM help for cinoptions-values for " details. These aren't absolute rules; they're just an approximation of " common style in LLVM source. @@ -35,9 +42,6 @@ " Highlight syntax in programming languages syntax on -" Enable filetype detection -filetype on - " LLVM Makefiles can have names such as Makefile.rules or TEST.nightly.Makefile, " so it's important to categorize them as such. augroup filetype From gohman at apple.com Wed Jan 21 15:47:51 2009 From: gohman at apple.com (Dan Gohman) Date: Wed, 21 Jan 2009 21:47:51 -0000 Subject: [llvm-commits] [llvm] r62718 - /llvm/trunk/utils/vim/vimrc Message-ID: <200901212147.n0LLlp8U029993@zion.cs.uiuc.edu> Author: djg Date: Wed Jan 21 15:47:51 2009 New Revision: 62718 URL: http://llvm.org/viewvc/llvm-project?rev=62718&view=rev Log: Enable syntax highlighting of LLVM and tablegen files by default, so that users don't have to copy text from the README to get this. Modified: llvm/trunk/utils/vim/vimrc Modified: llvm/trunk/utils/vim/vimrc URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/vim/vimrc?rev=62718&r1=62717&r2=62718&view=diff ============================================================================== --- llvm/trunk/utils/vim/vimrc (original) +++ llvm/trunk/utils/vim/vimrc Wed Jan 21 15:47:51 2009 @@ -58,3 +58,15 @@ " Convert all tab characters to two spaces command! Untab :%s/\t/ /g + +" Enable syntax highlighting for LLVM files. To use, copy +" utils/vim/llvm.vim to ~/.vim/syntax . +augroup filetype + au! BufRead,BufNewFile *.ll set filetype=llvm +augroup END + +" Enable syntax highlighting for tablegen files. To use, copy +" utils/vim/tablegen.vim to ~/.vim/syntax . +augroup filetype + au! BufRead,BufNewFile *.td set filetype=tablegen +augroup END From gohman at apple.com Wed Jan 21 15:52:42 2009 From: gohman at apple.com (Dan Gohman) Date: Wed, 21 Jan 2009 21:52:42 -0000 Subject: [llvm-commits] [llvm] r62719 - /llvm/trunk/utils/vim/README Message-ID: <200901212152.n0LLqgMD030175@zion.cs.uiuc.edu> Author: djg Date: Wed Jan 21 15:52:42 2009 New Revision: 62719 URL: http://llvm.org/viewvc/llvm-project?rev=62719&view=rev Log: Versions of VIM included with Intrepid and Leopard at least appear to handle symlinks just fine, so reword the instructions in the README accordingly. Modified: llvm/trunk/utils/vim/README Modified: llvm/trunk/utils/vim/README URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/vim/README?rev=62719&r1=62718&r2=62719&view=diff ============================================================================== --- llvm/trunk/utils/vim/README (original) +++ llvm/trunk/utils/vim/README Wed Jan 21 15:52:42 2009 @@ -4,7 +4,7 @@ * llvm.vim - Syntax highlighting mode for LLVM assembly files. To use, COPY `llvm.vim' to + Syntax highlighting mode for LLVM assembly files. To use, copy `llvm.vim' to ~/.vim/syntax and add this code to your ~/.vimrc : augroup filetype @@ -13,7 +13,7 @@ * tablegen.vim - Syntax highlighting mode for TableGen description files. To use, COPY + Syntax highlighting mode for TableGen description files. To use, copy `tablegen.vim' to ~/.vim/syntax and add this code to your ~/.vimrc : augroup filetype @@ -21,12 +21,13 @@ augroup END -IMPORTANT: Making symlinks from ~/.vim/syntax/... to the syntax files in your -LLVM source tree does not work, you DO need to copy the files directly. +If you prefer, instead of making copies you can make symlinks from +~/.vim/syntax/... to the syntax files in your LLVM source tree. Apparently +did not work with older versions of vim however, so if this doesn't work +you may need to make actual copies of the files. -However, if you do not already have a ~/.vim/syntax/ directory, simply -symlinking it to llvm/utils/vim will do the trick nicely, and you can stay -up-to-date with CVS. +Another option, if you do not already have a ~/.vim/syntax directory, is +to symlink ~/.vim/syntax itself to llvm/utils/vim . Note: If you notice missing or incorrect syntax highlighting, please contact ; if you wish to provide a patch to improve the From gohman at apple.com Wed Jan 21 15:54:44 2009 From: gohman at apple.com (Dan Gohman) Date: Wed, 21 Jan 2009 21:54:44 -0000 Subject: [llvm-commits] [llvm] r62720 - /llvm/trunk/utils/vim/README Message-ID: <200901212154.n0LLsiLX030248@zion.cs.uiuc.edu> Author: djg Date: Wed Jan 21 15:54:44 2009 New Revision: 62720 URL: http://llvm.org/viewvc/llvm-project?rev=62720&view=rev Log: Fix a missing word. Modified: llvm/trunk/utils/vim/README Modified: llvm/trunk/utils/vim/README URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/vim/README?rev=62720&r1=62719&r2=62720&view=diff ============================================================================== --- llvm/trunk/utils/vim/README (original) +++ llvm/trunk/utils/vim/README Wed Jan 21 15:54:44 2009 @@ -23,8 +23,8 @@ If you prefer, instead of making copies you can make symlinks from ~/.vim/syntax/... to the syntax files in your LLVM source tree. Apparently -did not work with older versions of vim however, so if this doesn't work -you may need to make actual copies of the files. +this did not work with older versions of vim however, so if this doesn't +work you may need to make actual copies of the files. Another option, if you do not already have a ~/.vim/syntax directory, is to symlink ~/.vim/syntax itself to llvm/utils/vim . From dpatel at apple.com Wed Jan 21 16:47:22 2009 From: dpatel at apple.com (Devang Patel) Date: Wed, 21 Jan 2009 22:47:22 -0000 Subject: [llvm-commits] [llvm-gcc-4.2] r62726 - /llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp Message-ID: <200901212247.n0LMlMHL032391@zion.cs.uiuc.edu> Author: dpatel Date: Wed Jan 21 16:47:22 2009 New Revision: 62726 URL: http://llvm.org/viewvc/llvm-project?rev=62726&view=rev Log: It is a good idea to use separate directory for compile unit if all other source locations are separating file name and directory names. Modified: llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp Modified: llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp?rev=62726&r1=62725&r2=62726&view=diff ============================================================================== --- llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp (original) +++ llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp Wed Jan 21 16:47:22 2009 @@ -757,6 +757,8 @@ DICompileUnit DebugInfo::createCompileUnit(const std::string &FullPath){ // Get source file information. std::string Directory; + std::string FileName; + DirectoryAndFile(FullPath, Directory, FileName); // Set up Language number. unsigned LangTag; @@ -780,7 +782,7 @@ else LangTag = DW_LANG_C89; - return DebugFactory.CreateCompileUnit(LangTag, FullPath, "", + return DebugFactory.CreateCompileUnit(LangTag, FileName, Directory, version_string); } From gohman at apple.com Wed Jan 21 17:40:57 2009 From: gohman at apple.com (Dan Gohman) Date: Wed, 21 Jan 2009 23:40:57 -0000 Subject: [llvm-commits] [llvm] r62730 - /llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp Message-ID: <200901212340.n0LNevpr002582@zion.cs.uiuc.edu> Author: djg Date: Wed Jan 21 17:40:54 2009 New Revision: 62730 URL: http://llvm.org/viewvc/llvm-project?rev=62730&view=rev Log: Recognize inline asm for bswap on x86-64 GLIBC. This allows it to be supported in the JIT. Modified: llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp Modified: llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp?rev=62730&r1=62729&r2=62730&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp (original) +++ llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp Wed Jan 21 17:40:54 2009 @@ -411,11 +411,21 @@ // bswap $0 if (AsmPieces.size() == 2 && - AsmPieces[0] == "bswap" && AsmPieces[1] == "$0") { + AsmPieces[0] == "bswap" && (AsmPieces[1] == "$0" || + AsmPieces[1] == "${0:q}")) { // No need to check constraints, nothing other than the equivalent of // "=r,0" would be valid here. return LowerToBSwap(CI); } + // rorw $$8, ${0:w} --> llvm.bswap.i16 + if (CI->getType() == Type::Int16Ty && + AsmPieces.size() == 3 && + AsmPieces[0] == "rorw" && + AsmPieces[1] == "$$8," && + AsmPieces[2] == "${0:w}" && + IA->getConstraintString() == "=r,0,~{dirflag},~{fpsr},~{flags},~{cc}") { + return LowerToBSwap(CI); + } break; case 3: if (CI->getType() == Type::Int64Ty && Constraints.size() >= 2 && From snaroff at apple.com Wed Jan 21 17:49:23 2009 From: snaroff at apple.com (Steve Naroff) Date: Wed, 21 Jan 2009 23:49:23 -0000 Subject: [llvm-commits] [llvm] r62731 - /llvm/trunk/include/llvm/ADT/ilist.h Message-ID: <200901212349.n0LNnOJM002883@zion.cs.uiuc.edu> Author: snaroff Date: Wed Jan 21 17:49:23 2009 New Revision: 62731 URL: http://llvm.org/viewvc/llvm-project?rev=62731&view=rev Log: Add explicit this-> (to make the VS compiler happy). Modified: llvm/trunk/include/llvm/ADT/ilist.h Modified: llvm/trunk/include/llvm/ADT/ilist.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ADT/ilist.h?rev=62731&r1=62730&r2=62731&view=diff ============================================================================== --- llvm/trunk/include/llvm/ADT/ilist.h (original) +++ llvm/trunk/include/llvm/ADT/ilist.h Wed Jan 21 17:49:23 2009 @@ -403,7 +403,7 @@ Head = NextNode; this->setPrev(NextNode, PrevNode); IT = NextNode; - removeNodeFromList(Node); // Notify traits that we removed a node... + this->removeNodeFromList(Node); // Notify traits that we removed a node... // Set the next/prev pointers of the current node to null. This isn't // strictly required, but this catches errors where a node is removed from From isanbard at gmail.com Wed Jan 21 18:04:25 2009 From: isanbard at gmail.com (Bill Wendling) Date: Thu, 22 Jan 2009 00:04:25 -0000 Subject: [llvm-commits] [llvm] r62732 - /llvm/tags/Apple/llvmCore-2093/ Message-ID: <200901220004.n0M04PpT003363@zion.cs.uiuc.edu> Author: void Date: Wed Jan 21 18:04:25 2009 New Revision: 62732 URL: http://llvm.org/viewvc/llvm-project?rev=62732&view=rev Log: Creating llvmCore-2093 branch Added: llvm/tags/Apple/llvmCore-2093/ - copied from r62731, llvm/trunk/ From isanbard at gmail.com Wed Jan 21 18:04:34 2009 From: isanbard at gmail.com (Bill Wendling) Date: Thu, 22 Jan 2009 00:04:34 -0000 Subject: [llvm-commits] [llvm-gcc-4.2] r62733 - /llvm-gcc-4.2/tags/Apple/llvmgcc42-2093/ Message-ID: <200901220004.n0M04YuO003378@zion.cs.uiuc.edu> Author: void Date: Wed Jan 21 18:04:34 2009 New Revision: 62733 URL: http://llvm.org/viewvc/llvm-project?rev=62733&view=rev Log: Creating llvmgcc42-2093 branch Added: llvm-gcc-4.2/tags/Apple/llvmgcc42-2093/ - copied from r62732, llvm-gcc-4.2/trunk/ From dgregor at apple.com Wed Jan 21 16:38:44 2009 From: dgregor at apple.com (Douglas Gregor) Date: Wed, 21 Jan 2009 22:38:44 -0000 Subject: [llvm-commits] [llvm] r62724 - /llvm/trunk/include/llvm/ADT/ilist.h Message-ID: <200901212238.n0LMciG8032065@zion.cs.uiuc.edu> Author: dgregor Date: Wed Jan 21 16:38:44 2009 New Revision: 62724 URL: http://llvm.org/viewvc/llvm-project?rev=62724&view=rev Log: Fix ilist two-phase name lookup Modified: llvm/trunk/include/llvm/ADT/ilist.h Modified: llvm/trunk/include/llvm/ADT/ilist.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ADT/ilist.h?rev=62724&r1=62723&r2=62724&view=diff ============================================================================== --- llvm/trunk/include/llvm/ADT/ilist.h (original) +++ llvm/trunk/include/llvm/ADT/ilist.h Wed Jan 21 16:38:44 2009 @@ -422,7 +422,7 @@ // erase - remove a node from the controlled sequence... and delete it. iterator erase(iterator where) { - deleteNode(remove(where)); + this->deleteNode(remove(where)); return where; } From dalej at apple.com Wed Jan 21 18:51:52 2009 From: dalej at apple.com (Dale Johannesen) Date: Thu, 22 Jan 2009 00:51:52 -0000 Subject: [llvm-commits] [llvm-gcc-4.2] r62736 - /llvm-gcc-4.2/trunk/gcc/config/rs6000/rs6000.c Message-ID: <200901220051.n0M0puTf004980@zion.cs.uiuc.edu> Author: johannes Date: Wed Jan 21 18:51:39 2009 New Revision: 62736 URL: http://llvm.org/viewvc/llvm-project?rev=62736&view=rev Log: Make VECTOR_SAVE_INLINE be 1 on non-Darwin targets. Nobody is sure but this is likely to be right. PR 3190. Modified: llvm-gcc-4.2/trunk/gcc/config/rs6000/rs6000.c Modified: llvm-gcc-4.2/trunk/gcc/config/rs6000/rs6000.c URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config/rs6000/rs6000.c?rev=62736&r1=62735&r2=62736&view=diff ============================================================================== --- llvm-gcc-4.2/trunk/gcc/config/rs6000/rs6000.c (original) +++ llvm-gcc-4.2/trunk/gcc/config/rs6000/rs6000.c Wed Jan 21 18:51:39 2009 @@ -70,6 +70,13 @@ #include "gstab.h" /* for N_SLINE */ #endif +/* LLVM LOCAL begin get VECTOR_SAVE_INLINE defined */ +/* We think 1 is right for non-Darwin targets, but no one is sure - PR 3190 */ +#ifndef VECTOR_SAVE_INLINE +#define VECTOR_SAVE_INLINE(x) (1) +#endif +/* LLVM LOCAL end */ + /* APPLE LOCAL begin pascal strings */ #include "../../libcpp/internal.h" extern struct cpp_reader* parse_in; From ofv at wanadoo.es Wed Jan 21 19:20:46 2009 From: ofv at wanadoo.es (Oscar Fuentes) Date: Thu, 22 Jan 2009 01:20:46 -0000 Subject: [llvm-commits] [llvm] r62738 - /llvm/trunk/cmake/modules/LLVMConfig.cmake Message-ID: <200901220120.n0M1KqDW005909@zion.cs.uiuc.edu> Author: ofv Date: Wed Jan 21 19:20:31 2009 New Revision: 62738 URL: http://llvm.org/viewvc/llvm-project?rev=62738&view=rev Log: CMake: Tests PERL availability with PERL_EXECUTABLE variable. On MSVC 64bits, does not put underscore before the symbol name on the /INCLUDE linker parameter. Modified: llvm/trunk/cmake/modules/LLVMConfig.cmake Modified: llvm/trunk/cmake/modules/LLVMConfig.cmake URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/LLVMConfig.cmake?rev=62738&r1=62737&r2=62738&view=diff ============================================================================== --- llvm/trunk/cmake/modules/LLVMConfig.cmake (original) +++ llvm/trunk/cmake/modules/LLVMConfig.cmake Wed Jan 21 19:20:31 2009 @@ -1,3 +1,5 @@ +include(FindPerl) + macro(llvm_config executable) # extra args is the list of link components. if( MSVC ) @@ -10,16 +12,21 @@ function(msvc_llvm_config executable) set( link_components ${ARGN} ) + if( CMAKE_CL_64 ) + set(include_lflag "/INCLUDE:") + else( CMAKE_CL_64 ) + set(include_lflag "/INCLUDE:_") + endif() foreach(c ${link_components}) if( c STREQUAL "jit" ) - set(lfgs "${lfgs} /INCLUDE:_X86TargetMachineModule") + set(lfgs "${lfgs} ${include_lflag}X86TargetMachineModule") endif( c STREQUAL "jit" ) list(FIND LLVM_TARGETS_TO_BUILD ${c} idx) if( NOT idx LESS 0 ) - set(lfgs "${lfgs} /INCLUDE:_${c}TargetMachineModule") + set(lfgs "${lfgs} ${include_lflag}${c}TargetMachineModule") list(FIND LLVM_ASMPRINTERS_FORCE_LINK ${c} idx) if( NOT idx LESS 0 ) - set(lfgs "${lfgs} /INCLUDE:_${c}AsmPrinterForceLink") + set(lfgs "${lfgs} ${include_lflag}${c}AsmPrinterForceLink") endif() endif() endforeach(c) @@ -108,9 +115,9 @@ "`${LLVM_TOOLS_BINARY_DIR}/llvm-config --libs ${lc}`") else( NOT HAVE_LLVM_CONFIG ) # tbi: Error handling. - if( NOT PERL_FOUND ) + if( NOT PERL_EXECUTABLE ) message(FATAL_ERROR "Perl required but not found!") - endif( NOT PERL_FOUND ) + endif( NOT PERL_EXECUTABLE ) execute_process( COMMAND sh -c "${PERL_EXECUTABLE} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/llvm-config --libs ${lc}" RESULT_VARIABLE rv From gohman at apple.com Wed Jan 21 19:39:56 2009 From: gohman at apple.com (Dan Gohman) Date: Thu, 22 Jan 2009 01:39:56 -0000 Subject: [llvm-commits] [llvm] r62739 - /llvm/trunk/docs/LangRef.html Message-ID: <200901220140.n0M1e4LP006581@zion.cs.uiuc.edu> Author: djg Date: Wed Jan 21 19:39:38 2009 New Revision: 62739 URL: http://llvm.org/viewvc/llvm-project?rev=62739&view=rev Log: Add a few more notes about LLVM IR features that codegen doesn't yet support. Modified: llvm/trunk/docs/LangRef.html Modified: llvm/trunk/docs/LangRef.html URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/LangRef.html?rev=62739&r1=62738&r2=62739&view=diff ============================================================================== --- llvm/trunk/docs/LangRef.html (original) +++ llvm/trunk/docs/LangRef.html Wed Jan 21 19:39:38 2009 @@ -4071,6 +4071,10 @@ <result> = icmp ule i16 -4, 5 ; yields: result=false <result> = icmp sge i16 4, 5 ; yields: result=false + +

Note that the code generator does not yet support vector types with + the icmp instruction.

+ @@ -4163,6 +4167,10 @@ <result> = fcmp olt float 4.0, 5.0 ; yields: result=true <result> = fcmp ueq double 1.0, 2.0 ; yields: result=false + +

Note that the code generator does not yet support vector types with + the fcmp instruction.

+ @@ -4360,6 +4368,10 @@ 
   %X = select i1 true, i8 17, i8 42          ; yields i8:17
+ +

Note that the code generator does not yet support conditions + with vector type.

+ From isanbard at gmail.com Wed Jan 21 20:10:33 2009 From: isanbard at gmail.com (Bill Wendling) Date: Thu, 22 Jan 2009 02:10:33 -0000 Subject: [llvm-commits] [llvm] r62741 - /llvm/trunk/include/llvm/ADT/DenseMap.h Message-ID: <200901220210.n0M2AXRZ007528@zion.cs.uiuc.edu> Author: void Date: Wed Jan 21 20:10:33 2009 New Revision: 62741 URL: http://llvm.org/viewvc/llvm-project?rev=62741&view=rev Log: Get rid of warning about implicit 64-to-32 bit conversions. Modified: llvm/trunk/include/llvm/ADT/DenseMap.h Modified: llvm/trunk/include/llvm/ADT/DenseMap.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ADT/DenseMap.h?rev=62741&r1=62740&r2=62741&view=diff ============================================================================== --- llvm/trunk/include/llvm/ADT/DenseMap.h (original) +++ llvm/trunk/include/llvm/ADT/DenseMap.h Wed Jan 21 20:10:33 2009 @@ -58,7 +58,9 @@ template<> struct DenseMapInfo { static inline unsigned long getEmptyKey() { return ~0L; } static inline unsigned long getTombstoneKey() { return ~0L - 1L; } - static unsigned getHashValue(const unsigned long& Val) { return Val * 37L; } + static unsigned getHashValue(const unsigned long& Val) { + return (unsigned)(Val * 37L); + } static bool isPod() { return true; } static bool isEqual(const unsigned long& LHS, const unsigned long& RHS) { return LHS == RHS; From isanbard at gmail.com Wed Jan 21 20:16:17 2009 From: isanbard at gmail.com (Bill Wendling) Date: Thu, 22 Jan 2009 02:16:17 -0000 Subject: [llvm-commits] [llvm] r62742 - in /llvm/tags/Apple/llvmCore-2093.1: ./ include/llvm/ADT/DenseMap.h Message-ID: <200901220216.n0M2GHE9007748@zion.cs.uiuc.edu> Author: void Date: Wed Jan 21 20:16:17 2009 New Revision: 62742 URL: http://llvm.org/viewvc/llvm-project?rev=62742&view=rev Log: Include fix for 64-to-32 bit warning in 2093. Added: llvm/tags/Apple/llvmCore-2093.1/ - copied from r62734, llvm/tags/Apple/llvmCore-2093/ Modified: llvm/tags/Apple/llvmCore-2093.1/include/llvm/ADT/DenseMap.h Modified: llvm/tags/Apple/llvmCore-2093.1/include/llvm/ADT/DenseMap.h URL: http://llvm.org/viewvc/llvm-project/llvm/tags/Apple/llvmCore-2093.1/include/llvm/ADT/DenseMap.h?rev=62742&r1=62734&r2=62742&view=diff ============================================================================== --- llvm/tags/Apple/llvmCore-2093.1/include/llvm/ADT/DenseMap.h (original) +++ llvm/tags/Apple/llvmCore-2093.1/include/llvm/ADT/DenseMap.h Wed Jan 21 20:16:17 2009 @@ -58,7 +58,9 @@ template<> struct DenseMapInfo { static inline unsigned long getEmptyKey() { return ~0L; } static inline unsigned long getTombstoneKey() { return ~0L - 1L; } - static unsigned getHashValue(const unsigned long& Val) { return Val * 37L; } + static unsigned getHashValue(const unsigned long& Val) { + return (unsigned)(Val * 37L); + } static bool isPod() { return true; } static bool isEqual(const unsigned long& LHS, const unsigned long& RHS) { return LHS == RHS; From isanbard at gmail.com Wed Jan 21 20:16:58 2009 From: isanbard at gmail.com (Bill Wendling) Date: Thu, 22 Jan 2009 02:16:58 -0000 Subject: [llvm-commits] [llvm-gcc-4.2] r62743 - /llvm-gcc-4.2/tags/Apple/llvmgcc42-2093.1/ Message-ID: <200901220216.n0M2GwCS007773@zion.cs.uiuc.edu> Author: void Date: Wed Jan 21 20:16:57 2009 New Revision: 62743 URL: http://llvm.org/viewvc/llvm-project?rev=62743&view=rev Log: Bump up subversion number. Added: llvm-gcc-4.2/tags/Apple/llvmgcc42-2093.1/ - copied from r62742, llvm-gcc-4.2/tags/Apple/llvmgcc42-2093/ From isanbard at gmail.com Wed Jan 21 21:05:10 2009 From: isanbard at gmail.com (Bill Wendling) Date: Thu, 22 Jan 2009 03:05:10 -0000 Subject: [llvm-commits] [llvm] r62745 - /llvm/trunk/include/llvm/Analysis/MemoryDependenceAnalysis.h Message-ID: <200901220305.n0M35AsA009339@zion.cs.uiuc.edu> Author: void Date: Wed Jan 21 21:05:10 2009 New Revision: 62745 URL: http://llvm.org/viewvc/llvm-project?rev=62745&view=rev Log: The operator<() and operator>() were reversing their tests. Have the test the correct way. Modified: llvm/trunk/include/llvm/Analysis/MemoryDependenceAnalysis.h Modified: llvm/trunk/include/llvm/Analysis/MemoryDependenceAnalysis.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Analysis/MemoryDependenceAnalysis.h?rev=62745&r1=62744&r2=62745&view=diff ============================================================================== --- llvm/trunk/include/llvm/Analysis/MemoryDependenceAnalysis.h (original) +++ llvm/trunk/include/llvm/Analysis/MemoryDependenceAnalysis.h Wed Jan 21 21:05:10 2009 @@ -104,10 +104,10 @@ /// is depended on. Otherwise, return null. Instruction *getInst() const { return Value.getPointer(); } - bool operator==(const MemDepResult &M) const { return M.Value == Value; } - bool operator!=(const MemDepResult &M) const { return M.Value != Value; } - bool operator<(const MemDepResult &M) const { return M.Value < Value; } - bool operator>(const MemDepResult &M) const { return M.Value > Value; } + bool operator==(const MemDepResult &M) const { return Value == M.Value; } + bool operator!=(const MemDepResult &M) const { return Value != M.Value; } + bool operator<(const MemDepResult &M) const { return Value < M.Value; } + bool operator>(const MemDepResult &M) const { return Value > M.Value; } private: friend class MemoryDependenceAnalysis; /// Dirty - Entries with this marker occur in a LocalDeps map or From mrs at apple.com Wed Jan 21 21:24:22 2009 From: mrs at apple.com (Mike Stump) Date: Thu, 22 Jan 2009 03:24:22 -0000 Subject: [llvm-commits] [llvm] r62746 - /llvm/trunk/Makefile.rules Message-ID: <200901220324.n0M3OMbY009941@zion.cs.uiuc.edu> Author: mrs Date: Wed Jan 21 21:24:22 2009 New Revision: 62746 URL: http://llvm.org/viewvc/llvm-project?rev=62746&view=rev Log: Don't create .dir files in installation directories. Switch to using order-only dependancies for installation directories. Modified: llvm/trunk/Makefile.rules Modified: llvm/trunk/Makefile.rules URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/Makefile.rules?rev=62746&r1=62745&r2=62746&view=diff ============================================================================== --- llvm/trunk/Makefile.rules (original) +++ llvm/trunk/Makefile.rules Wed Jan 21 21:24:22 2009 @@ -560,10 +560,8 @@ # in the file so they get built before dependencies #--------------------------------------------------------- -$(PROJ_bindir): $(PROJ_bindir)/.dir -$(PROJ_libdir): $(PROJ_libdir)/.dir -$(PROJ_includedir): $(PROJ_includedir)/.dir -$(PROJ_etcdir): $(PROJ_etcdir)/.dir +$(PROJ_bindir) $(PROJ_libdir) $(PROJ_includedir) $(PROJ_etcdir): + $(Verb) $(MKDIR) $@ # To create other directories, as needed, and timestamp their creation %/.dir: @@ -863,7 +861,7 @@ install-local:: $(DestSharedLib) -$(DestSharedLib): $(PROJ_libdir) $(LibName.LA) +$(DestSharedLib): $(LibName.LA) | $(PROJ_libdir) $(Echo) Installing $(BuildMode) Shared Library $(DestSharedLib) $(Verb) $(LTInstall) $(LibName.LA) $(DestSharedLib) $(Verb) $(LIBTOOL) --finish $(PROJ_libdir) @@ -930,7 +928,7 @@ else install-local:: $(DestBytecodeLib) -$(DestBytecodeLib): $(BytecodeDestDir) $(LibName.BCA) +$(DestBytecodeLib): $(LibName.BCA) | $(BytecodeDestDir) $(Echo) Installing $(BuildMode) Bytecode Archive $(DestBytecodeLib) $(Verb) $(DataInstall) $(LibName.BCA) $(DestBytecodeLib) @@ -977,7 +975,7 @@ install-local:: $(DestRelinkedLib) -$(DestRelinkedLib): $(PROJ_libdir) $(LibName.O) +$(DestRelinkedLib): $(LibName.O) | $(PROJ_libdir) $(Echo) Installing $(BuildMode) Object Library $(DestRelinkedLib) $(Verb) $(LTInstall) $(LibName.O) $(DestRelinkedLib) @@ -1017,7 +1015,7 @@ install-local:: $(DestArchiveLib) -$(DestArchiveLib): $(PROJ_libdir) $(LibName.A) +$(DestArchiveLib): $(LibName.A) | $(PROJ_libdir) $(Echo) Installing $(BuildMode) Archive Library $(DestArchiveLib) $(Verb) $(MKDIR) $(PROJ_libdir) $(Verb) $(LTInstall) $(LibName.A) $(DestArchiveLib) @@ -1079,7 +1077,7 @@ install-local:: $(DestTool) -$(DestTool): $(PROJ_bindir) $(ToolBuildPath) +$(DestTool): $(ToolBuildPath) | $(PROJ_bindir) $(Echo) Installing $(BuildMode) $(DestTool) $(Verb) $(ProgInstall) $(ToolBuildPath) $(DestTool) From nicholas at mxc.ca Wed Jan 21 21:51:26 2009 From: nicholas at mxc.ca (Nick Lewycky) Date: Wed, 21 Jan 2009 19:51:26 -0800 Subject: [llvm-commits] [llvm] r62682 - /llvm/trunk/test/CodeGen/CellSPU/shift_ops.ll In-Reply-To: <200901210941.n0L9fpO0001282@zion.cs.uiuc.edu> References: <200901210941.n0L9fpO0001282@zion.cs.uiuc.edu> Message-ID: <4977ED3E.5010006@mxc.ca> Thanks for this, Duncan! This had been bugging me for a while, but I never figured out a fix for it. Nick Duncan Sands wrote: > Author: baldrick > Date: Wed Jan 21 03:41:42 2009 > New Revision: 62682 > > URL: http://llvm.org/viewvc/llvm-project?rev=62682&view=rev > Log: > Don't rely on grep -w working. > > Modified: > llvm/trunk/test/CodeGen/CellSPU/shift_ops.ll > > Modified: llvm/trunk/test/CodeGen/CellSPU/shift_ops.ll > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/CellSPU/shift_ops.ll?rev=62682&r1=62681&r2=62682&view=diff > > ============================================================================== > --- llvm/trunk/test/CodeGen/CellSPU/shift_ops.ll (original) > +++ llvm/trunk/test/CodeGen/CellSPU/shift_ops.ll Wed Jan 21 03:41:42 2009 > @@ -1,20 +1,20 @@ > ; RUN: llvm-as -o - %s | llc -march=cellspu > %t1.s > -; RUN: grep -w shlh %t1.s | count 9 > -; RUN: grep -w shlhi %t1.s | count 3 > -; RUN: grep -w shl %t1.s | count 9 > -; RUN: grep -w shli %t1.s | count 3 > -; RUN: grep -w xshw %t1.s | count 5 > -; RUN: grep -w and %t1.s | count 5 > -; RUN: grep -w andi %t1.s | count 2 > -; RUN: grep -w rotmi %t1.s | count 2 > -; RUN: grep -w rotqmbyi %t1.s | count 1 > -; RUN: grep -w rotqmbii %t1.s | count 2 > -; RUN: grep -w rotqmby %t1.s | count 1 > -; RUN: grep -w rotqmbi %t1.s | count 1 > -; RUN: grep -w rotqbyi %t1.s | count 1 > -; RUN: grep -w rotqbii %t1.s | count 2 > -; RUN: grep -w rotqbybi %t1.s | count 1 > -; RUN: grep -w sfi %t1.s | count 3 > +; RUN: grep {shlh } %t1.s | count 9 > +; RUN: grep {shlhi } %t1.s | count 3 > +; RUN: grep {shl } %t1.s | count 9 > +; RUN: grep {shli } %t1.s | count 3 > +; RUN: grep {xshw } %t1.s | count 5 > +; RUN: grep {and } %t1.s | count 5 > +; RUN: grep {andi } %t1.s | count 2 > +; RUN: grep {rotmi } %t1.s | count 2 > +; RUN: grep {rotqmbyi } %t1.s | count 1 > +; RUN: grep {rotqmbii } %t1.s | count 2 > +; RUN: grep {rotqmby } %t1.s | count 1 > +; RUN: grep {rotqmbi } %t1.s | count 1 > +; RUN: grep {rotqbyi } %t1.s | count 1 > +; RUN: grep {rotqbii } %t1.s | count 2 > +; RUN: grep {rotqbybi } %t1.s | count 1 > +; RUN: grep {sfi } %t1.s | count 3 > > target datalayout = "E-p:32:32:128-f64:64:128-f32:32:128-i64:32:128-i32:32:128-i16:16:128-i8:8:128-i1:8:128-a0:0:128-v128:128:128-s0:128:128" > target triple = "spu" > > > _______________________________________________ > llvm-commits mailing list > llvm-commits at cs.uiuc.edu > http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits > From tonic at nondot.org Wed Jan 21 23:03:00 2009 From: tonic at nondot.org (Tanya Lattner) Date: Thu, 22 Jan 2009 05:03:00 -0000 Subject: [llvm-commits] [llvm] r62747 - /llvm/branches/release_25/ Message-ID: <200901220503.n0M531Ac012748@zion.cs.uiuc.edu> Author: tbrethou Date: Wed Jan 21 23:03:00 2009 New Revision: 62747 URL: http://llvm.org/viewvc/llvm-project?rev=62747&view=rev Log: Create 2.5 release branch Added: llvm/branches/release_25/ - copied from r62746, llvm/trunk/ From tonic at nondot.org Wed Jan 21 23:03:44 2009 From: tonic at nondot.org (Tanya Lattner) Date: Thu, 22 Jan 2009 05:03:44 -0000 Subject: [llvm-commits] [llvm-gcc-4.2] r62748 - /llvm-gcc-4.2/branches/release_25/ Message-ID: <200901220503.n0M53iKN012792@zion.cs.uiuc.edu> Author: tbrethou Date: Wed Jan 21 23:03:44 2009 New Revision: 62748 URL: http://llvm.org/viewvc/llvm-project?rev=62748&view=rev Log: Create 2.5 release branch. Added: llvm-gcc-4.2/branches/release_25/ - copied from r62747, llvm-gcc-4.2/trunk/ From tonic at nondot.org Wed Jan 21 23:04:13 2009 From: tonic at nondot.org (Tanya Lattner) Date: Thu, 22 Jan 2009 05:04:13 -0000 Subject: [llvm-commits] [test-suite] r62749 - /test-suite/branches/release_25/ Message-ID: <200901220504.n0M54DKh012825@zion.cs.uiuc.edu> Author: tbrethou Date: Wed Jan 21 23:04:13 2009 New Revision: 62749 URL: http://llvm.org/viewvc/llvm-project?rev=62749&view=rev Log: Create 2.5 release branch. Added: test-suite/branches/release_25/ - copied from r62748, test-suite/trunk/ From sabre at nondot.org Wed Jan 21 23:10:16 2009 From: sabre at nondot.org (Chris Lattner) Date: Thu, 22 Jan 2009 05:10:16 -0000 Subject: [llvm-commits] [llvm] r62750 - /llvm/trunk/utils/TableGen/TGParser.h Message-ID: <200901220510.n0M5AGE6013154@zion.cs.uiuc.edu> Author: lattner Date: Wed Jan 21 23:10:16 2009 New Revision: 62750 URL: http://llvm.org/viewvc/llvm-project?rev=62750&view=rev Log: Make tblgen more portable, allowing it to build with ICC. Patch by Robert Zeh! Modified: llvm/trunk/utils/TableGen/TGParser.h Modified: llvm/trunk/utils/TableGen/TGParser.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/TGParser.h?rev=62750&r1=62749&r2=62750&view=diff ============================================================================== --- llvm/trunk/utils/TableGen/TGParser.h (original) +++ llvm/trunk/utils/TableGen/TGParser.h Wed Jan 21 23:10:16 2009 @@ -20,8 +20,8 @@ namespace llvm { class Record; class RecordVal; - class RecTy; - class Init; + struct RecTy; + struct Init; struct MultiClass; struct SubClassReference; From lattner at apple.com Wed Jan 21 23:17:16 2009 From: lattner at apple.com (Tanya Lattner) Date: Wed, 21 Jan 2009 21:17:16 -0800 Subject: [llvm-commits] [llvm] r62554 - /llvm/trunk/configure In-Reply-To: <200901200052.n0K0qP0p015175@zion.cs.uiuc.edu> References: <200901200052.n0K0qP0p015175@zion.cs.uiuc.edu> Message-ID: <4CC5F4BF-8F3E-4371-BA48-814CA8C6CAF2@apple.com> I hate to be a pain, but please don't do this. If you are making changes to configure you should use the versions that AutoRegen expects or take the task of upgrading what version we use. Another option is to ask someone really nicely to personally to do this for you. You forgot to check in a file too. -Tanya On Jan 19, 2009, at 4:52 PM, Nick Lewycky wrote: > Author: nicholas > Date: Mon Jan 19 18:52:24 2009 > New Revision: 62554 > > URL: http://llvm.org/viewvc/llvm-project?rev=62554&view=rev > Log: > Regenerate. > > BUILT WITH WRONG VERSION OF AUTOCONF! Somebody please regenerate > with an > approved version. Thanks! > > Modified: > llvm/trunk/configure > > Modified: llvm/trunk/configure > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/configure?rev=62554&r1=62553&r2=62554&view=diff > > = > = > = > = > = > = > = > = > ====================================================================== > --- llvm/trunk/configure (original) > +++ llvm/trunk/configure Mon Jan 19 18:52:24 2009 > @@ -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 > @@ -940,6 +955,7 @@ > CC > CFLAGS > LDFLAGS > +LIBS > CPPFLAGS > CPP > CXX > @@ -1066,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) > @@ -1085,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 \ > @@ -1282,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) > @@ -1586,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 dir> if > you have headers in a nonstandard directory dir> > CPP C preprocessor > @@ -1665,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. > @@ -1681,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 $@ > > @@ -2426,7 +2443,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 > @@ -2466,7 +2483,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 > @@ -2523,7 +2540,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 > @@ -2564,7 +2581,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 > @@ -2622,7 +2639,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 > @@ -2666,7 +2683,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 > @@ -2807,7 +2824,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 > @@ -2835,6 +2852,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 > > @@ -2846,8 +2869,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. > @@ -3025,27 +3046,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 > @@ -3100,27 +3104,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 > @@ -3155,27 +3142,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 > @@ -3211,27 +3181,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 > @@ -3347,27 +3300,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 > @@ -3457,17 +3393,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 > @@ -3501,17 +3430,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 > @@ -3576,17 +3498,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 > @@ -3620,17 +3535,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 > @@ -3685,7 +3593,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 > @@ -3767,7 +3675,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 > @@ -3863,27 +3771,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 > @@ -4059,27 +3950,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 > @@ -4121,7 +3995,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 > > @@ -4142,27 +4017,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. */ > @@ -4197,27 +4055,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 > @@ -4268,27 +4109,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 > @@ -4418,7 +4242,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 > @@ -4456,7 +4280,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 > @@ -4495,7 +4319,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 > @@ -4585,7 +4409,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 > @@ -4623,7 +4447,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 > @@ -4662,7 +4486,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 > @@ -5115,17 +4939,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 > @@ -5159,17 +4976,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 > @@ -5234,17 +5044,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 > @@ -5278,17 +5081,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 > @@ -5345,7 +5141,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 > @@ -5389,7 +5185,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 > @@ -5507,27 +5303,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 > @@ -5582,27 +5361,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 > @@ -5637,27 +5399,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 > @@ -5693,27 +5438,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 > @@ -5829,27 +5557,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 > @@ -5914,7 +5625,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 > @@ -5958,7 +5669,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 > @@ -6071,27 +5782,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 > @@ -6146,27 +5840,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 > @@ -6201,27 +5878,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 > @@ -6257,27 +5917,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 > @@ -6341,7 +5984,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 > @@ -6366,116 +6009,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" > @@ -6490,147 +6140,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 > @@ -6642,6 +6167,7 @@ > _ACEOF > > fi > +rm -f conftest.l $LEX_OUTPUT_ROOT.c > > fi > > @@ -6680,7 +6206,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 > @@ -6827,7 +6353,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 > @@ -6868,7 +6394,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 > @@ -6909,7 +6435,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 > @@ -6950,7 +6476,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 > @@ -6991,7 +6517,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 > @@ -7032,7 +6558,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 > @@ -7073,7 +6599,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 > @@ -7113,7 +6639,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 > @@ -7153,7 +6679,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 > @@ -7210,7 +6736,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 > @@ -7251,7 +6777,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 > @@ -7292,7 +6818,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 > @@ -7333,7 +6859,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 > @@ -7375,7 +6901,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 > @@ -7431,7 +6957,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 > @@ -7489,7 +7015,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 > @@ -7548,7 +7074,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 > @@ -7606,7 +7132,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 > @@ -7690,7 +7216,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. > @@ -7753,7 +7279,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 > @@ -7793,7 +7319,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 > @@ -7833,7 +7359,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 > @@ -7873,7 +7399,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 > @@ -7913,7 +7439,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 > @@ -7953,7 +7479,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 > @@ -7993,7 +7519,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 > @@ -8066,7 +7592,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 > @@ -8123,7 +7649,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 > @@ -8165,7 +7691,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 > @@ -8210,7 +7736,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 > @@ -8255,7 +7781,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 > @@ -8300,7 +7826,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 > @@ -8345,7 +7871,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_GAS="$as_dir/$ac_word$ac_exec_ext" > echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 > break 2 > @@ -8412,27 +7938,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 > @@ -8441,7 +7951,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 > @@ -8484,10 +7994,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}; > @@ -8496,11 +8006,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; > @@ -8527,7 +8037,7 @@ > const int foo = 10; > if (!foo) return 0; > } > - return !x[0] && !zero.x; > + return !cs[0] && !zero.x; > #endif > > ; > @@ -8547,27 +8057,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 > @@ -8632,27 +8125,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 > @@ -8725,27 +8201,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 > @@ -8754,7 +8214,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 > @@ -8825,27 +8285,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 > @@ -8854,7 +8298,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 > @@ -8917,27 +8361,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 > @@ -8973,17 +8400,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 > @@ -10077,27 +9497,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 > @@ -10106,7 +9510,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 > @@ -10160,27 +9564,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 > @@ -10189,7 +9577,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 > @@ -10245,27 +9633,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 > @@ -10274,7 +9646,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 > @@ -10319,27 +9691,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 > @@ -10391,27 +9747,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 > @@ -10420,7 +9760,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 > @@ -10476,27 +9816,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 > @@ -10505,7 +9829,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 > @@ -10582,27 +9906,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 > @@ -10611,7 +9919,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 > @@ -10633,7 +9941,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 > @@ -10716,27 +10024,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 > @@ -10745,7 +10037,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'}'` > @@ -10832,7 +10124,7 @@ > lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 > lt_status=$lt_dlunknown > cat > conftest.$ac_ext < -#line 10835 "configure" > +#line 10127 "configure" > #include "confdefs.h" > > #if HAVE_DLFCN_H > @@ -11061,27 +10353,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 > @@ -11117,17 +10392,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 > @@ -11232,27 +10500,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 > @@ -11352,27 +10603,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 > @@ -11381,7 +10616,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'}'` > @@ -11461,27 +10696,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 > @@ -11517,17 +10735,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 > @@ -11633,27 +10844,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 > @@ -11689,17 +10883,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 > @@ -11803,27 +10990,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 > @@ -11859,17 +11029,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 > @@ -12002,27 +11165,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 > @@ -12031,7 +11178,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'}'` > @@ -12113,27 +11260,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 > @@ -12142,7 +11273,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'}'` > @@ -12224,27 +11355,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 > @@ -12253,7 +11368,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'}'` > @@ -12335,27 +11450,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 > @@ -12364,7 +11463,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'}'` > @@ -12447,27 +11546,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 > @@ -12476,7 +11559,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'}'` > @@ -12976,7 +12059,7 @@ > ;; > *-*-irix6*) > # Find out which ABI we are using. > - echo '#line 12979 "configure"' > conftest.$ac_ext > + echo '#line 12062 "configure"' > conftest.$ac_ext > if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 > (eval $ac_compile) 2>&5 > ac_status=$? > @@ -13100,27 +12183,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 > @@ -13129,7 +12196,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' > @@ -13224,17 +12291,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 > @@ -13268,17 +12328,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 > @@ -13343,17 +12396,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 > @@ -13387,17 +12433,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 > @@ -13438,7 +12477,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 > @@ -13456,7 +12495,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 > @@ -13482,7 +12521,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 > @@ -13500,7 +12539,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 > @@ -13607,27 +12646,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 > @@ -13670,27 +12692,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 > @@ -14145,7 +13150,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 > @@ -14185,7 +13190,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 > @@ -14241,7 +13246,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 > @@ -14281,7 +13286,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 > @@ -14337,7 +13342,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 > @@ -14377,7 +13382,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 > @@ -14694,11 +13699,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:14697: $lt_compile\"" >&5) > + (eval echo "\"\$as_me:13702: $lt_compile\"" >&5) > (eval "$lt_compile" 2>conftest.err) > ac_status=$? > cat conftest.err >&5 > - echo "$as_me:14701: \$? = $ac_status" >&5 > + echo "$as_me:13706: \$? = $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. > @@ -14962,11 +13967,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:14965: $lt_compile\"" >&5) > + (eval echo "\"\$as_me:13970: $lt_compile\"" >&5) > (eval "$lt_compile" 2>conftest.err) > ac_status=$? > cat conftest.err >&5 > - echo "$as_me:14969: \$? = $ac_status" >&5 > + echo "$as_me:13974: \$? = $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. > @@ -15066,11 +14071,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:15069: $lt_compile\"" >&5) > + (eval echo "\"\$as_me:14074: $lt_compile\"" >&5) > (eval "$lt_compile" 2>out/conftest.err) > ac_status=$? > cat out/conftest.err >&5 > - echo "$as_me:15073: \$? = $ac_status" >&5 > + echo "$as_me:14078: \$? = $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 > @@ -15546,27 +14551,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; } > }'` > @@ -15580,7 +14569,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 > > @@ -15621,27 +14610,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; } > }'` > @@ -15655,7 +14628,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 > > @@ -16903,27 +15876,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 > @@ -16932,7 +15889,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 > @@ -17014,27 +15971,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 > @@ -17043,7 +15984,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 > @@ -17093,27 +16034,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 > @@ -17122,7 +16047,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 > @@ -17194,27 +16119,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 > @@ -17223,7 +16132,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 > @@ -17273,27 +16182,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 > @@ -17302,7 +16195,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 > @@ -17353,27 +16246,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 > @@ -17382,7 +16259,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 > @@ -17433,27 +16310,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 > @@ -17462,7 +16323,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 > @@ -17518,7 +16379,7 @@ > lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 > lt_status=$lt_dlunknown > cat > conftest.$ac_ext < -#line 17521 "configure" > +#line 16382 "configure" > #include "confdefs.h" > > #if HAVE_DLFCN_H > @@ -17618,7 +16479,7 @@ > lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 > lt_status=$lt_dlunknown > cat > conftest.$ac_ext < -#line 17621 "configure" > +#line 16482 "configure" > #include "confdefs.h" > > #if HAVE_DLFCN_H > @@ -18705,27 +17566,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; } > }'` > @@ -18739,7 +17584,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 > > @@ -18781,27 +17626,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; } > }'` > @@ -18815,7 +17644,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 > > @@ -19986,11 +18815,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:19989: $lt_compile\"" >&5) > + (eval echo "\"\$as_me:18818: $lt_compile\"" >&5) > (eval "$lt_compile" 2>conftest.err) > ac_status=$? > cat conftest.err >&5 > - echo "$as_me:19993: \$? = $ac_status" >&5 > + echo "$as_me:18822: \$? = $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. > @@ -20090,11 +18919,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:20093: $lt_compile\"" >&5) > + (eval echo "\"\$as_me:18922: $lt_compile\"" >&5) > (eval "$lt_compile" 2>out/conftest.err) > ac_status=$? > cat out/conftest.err >&5 > - echo "$as_me:20097: \$? = $ac_status" >&5 > + echo "$as_me:18926: \$? = $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 > @@ -21660,11 +20489,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:21663: $lt_compile\"" >&5) > + (eval echo "\"\$as_me:20492: $lt_compile\"" >&5) > (eval "$lt_compile" 2>conftest.err) > ac_status=$? > cat conftest.err >&5 > - echo "$as_me:21667: \$? = $ac_status" >&5 > + echo "$as_me:20496: \$? = $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. > @@ -21764,11 +20593,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:21767: $lt_compile\"" >&5) > + (eval echo "\"\$as_me:20596: $lt_compile\"" >&5) > (eval "$lt_compile" 2>out/conftest.err) > ac_status=$? > cat out/conftest.err >&5 > - echo "$as_me:21771: \$? = $ac_status" >&5 > + echo "$as_me:20600: \$? = $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 > @@ -22234,27 +21063,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; } > }'` > @@ -22268,7 +21081,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 > > @@ -22299,27 +21112,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; } > }'` > @@ -22333,7 +21130,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 > > @@ -23999,11 +22796,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:24002: $lt_compile\"" >&5) > + (eval echo "\"\$as_me:22799: $lt_compile\"" >&5) > (eval "$lt_compile" 2>conftest.err) > ac_status=$? > cat conftest.err >&5 > - echo "$as_me:24006: \$? = $ac_status" >&5 > + echo "$as_me:22803: \$? = $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. > @@ -24267,11 +23064,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:24270: $lt_compile\"" >&5) > + (eval echo "\"\$as_me:23067: $lt_compile\"" >&5) > (eval "$lt_compile" 2>conftest.err) > ac_status=$? > cat conftest.err >&5 > - echo "$as_me:24274: \$? = $ac_status" >&5 > + echo "$as_me:23071: \$? = $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. > @@ -24371,11 +23168,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:24374: $lt_compile\"" >&5) > + (eval echo "\"\$as_me:23171: $lt_compile\"" >&5) > (eval "$lt_compile" 2>out/conftest.err) > ac_status=$? > cat out/conftest.err >&5 > - echo "$as_me:24378: \$? = $ac_status" >&5 > + echo "$as_me:23175: \$? = $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 > @@ -24851,27 +23648,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; } > }'` > @@ -24885,7 +23666,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 > > @@ -24926,27 +23707,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; } > }'` > @@ -24960,7 +23725,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 > > @@ -27100,7 +25865,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 > @@ -27140,7 +25905,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 > @@ -27224,27 +25989,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 > @@ -27312,27 +26060,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 > @@ -27341,7 +26073,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 > @@ -27399,27 +26131,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 > @@ -27428,7 +26144,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 > @@ -27481,27 +26197,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 > @@ -27510,7 +26210,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 > @@ -27562,27 +26262,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 > @@ -27591,7 +26275,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 > @@ -27656,27 +26340,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 > @@ -27685,7 +26353,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 > @@ -27715,9 +26383,9 @@ > fi > > > -{ echo "$as_me:$LINENO: checking for library containing mallinfo" >&5 > -echo $ECHO_N "checking for library containing mallinfo... $ECHO_C" > >&6; } > -if test "${ac_cv_search_mallinfo+set}" = set; then > +{ echo "$as_me:$LINENO: checking for library containing ffi_call" >&5 > +echo $ECHO_N "checking for library containing ffi_call... $ECHO_C" > >&6; } > +if test "${ac_cv_search_ffi_call+set}" = set; then > echo $ECHO_N "(cached) $ECHO_C" >&6 > else > ac_func_search_save_LIBS=$LIBS > @@ -27734,16 +26402,16 @@ > #ifdef __cplusplus > extern "C" > #endif > -char mallinfo (); > +char ffi_call (); > int > main () > { > -return mallinfo (); > +return ffi_call (); > ; > return 0; > } > _ACEOF > -for ac_lib in '' malloc; do > +for ac_lib in '' ffi; do > if test -z "$ac_lib"; then > ac_res="none required" > else > @@ -27763,28 +26431,12 @@ > 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_search_mallinfo=$ac_res > + (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_ffi_call=$ac_res > else > echo "$as_me: failed program was:" >&5 > sed 's/^/| /' conftest.$ac_ext >&5 > @@ -27792,42 +26444,42 @@ > > 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 > + if test "${ac_cv_search_ffi_call+set}" = set; then > break > fi > done > -if test "${ac_cv_search_mallinfo+set}" = set; then > +if test "${ac_cv_search_ffi_call+set}" = set; then > : > else > - ac_cv_search_mallinfo=no > + ac_cv_search_ffi_call=no > fi > rm conftest.$ac_ext > LIBS=$ac_func_search_save_LIBS > fi > -{ echo "$as_me:$LINENO: result: $ac_cv_search_mallinfo" >&5 > -echo "${ECHO_T}$ac_cv_search_mallinfo" >&6; } > -ac_res=$ac_cv_search_mallinfo > +{ echo "$as_me:$LINENO: result: $ac_cv_search_ffi_call" >&5 > +echo "${ECHO_T}$ac_cv_search_ffi_call" >&6; } > +ac_res=$ac_cv_search_ffi_call > if test "$ac_res" != no; then > test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" > > cat >>confdefs.h <<\_ACEOF > -#define HAVE_MALLINFO 1 > +#define HAVE_LIBFFI 1 > _ACEOF > > +else > + { echo "$as_me:$LINENO: WARNING: libffi not found - disabling > external calls from interpreter" >&5 > +echo "$as_me: WARNING: libffi not found - disabling external calls > from interpreter" >&2;} > fi > > > -if test "$ENABLE_THREADS" -eq 1 ; then > - > -{ echo "$as_me:$LINENO: checking for pthread_mutex_init in - > lpthread" >&5 > -echo $ECHO_N "checking for pthread_mutex_init in -lpthread... > $ECHO_C" >&6; } > -if test "${ac_cv_lib_pthread_pthread_mutex_init+set}" = set; then > +{ echo "$as_me:$LINENO: checking for library containing mallinfo" >&5 > +echo $ECHO_N "checking for library containing mallinfo... $ECHO_C" > >&6; } > +if test "${ac_cv_search_mallinfo+set}" = set; then > echo $ECHO_N "(cached) $ECHO_C" >&6 > else > - ac_check_lib_save_LIBS=$LIBS > -LIBS="-lpthread $LIBS" > + ac_func_search_save_LIBS=$LIBS > cat >conftest.$ac_ext <<_ACEOF > /* confdefs.h. */ > _ACEOF > @@ -27841,16 +26493,23 @@ > #ifdef __cplusplus > extern "C" > #endif > -char pthread_mutex_init (); > +char mallinfo (); > int > main () > { > -return pthread_mutex_init (); > +return mallinfo (); > ; > return 0; > } > _ACEOF > -rm -f conftest.$ac_objext conftest$ac_exeext > +for ac_lib in '' malloc; do > + if test -z "$ac_lib"; then > + ac_res="none required" > + else > + ac_res=-l$ac_lib > + LIBS="-l$ac_lib $ac_func_search_save_LIBS" > + fi > + rm -f conftest.$ac_objext conftest$ac_exeext > if { (ac_try="$ac_link" > case "(($ac_try" in > *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; > @@ -27863,27 +26522,95 @@ > 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 > + (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 > +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_mallinfo+set}" = set; then > + break > +fi > +done > +if test "${ac_cv_search_mallinfo+set}" = set; then > + : > +else > + ac_cv_search_mallinfo=no > +fi > +rm conftest.$ac_ext > +LIBS=$ac_func_search_save_LIBS > +fi > +{ echo "$as_me:$LINENO: result: $ac_cv_search_mallinfo" >&5 > +echo "${ECHO_T}$ac_cv_search_mallinfo" >&6; } > +ac_res=$ac_cv_search_mallinfo > +if test "$ac_res" != no; then > + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" > + > +cat >>confdefs.h <<\_ACEOF > +#define HAVE_MALLINFO 1 > +_ACEOF > + > +fi > + > + > +if test "$ENABLE_THREADS" -eq 1 ; then > + > +{ echo "$as_me:$LINENO: checking for pthread_mutex_init in - > lpthread" >&5 > +echo $ECHO_N "checking for pthread_mutex_init in -lpthread... > $ECHO_C" >&6; } > +if test "${ac_cv_lib_pthread_pthread_mutex_init+set}" = set; then > + echo $ECHO_N "(cached) $ECHO_C" >&6 > +else > + ac_check_lib_save_LIBS=$LIBS > +LIBS="-lpthread $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 pthread_mutex_init (); > +int > +main () > +{ > +return pthread_mutex_init (); > + ; > + 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_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 > + (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 > @@ -27892,7 +26619,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 > @@ -27955,27 +26682,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 > @@ -27984,7 +26695,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 > @@ -28065,27 +26776,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 > @@ -28094,7 +26789,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 > @@ -28171,27 +26866,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 > @@ -28264,27 +26942,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 > @@ -28293,7 +26955,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 > @@ -28364,27 +27026,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 > @@ -28393,7 +27039,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 > @@ -28458,27 +27104,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 > @@ -28521,38 +27150,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; } > @@ -28601,27 +27240,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 > @@ -28798,27 +27420,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 > @@ -28876,27 +27481,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 > @@ -28962,27 +27550,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 > @@ -29018,17 +27589,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 > @@ -29136,27 +27700,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 > @@ -29192,17 +27739,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 > @@ -29305,27 +27845,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 > @@ -29361,17 +27884,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 > @@ -29477,27 +27993,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 > @@ -29533,17 +28032,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 > @@ -29648,27 +28140,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 > @@ -29704,17 +28179,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 > @@ -29818,27 +28286,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 > @@ -29874,17 +28325,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 > @@ -29957,6 +28401,286 @@ > > fi > > +if test "${ac_cv_header_ffi_ffi_h+set}" = set; then > + { echo "$as_me:$LINENO: checking for ffi/ffi.h" >&5 > +echo $ECHO_N "checking for ffi/ffi.h... $ECHO_C" >&6; } > +if test "${ac_cv_header_ffi_ffi_h+set}" = set; then > + echo $ECHO_N "(cached) $ECHO_C" >&6 > +fi > +{ echo "$as_me:$LINENO: result: $ac_cv_header_ffi_ffi_h" >&5 > +echo "${ECHO_T}$ac_cv_header_ffi_ffi_h" >&6; } > +else > + # Is the header compilable? > +{ echo "$as_me:$LINENO: checking ffi/ffi.h usability" >&5 > +echo $ECHO_N "checking ffi/ffi.h usability... $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. */ > +$ac_includes_default > +#include > +_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_header_compiler=yes > +else > + echo "$as_me: failed program was:" >&5 > +sed 's/^/| /' conftest.$ac_ext >&5 > + > + ac_header_compiler=no > +fi > + > +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext > +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 > +echo "${ECHO_T}$ac_header_compiler" >&6; } > + > +# Is the header present? > +{ echo "$as_me:$LINENO: checking ffi/ffi.h presence" >&5 > +echo $ECHO_N "checking ffi/ffi.h presence... $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 > +_ACEOF > +if { (ac_try="$ac_cpp conftest.$ac_ext" > +case "(($ac_try" in > + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; > + *) ac_try_echo=$ac_try;; > +esac > +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 > + (eval "$ac_cpp conftest.$ac_ext") 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); } >/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 > +sed 's/^/| /' conftest.$ac_ext >&5 > + > + ac_header_preproc=no > +fi > + > +rm -f conftest.err conftest.$ac_ext > +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 > +echo "${ECHO_T}$ac_header_preproc" >&6; } > + > +# So? What about this header? > +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag > in > + yes:no: ) > + { echo "$as_me:$LINENO: WARNING: ffi/ffi.h: accepted by the > compiler, rejected by the preprocessor!" >&5 > +echo "$as_me: WARNING: ffi/ffi.h: accepted by the compiler, > rejected by the preprocessor!" >&2;} > + { echo "$as_me:$LINENO: WARNING: ffi/ffi.h: proceeding with the > compiler's result" >&5 > +echo "$as_me: WARNING: ffi/ffi.h: proceeding with the compiler's > result" >&2;} > + ac_header_preproc=yes > + ;; > + no:yes:* ) > + { echo "$as_me:$LINENO: WARNING: ffi/ffi.h: present but cannot > be compiled" >&5 > +echo "$as_me: WARNING: ffi/ffi.h: present but cannot be compiled" > >&2;} > + { echo "$as_me:$LINENO: WARNING: ffi/ffi.h: check for > missing prerequisite headers?" >&5 > +echo "$as_me: WARNING: ffi/ffi.h: check for missing > prerequisite headers?" >&2;} > + { echo "$as_me:$LINENO: WARNING: ffi/ffi.h: see the Autoconf > documentation" >&5 > +echo "$as_me: WARNING: ffi/ffi.h: see the Autoconf documentation" > >&2;} > + { echo "$as_me:$LINENO: WARNING: ffi/ffi.h: section > \"Present But Cannot Be Compiled\"" >&5 > +echo "$as_me: WARNING: ffi/ffi.h: section \"Present But Cannot > Be Compiled\"" >&2;} > + { echo "$as_me:$LINENO: WARNING: ffi/ffi.h: proceeding with the > preprocessor's result" >&5 > +echo "$as_me: WARNING: ffi/ffi.h: proceeding with the > preprocessor's result" >&2;} > + { echo "$as_me:$LINENO: WARNING: ffi/ffi.h: in the future, the > compiler will take precedence" >&5 > +echo "$as_me: WARNING: ffi/ffi.h: in the future, the compiler will > take precedence" >&2;} > + ( cat <<\_ASBOX > +## ----------------------------------- ## > +## Report this to llvmbugs at cs.uiuc.edu ## > +## ----------------------------------- ## > +_ASBOX > + ) | sed "s/^/$as_me: WARNING: /" >&2 > + ;; > +esac > +{ echo "$as_me:$LINENO: checking for ffi/ffi.h" >&5 > +echo $ECHO_N "checking for ffi/ffi.h... $ECHO_C" >&6; } > +if test "${ac_cv_header_ffi_ffi_h+set}" = set; then > + echo $ECHO_N "(cached) $ECHO_C" >&6 > +else > + ac_cv_header_ffi_ffi_h=$ac_header_preproc > +fi > +{ echo "$as_me:$LINENO: result: $ac_cv_header_ffi_ffi_h" >&5 > +echo "${ECHO_T}$ac_cv_header_ffi_ffi_h" >&6; } > + > +fi > +if test $ac_cv_header_ffi_ffi_h = yes; then > + > +cat >>confdefs.h <<\_ACEOF > +#define FFI_HEADER "ffi/ffi.h" > +_ACEOF > + > +fi > + > + > +if test "${ac_cv_header_ffi_h+set}" = set; then > + { echo "$as_me:$LINENO: checking for ffi.h" >&5 > +echo $ECHO_N "checking for ffi.h... $ECHO_C" >&6; } > +if test "${ac_cv_header_ffi_h+set}" = set; then > + echo $ECHO_N "(cached) $ECHO_C" >&6 > +fi > +{ echo "$as_me:$LINENO: result: $ac_cv_header_ffi_h" >&5 > +echo "${ECHO_T}$ac_cv_header_ffi_h" >&6; } > +else > + # Is the header compilable? > +{ echo "$as_me:$LINENO: checking ffi.h usability" >&5 > +echo $ECHO_N "checking ffi.h usability... $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. */ > +$ac_includes_default > +#include > +_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_header_compiler=yes > +else > + echo "$as_me: failed program was:" >&5 > +sed 's/^/| /' conftest.$ac_ext >&5 > + > + ac_header_compiler=no > +fi > + > +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext > +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 > +echo "${ECHO_T}$ac_header_compiler" >&6; } > + > +# Is the header present? > +{ echo "$as_me:$LINENO: checking ffi.h presence" >&5 > +echo $ECHO_N "checking ffi.h presence... $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 > +_ACEOF > +if { (ac_try="$ac_cpp conftest.$ac_ext" > +case "(($ac_try" in > + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; > + *) ac_try_echo=$ac_try;; > +esac > +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 > + (eval "$ac_cpp conftest.$ac_ext") 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); } >/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 > +sed 's/^/| /' conftest.$ac_ext >&5 > + > + ac_header_preproc=no > +fi > + > +rm -f conftest.err conftest.$ac_ext > +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 > +echo "${ECHO_T}$ac_header_preproc" >&6; } > + > +# So? What about this header? > +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag > in > + yes:no: ) > + { echo "$as_me:$LINENO: WARNING: ffi.h: accepted by the > compiler, rejected by the preprocessor!" >&5 > +echo "$as_me: WARNING: ffi.h: accepted by the compiler, rejected by > the preprocessor!" >&2;} > + { echo "$as_me:$LINENO: WARNING: ffi.h: proceeding with the > compiler's result" >&5 > +echo "$as_me: WARNING: ffi.h: proceeding with the compiler's > result" >&2;} > + ac_header_preproc=yes > + ;; > + no:yes:* ) > + { echo "$as_me:$LINENO: WARNING: ffi.h: present but cannot be > compiled" >&5 > +echo "$as_me: WARNING: ffi.h: present but cannot be compiled" >&2;} > + { echo "$as_me:$LINENO: WARNING: ffi.h: check for missing > prerequisite headers?" >&5 > +echo "$as_me: WARNING: ffi.h: check for missing prerequisite > headers?" >&2;} > + { echo "$as_me:$LINENO: WARNING: ffi.h: see the Autoconf > documentation" >&5 > +echo "$as_me: WARNING: ffi.h: see the Autoconf documentation" >&2;} > + { echo "$as_me:$LINENO: WARNING: ffi.h: section \"Present > But Cannot Be Compiled\"" >&5 > +echo "$as_me: WARNING: ffi.h: section \"Present But Cannot Be > Compiled\"" >&2;} > + { echo "$as_me:$LINENO: WARNING: ffi.h: proceeding with the > preprocessor's result" >&5 > +echo "$as_me: WARNING: ffi.h: proceeding with the preprocessor's > result" >&2;} > + { echo "$as_me:$LINENO: WARNING: ffi.h: in the future, the > compiler will take precedence" >&5 > +echo "$as_me: WARNING: ffi.h: in the future, the compiler will take > precedence" >&2;} > + ( cat <<\_ASBOX > +## ----------------------------------- ## > +## Report this to llvmbugs at cs.uiuc.edu ## > +## ----------------------------------- ## > +_ASBOX > + ) | sed "s/^/$as_me: WARNING: /" >&2 > + ;; > +esac > +{ echo "$as_me:$LINENO: checking for ffi.h" >&5 > +echo $ECHO_N "checking for ffi.h... $ECHO_C" >&6; } > +if test "${ac_cv_header_ffi_h+set}" = set; then > + echo $ECHO_N "(cached) $ECHO_C" >&6 > +else > + ac_cv_header_ffi_h=$ac_header_preproc > +fi > +{ echo "$as_me:$LINENO: result: $ac_cv_header_ffi_h" >&5 > +echo "${ECHO_T}$ac_cv_header_ffi_h" >&6; } > + > +fi > +if test $ac_cv_header_ffi_h = yes; then > + > +cat >>confdefs.h <<\_ACEOF > +#define FFI_HEADER "ffi.h" > +_ACEOF > + > +fi > + > + > + > + > > > { echo "$as_me:$LINENO: checking for HUGE_VAL sanity" >&5 > @@ -30073,27 +28797,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 > @@ -30153,27 +28860,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 > @@ -30231,27 +28921,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 > @@ -30287,7 +28960,9 @@ > int > main () > { > -struct tm *tp; tp->tm_sec; > +struct tm tm; > + int *p = &tm.tm_sec; > + return !p; > ; > return 0; > } > @@ -30305,27 +28980,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 > @@ -30383,27 +29041,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 > @@ -30466,27 +29107,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 > @@ -30544,27 +29168,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 > @@ -30667,27 +29274,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 > @@ -30696,7 +29287,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'}'` > @@ -30780,27 +29371,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 > @@ -30809,7 +29384,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'}'` > @@ -30894,27 +29469,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 > @@ -30923,7 +29482,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'}'` > @@ -31006,27 +29565,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 > @@ -31035,7 +29578,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'}'` > @@ -31122,27 +29665,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 > @@ -31151,7 +29678,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'}'` > @@ -31235,27 +29762,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 > @@ -31264,7 +29775,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'}'` > @@ -31348,27 +29859,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 > @@ -31377,7 +29872,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'}'` > @@ -31521,27 +30016,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 > @@ -31550,7 +30029,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 > @@ -31581,7 +30060,7 @@ > # include > # define alloca _alloca > # else > -# if HAVE_ALLOCA_H > +# ifdef HAVE_ALLOCA_H > # include > # else > # ifdef _AIX > @@ -31617,27 +30096,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 > @@ -31646,7 +30109,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 > @@ -31766,27 +30229,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 > @@ -31795,7 +30242,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'}'` > @@ -31932,27 +30379,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 > @@ -32020,27 +30450,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 > @@ -32111,27 +30524,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 > @@ -32208,27 +30604,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 > @@ -32302,27 +30681,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 > @@ -32399,27 +30761,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 > @@ -32496,27 +30841,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 > @@ -32590,27 +30918,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 > @@ -32687,27 +30998,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 > @@ -32785,27 +31079,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 > @@ -32883,27 +31160,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 > @@ -32978,27 +31238,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 > @@ -33066,27 +31309,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 > @@ -33153,27 +31379,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 > @@ -33241,27 +31450,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 > @@ -33328,27 +31520,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 > @@ -33415,27 +31590,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 > @@ -33502,27 +31660,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 > @@ -33593,27 +31734,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 > @@ -33649,17 +31773,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 > @@ -33790,27 +31907,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 > @@ -33819,7 +31920,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'}'` > @@ -33876,21 +31977,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 > @@ -34213,27 +32314,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 > @@ -34242,7 +32327,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'}'` > @@ -34492,27 +32577,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 > @@ -34742,7 +32810,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=: > @@ -34751,10 +32820,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 > @@ -34978,19 +33050,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'" > @@ -35006,7 +33087,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 > @@ -35035,7 +33116,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 > @@ -35059,7 +33140,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. > @@ -35346,8 +33427,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 > @@ -35985,7 +34066,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 > > > _______________________________________________ > llvm-commits mailing list > llvm-commits at cs.uiuc.edu > http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits From tonic at nondot.org Wed Jan 21 23:17:59 2009 From: tonic at nondot.org (Tanya Lattner) Date: Thu, 22 Jan 2009 05:17:59 -0000 Subject: [llvm-commits] [llvm] r62751 - in /llvm/trunk: autoconf/configure.ac configure include/llvm/Config/config.h.in Message-ID: <200901220518.n0M5I0Y7013755@zion.cs.uiuc.edu> Author: tbrethou Date: Wed Jan 21 23:17:59 2009 New Revision: 62751 URL: http://llvm.org/viewvc/llvm-project?rev=62751&view=rev Log: Bump to 2.6svn. Regenerate configure (last regen was with the wrong version). Modified: llvm/trunk/autoconf/configure.ac llvm/trunk/configure llvm/trunk/include/llvm/Config/config.h.in Modified: llvm/trunk/autoconf/configure.ac URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/autoconf/configure.ac?rev=62751&r1=62750&r2=62751&view=diff ============================================================================== --- llvm/trunk/autoconf/configure.ac (original) +++ llvm/trunk/autoconf/configure.ac Wed Jan 21 23:17:59 2009 @@ -31,7 +31,7 @@ dnl===-----------------------------------------------------------------------=== dnl Initialize autoconf and define the package name, version number and dnl email address for reporting bugs. -AC_INIT([[llvm]],[[2.5svn]],[llvmbugs at cs.uiuc.edu]) +AC_INIT([[llvm]],[[2.6svn]],[llvmbugs at cs.uiuc.edu]) dnl Provide a copyright substitution and ensure the copyright notice is included dnl in the output of --version option of the generated configure script. Modified: llvm/trunk/configure URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/configure?rev=62751&r1=62750&r2=62751&view=diff ============================================================================== --- llvm/trunk/configure (original) +++ llvm/trunk/configure Wed Jan 21 23:17:59 2009 @@ -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.6svn. # # 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'" @@ -730,44 +715,44 @@ # Identity of this package. PACKAGE_NAME='llvm' PACKAGE_TARNAME='-llvm-' -PACKAGE_VERSION='2.5svn' -PACKAGE_STRING='llvm 2.5svn' +PACKAGE_VERSION='2.6svn' +PACKAGE_STRING='llvm 2.6svn' PACKAGE_BUGREPORT='llvmbugs at cs.uiuc.edu' ac_unique_file="lib/VMCore/Module.cpp" # 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) @@ -1479,7 +1463,7 @@ # 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 llvm 2.5svn to adapt to many kinds of systems. +\`configure' configures llvm 2.6svn to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1545,7 +1529,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of llvm 2.5svn:";; + short | recursive ) echo "Configuration of llvm 2.6svn:";; esac cat <<\_ACEOF @@ -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 @@ -1681,8 +1664,8 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -llvm configure 2.5svn -generated by GNU Autoconf 2.61 +llvm configure 2.6svn +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. @@ -1697,8 +1680,8 @@ This file contains any messages produced by compilers while 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 +It was created by llvm $as_me 2.6svn, which was +generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -2443,7 +2426,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 @@ -2483,7 +2466,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 @@ -2540,7 +2523,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 @@ -2581,7 +2564,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 @@ -2639,7 +2622,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 @@ -2683,7 +2666,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 @@ -2824,7 +2807,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 @@ -2852,12 +2835,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 @@ -2869,6 +2846,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. @@ -3046,10 +3025,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 @@ -3104,10 +3100,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 @@ -3142,10 +3155,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 @@ -3181,10 +3211,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 @@ -3300,10 +3347,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 @@ -3393,10 +3457,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 @@ -3430,10 +3501,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 @@ -3498,10 +3576,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 @@ -3535,10 +3620,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 @@ -3593,7 +3685,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 @@ -3675,7 +3767,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 @@ -3771,10 +3863,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 @@ -3950,10 +4059,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 @@ -3995,8 +4121,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 @@ -4017,10 +4142,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. */ @@ -4055,10 +4197,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 @@ -4109,10 +4268,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 @@ -4242,7 +4418,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 @@ -4280,7 +4456,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 @@ -4319,7 +4495,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 @@ -4409,7 +4585,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 @@ -4447,7 +4623,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 @@ -4486,7 +4662,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 @@ -4939,10 +5115,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 @@ -4976,10 +5159,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 @@ -5044,10 +5234,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 @@ -5081,10 +5278,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 @@ -5141,7 +5345,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 @@ -5185,7 +5389,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 @@ -5303,10 +5507,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 @@ -5361,10 +5582,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 @@ -5399,10 +5637,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 @@ -5438,10 +5693,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 @@ -5557,10 +5829,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 @@ -5625,7 +5914,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 @@ -5669,7 +5958,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 @@ -5782,10 +6071,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 @@ -5840,10 +6146,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 @@ -5878,10 +6201,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 @@ -5917,10 +6257,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 @@ -5984,7 +6341,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 @@ -6009,70 +6366,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 @@ -6086,46 +6410,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" @@ -6140,22 +6490,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 @@ -6167,7 +6642,6 @@ _ACEOF fi -rm -f conftest.l $LEX_OUTPUT_ROOT.c fi @@ -6206,7 +6680,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 @@ -6353,7 +6827,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 @@ -6394,7 +6868,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 @@ -6435,7 +6909,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 @@ -6476,7 +6950,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 @@ -6517,7 +6991,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 @@ -6558,7 +7032,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 @@ -6599,7 +7073,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 @@ -6639,7 +7113,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 @@ -6679,7 +7153,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 @@ -6736,7 +7210,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 @@ -6777,7 +7251,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 @@ -6818,7 +7292,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 @@ -6859,7 +7333,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 @@ -6901,7 +7375,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 @@ -6957,7 +7431,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 @@ -7015,7 +7489,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 @@ -7074,7 +7548,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 @@ -7132,7 +7606,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 @@ -7216,7 +7690,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. @@ -7279,7 +7753,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 @@ -7319,7 +7793,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 @@ -7359,7 +7833,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 @@ -7399,7 +7873,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 @@ -7439,7 +7913,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 @@ -7479,7 +7953,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 @@ -7519,7 +7993,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 @@ -7592,7 +8066,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 @@ -7649,7 +8123,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 @@ -7691,7 +8165,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 @@ -7736,7 +8210,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 @@ -7781,7 +8255,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 @@ -7826,7 +8300,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 @@ -7871,7 +8345,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 @@ -7938,11 +8412,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 @@ -7951,7 +8441,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 @@ -7994,10 +8484,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}; @@ -8006,11 +8496,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; @@ -8037,7 +8527,7 @@ const int foo = 10; if (!foo) return 0; } - return !cs[0] && !zero.x; + return !x[0] && !zero.x; #endif ; @@ -8057,10 +8547,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 @@ -8125,10 +8632,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 @@ -8201,11 +8725,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 @@ -8214,7 +8754,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 @@ -8285,11 +8825,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 @@ -8298,7 +8854,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 @@ -8361,10 +8917,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 @@ -8400,10 +8973,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 @@ -9497,11 +10077,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 @@ -9510,7 +10106,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 @@ -9564,11 +10160,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 @@ -9577,7 +10189,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 @@ -9633,11 +10245,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 @@ -9646,7 +10274,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 @@ -9691,11 +10319,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 @@ -9747,11 +10391,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 @@ -9760,7 +10420,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 @@ -9816,11 +10476,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 @@ -9829,7 +10505,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 @@ -9906,11 +10582,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 @@ -9919,7 +10611,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 @@ -9941,7 +10633,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 @@ -10024,11 +10716,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 @@ -10037,7 +10745,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'}'` @@ -10124,7 +10832,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 @@ -10392,10 +11117,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 @@ -10500,10 +11232,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 @@ -10603,11 +11352,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 @@ -10616,7 +11381,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'}'` @@ -10696,10 +11461,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 @@ -10735,10 +11517,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 @@ -10844,10 +11633,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 @@ -10883,10 +11689,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 @@ -10990,10 +11803,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 @@ -11029,10 +11859,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 @@ -11165,11 +12002,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 @@ -11178,7 +12031,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'}'` @@ -11260,11 +12113,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 @@ -11273,7 +12142,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'}'` @@ -11355,11 +12224,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 @@ -11368,7 +12253,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'}'` @@ -11450,21 +12335,37 @@ 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 - - eval "$as_ac_var=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext + (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$ac_exeext conftest.$ac_ext fi ac_res=`eval echo '${'$as_ac_var'}'` { echo "$as_me:$LINENO: result: $ac_res" >&5 @@ -11546,11 +12447,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 @@ -11559,7 +12476,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'}'` @@ -12059,7 +12976,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 12062 "configure"' > conftest.$ac_ext + echo '#line 12979 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -12183,11 +13100,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 @@ -12196,7 +13129,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' @@ -12291,10 +13224,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 @@ -12328,10 +13268,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 @@ -12396,10 +13343,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 @@ -12433,10 +13387,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 @@ -12477,7 +13438,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 @@ -12495,7 +13456,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 @@ -12521,7 +13482,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 @@ -12539,7 +13500,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 @@ -12646,10 +13607,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 @@ -12692,10 +13670,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 @@ -13150,7 +14145,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 @@ -13190,7 +14185,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 @@ -13246,7 +14241,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 @@ -13286,7 +14281,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 @@ -13342,7 +14337,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 @@ -13382,7 +14377,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 @@ -13699,11 +14694,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:13702: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14697: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13706: \$? = $ac_status" >&5 + echo "$as_me:14701: \$? = $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. @@ -13967,11 +14962,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:13970: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14965: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13974: \$? = $ac_status" >&5 + echo "$as_me:14969: \$? = $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. @@ -14071,11 +15066,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:14074: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15069: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14078: \$? = $ac_status" >&5 + echo "$as_me:15073: \$? = $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 @@ -14551,11 +15546,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; } }'` @@ -14569,7 +15580,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 @@ -14610,11 +15621,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; } }'` @@ -14628,7 +15655,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 @@ -15876,11 +16903,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 @@ -15889,7 +16932,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 @@ -15971,11 +17014,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 @@ -15984,7 +17043,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 @@ -16034,11 +17093,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 @@ -16047,7 +17122,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 @@ -16119,11 +17194,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 @@ -16132,7 +17223,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 @@ -16182,11 +17273,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 @@ -16195,7 +17302,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 @@ -16246,11 +17353,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 @@ -16259,7 +17382,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 @@ -16310,11 +17433,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 @@ -16323,7 +17462,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 @@ -16379,7 +17518,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; } }'` @@ -17584,7 +18739,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 @@ -17626,11 +18781,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; } }'` @@ -17644,7 +18815,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 @@ -18815,11 +19986,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:18818: $lt_compile\"" >&5) + (eval echo "\"\$as_me:19989: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:18822: \$? = $ac_status" >&5 + echo "$as_me:19993: \$? = $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. @@ -18919,11 +20090,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:18922: $lt_compile\"" >&5) + (eval echo "\"\$as_me:20093: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:18926: \$? = $ac_status" >&5 + echo "$as_me:20097: \$? = $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 @@ -20489,11 +21660,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:20492: $lt_compile\"" >&5) + (eval echo "\"\$as_me:21663: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:20496: \$? = $ac_status" >&5 + echo "$as_me:21667: \$? = $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. @@ -20593,11 +21764,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:20596: $lt_compile\"" >&5) + (eval echo "\"\$as_me:21767: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:20600: \$? = $ac_status" >&5 + echo "$as_me:21771: \$? = $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 @@ -21063,11 +22234,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; } }'` @@ -21081,7 +22268,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 @@ -21112,11 +22299,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; } }'` @@ -21130,7 +22333,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 @@ -22796,11 +23999,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:22799: $lt_compile\"" >&5) + (eval echo "\"\$as_me:24002: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:22803: \$? = $ac_status" >&5 + echo "$as_me:24006: \$? = $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. @@ -23064,11 +24267,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:23067: $lt_compile\"" >&5) + (eval echo "\"\$as_me:24270: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:23071: \$? = $ac_status" >&5 + echo "$as_me:24274: \$? = $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. @@ -23168,11 +24371,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:23171: $lt_compile\"" >&5) + (eval echo "\"\$as_me:24374: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:23175: \$? = $ac_status" >&5 + echo "$as_me:24378: \$? = $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 @@ -23648,11 +24851,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; } }'` @@ -23666,7 +24885,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 @@ -23707,11 +24926,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; } }'` @@ -23725,7 +24960,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 @@ -25865,7 +27100,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 @@ -25905,7 +27140,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 @@ -25989,10 +27224,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 @@ -26060,11 +27312,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 @@ -26073,7 +27341,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 @@ -26131,11 +27399,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 @@ -26144,7 +27428,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 @@ -26197,11 +27481,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 @@ -26210,7 +27510,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 @@ -26262,11 +27562,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 @@ -26275,7 +27591,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 @@ -26340,11 +27656,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 @@ -26353,7 +27685,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 @@ -26431,11 +27763,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_ffi_call=$ac_res else echo "$as_me: failed program was:" >&5 @@ -26444,7 +27792,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_ffi_call+set}" = set; then break @@ -26522,11 +27870,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 @@ -26535,7 +27899,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 @@ -26606,23 +27970,39 @@ 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_pthread_pthread_mutex_init=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_pthread_pthread_mutex_init=no -fi - -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 + (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 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_pthread_pthread_mutex_init=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_pthread_pthread_mutex_init" >&5 echo "${ECHO_T}$ac_cv_lib_pthread_pthread_mutex_init" >&6; } if test $ac_cv_lib_pthread_pthread_mutex_init = yes; then @@ -26682,11 +28062,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_pthread_mutex_lock=$ac_res else echo "$as_me: failed program was:" >&5 @@ -26695,7 +28091,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_pthread_mutex_lock+set}" = set; then break @@ -26776,11 +28172,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 @@ -26789,7 +28201,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 @@ -26866,10 +28278,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 @@ -26942,11 +28371,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 @@ -26955,7 +28400,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 @@ -27026,11 +28471,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 @@ -27039,7 +28500,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 @@ -27104,10 +28565,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 @@ -27150,48 +28628,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; } @@ -27240,10 +28708,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 @@ -27420,10 +28905,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 @@ -27481,10 +28983,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 @@ -27550,10 +29069,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 @@ -27589,10 +29125,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 @@ -27700,10 +29243,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 @@ -27739,10 +29299,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 @@ -27845,10 +29412,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 @@ -27884,10 +29468,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 @@ -27993,10 +29584,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 @@ -28032,10 +29640,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 @@ -28140,10 +29755,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 @@ -28179,10 +29811,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 @@ -28286,10 +29925,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 @@ -28325,10 +29981,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 @@ -28435,10 +30098,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 @@ -28474,10 +30154,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 @@ -28574,10 +30261,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 @@ -28613,10 +30317,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 @@ -28682,7 +30393,6 @@ - { echo "$as_me:$LINENO: checking for HUGE_VAL sanity" >&5 echo $ECHO_N "checking for HUGE_VAL sanity... $ECHO_C" >&6; } if test "${ac_cv_huge_val_sanity+set}" = set; then @@ -28797,10 +30507,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 @@ -28860,10 +30587,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 @@ -28921,10 +30665,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 @@ -28960,9 +30721,7 @@ int main () { -struct tm tm; - int *p = &tm.tm_sec; - return !p; +struct tm *tp; tp->tm_sec; ; return 0; } @@ -28980,10 +30739,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 @@ -29041,10 +30817,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 @@ -29107,10 +30900,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 @@ -29168,10 +30978,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 @@ -29274,11 +31101,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 @@ -29287,7 +31130,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'}'` @@ -29371,11 +31214,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 @@ -29384,7 +31243,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'}'` @@ -29469,11 +31328,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 @@ -29482,7 +31357,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'}'` @@ -29565,11 +31440,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 @@ -29578,7 +31469,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'}'` @@ -29665,11 +31556,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 @@ -29678,7 +31585,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'}'` @@ -29762,11 +31669,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 @@ -29775,7 +31698,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'}'` @@ -29859,11 +31782,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 @@ -29872,7 +31811,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'}'` @@ -30016,11 +31955,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 @@ -30029,7 +31984,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 @@ -30060,7 +32015,7 @@ # include # define alloca _alloca # else -# ifdef HAVE_ALLOCA_H +# if HAVE_ALLOCA_H # include # else # ifdef _AIX @@ -30096,11 +32051,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 @@ -30109,7 +32080,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 @@ -30229,11 +32200,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 @@ -30242,7 +32229,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'}'` @@ -30379,10 +32366,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 @@ -30450,10 +32454,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 @@ -30524,10 +32545,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 @@ -30604,10 +32642,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 @@ -30681,10 +32736,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 @@ -30761,10 +32833,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 @@ -30841,10 +32930,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 @@ -30918,10 +33024,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 @@ -30998,10 +33121,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 @@ -31079,10 +33219,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 @@ -31160,10 +33317,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 @@ -31238,10 +33412,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 @@ -31309,10 +33500,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 @@ -31379,10 +33587,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 @@ -31450,10 +33675,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 @@ -31520,10 +33762,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 @@ -31590,10 +33849,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 @@ -31660,10 +33936,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 @@ -31734,10 +34027,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 @@ -31773,10 +34083,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 @@ -31907,11 +34224,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 @@ -31920,7 +34253,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'}'` @@ -31977,21 +34310,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 @@ -32314,11 +34647,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 @@ -32327,7 +34676,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'}'` @@ -32577,10 +34926,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 @@ -32810,8 +35176,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=: @@ -32820,13 +35185,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 @@ -33050,28 +35412,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'" @@ -33086,8 +35439,8 @@ # report actual input values of CONFIG_FILES etc. instead of their # 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 +This file was extended by llvm $as_me 2.6svn, which was +generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -33116,7 +35469,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 @@ -33139,8 +35492,8 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -llvm config.status 2.5svn -configured by $0, generated by GNU Autoconf 2.61, +llvm config.status 2.6svn +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. @@ -33427,8 +35780,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 @@ -34066,12 +36419,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 Modified: llvm/trunk/include/llvm/Config/config.h.in URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Config/config.h.in?rev=62751&r1=62750&r2=62751&view=diff ============================================================================== --- llvm/trunk/include/llvm/Config/config.h.in (original) +++ llvm/trunk/include/llvm/Config/config.h.in Wed Jan 21 23:17:59 2009 @@ -20,6 +20,9 @@ /* Define if threads enabled */ #undef ENABLE_THREADS +/* Path to ffi.h */ +#undef FFI_HEADER + /* Define to 1 if you have `alloca', as a function or macro. */ #undef HAVE_ALLOCA @@ -184,6 +187,9 @@ /* Define to 1 if you have the `elf' library (-lelf). */ #undef HAVE_LIBELF +/* Define to 1 if you have the libffi library (-lffi). */ +#undef HAVE_LIBFFI + /* Define to 1 if you have the `imagehlp' library (-limagehlp). */ #undef HAVE_LIBIMAGEHLP From tonic at nondot.org Wed Jan 21 23:21:32 2009 From: tonic at nondot.org (Tanya Lattner) Date: Thu, 22 Jan 2009 05:21:32 -0000 Subject: [llvm-commits] [test-suite] r62752 - in /test-suite/trunk: autoconf/configure.ac configure Message-ID: <200901220521.n0M5LXw2014090@zion.cs.uiuc.edu> Author: tbrethou Date: Wed Jan 21 23:21:32 2009 New Revision: 62752 URL: http://llvm.org/viewvc/llvm-project?rev=62752&view=rev Log: Bump to 2.6svn and regenerate. Previous regen was with the wrong version. Modified: test-suite/trunk/autoconf/configure.ac test-suite/trunk/configure Modified: test-suite/trunk/autoconf/configure.ac URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/autoconf/configure.ac?rev=62752&r1=62751&r2=62752&view=diff ============================================================================== --- test-suite/trunk/autoconf/configure.ac (original) +++ test-suite/trunk/autoconf/configure.ac Wed Jan 21 23:21:32 2009 @@ -1,5 +1,5 @@ dnl Initialize autoconf -AC_INIT([[LLVM-TEST]],[[2.5svn]],[llvmbugs at cs.uiuc.edu]) +AC_INIT([[LLVM-TEST]],[[2.6svn]],[llvmbugs at cs.uiuc.edu]) dnl Place all of the extra autoconf files into the config subdirectory AC_CONFIG_AUX_DIR([autoconf]) Modified: test-suite/trunk/configure URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/configure?rev=62752&r1=62751&r2=62752&view=diff ============================================================================== --- test-suite/trunk/configure (original) +++ test-suite/trunk/configure Wed Jan 21 23:21:32 2009 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for LLVM-TEST 2.5svn. +# Generated by GNU Autoconf 2.60 for LLVM-TEST 2.6svn. # # Report bugs to . # @@ -12,8 +12,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=: @@ -22,13 +21,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 @@ -221,7 +217,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=. @@ -239,6 +235,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=: @@ -247,12 +244,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 @@ -260,6 +255,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=: @@ -268,12 +264,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 () { @@ -520,28 +514,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'" @@ -728,44 +713,44 @@ # Identity of this package. PACKAGE_NAME='LLVM-TEST' PACKAGE_TARNAME='-llvm-test-' -PACKAGE_VERSION='2.5svn' -PACKAGE_STRING='LLVM-TEST 2.5svn' +PACKAGE_VERSION='2.6svn' +PACKAGE_STRING='LLVM-TEST 2.6svn' PACKAGE_BUGREPORT='llvmbugs at cs.uiuc.edu' ac_unique_file="SingleSource/Benchmarks/Makefile" # 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" @@ -843,8 +828,8 @@ CPP ifGNUmake LEX -LEX_OUTPUT_ROOT LEXLIB +LEX_OUTPUT_ROOT FLEX YACC YFLAGS @@ -892,7 +877,6 @@ CXX CXXFLAGS LDFLAGS -LIBS CPPFLAGS CCC CC @@ -1008,10 +992,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) @@ -1027,10 +1011,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 \ @@ -1224,19 +1208,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) @@ -1405,7 +1389,7 @@ # 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 LLVM-TEST 2.5svn to adapt to many kinds of systems. +\`configure' configures LLVM-TEST 2.6svn to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1470,7 +1454,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of LLVM-TEST 2.5svn:";; + short | recursive ) echo "Configuration of LLVM-TEST 2.6svn:";; esac cat <<\_ACEOF @@ -1514,7 +1498,6 @@ CXXFLAGS 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 CC C compiler command @@ -1593,8 +1576,8 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -LLVM-TEST configure 2.5svn -generated by GNU Autoconf 2.61 +LLVM-TEST configure 2.6svn +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. @@ -1607,8 +1590,8 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by LLVM-TEST $as_me 2.5svn, which was -generated by GNU Autoconf 2.61. Invocation command line was +It was created by LLVM-TEST $as_me 2.6svn, which was +generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -2565,7 +2548,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 @@ -2609,7 +2592,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 @@ -2743,7 +2726,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 @@ -2771,12 +2754,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 @@ -2788,6 +2765,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. @@ -2965,10 +2944,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 @@ -3023,10 +3019,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 @@ -3061,10 +3074,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 @@ -3100,10 +3130,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 @@ -3168,7 +3215,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 @@ -3212,7 +3259,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 @@ -3330,10 +3377,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 @@ -3388,10 +3452,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 @@ -3426,10 +3507,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 @@ -3465,10 +3563,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 @@ -3584,10 +3699,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 @@ -3676,10 +3808,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 @@ -3713,10 +3852,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 @@ -3781,10 +3927,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 @@ -3818,10 +3971,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 @@ -3912,7 +4072,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 @@ -3937,108 +4097,209 @@ 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" +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 "$LEX conftest.l") 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); } -{ 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 + (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$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +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 $ECHO_N "(cached) $ECHO_C" >&6 else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ll $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -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 +/* 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" +case "(($ac_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_lib_l_yywrap=yes 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; }; } + 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 -{ 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 +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 - - 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` + # 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 -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 + (eval "$LEX conftest.l") 2>&5 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 - ac_cv_lib_lex=$ac_lib + (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: 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 conftest.$ac_ext - test "$ac_cv_lib_lex" != 'none needed' && break - done - LIBS=$ac_save_LIBS - + { { 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 -{ 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_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; } @@ -4046,13 +4307,13 @@ 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 +# 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="$LEXLIB $ac_save_LIBS" +LIBS="$LIBS $LEXLIB" cat >conftest.$ac_ext <<_ACEOF -#define YYTEXT_POINTER 1 `cat $LEX_OUTPUT_ROOT.c` _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext @@ -4068,11 +4329,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_prog_lex_yytext_pointer=yes else echo "$as_me: failed program was:" >&5 @@ -4081,9 +4358,10 @@ 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 +rm -f "${LEX_OUTPUT_ROOT}.c" fi { echo "$as_me:$LINENO: result: $ac_cv_prog_lex_yytext_pointer" >&5 @@ -4095,7 +4373,6 @@ _ACEOF fi -rm -f conftest.l $LEX_OUTPUT_ROOT.c fi @@ -4134,7 +4411,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 @@ -4403,7 +4680,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 @@ -4485,7 +4762,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 @@ -4965,7 +5242,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4968 "configure"' > conftest.$ac_ext + echo '#line 5245 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5089,11 +5366,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 @@ -5102,7 +5395,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' @@ -5182,10 +5475,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 @@ -5361,10 +5671,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 @@ -5427,10 +5754,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 @@ -5466,10 +5810,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 @@ -5586,10 +5937,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 @@ -5623,10 +5981,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 @@ -5691,10 +6056,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 @@ -5728,10 +6100,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 @@ -5772,7 +6151,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 @@ -5790,7 +6169,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 @@ -5816,7 +6195,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 @@ -5834,7 +6213,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 @@ -5941,10 +6320,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 @@ -5987,10 +6383,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 @@ -6445,7 +6858,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 @@ -6485,7 +6898,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 @@ -6541,7 +6954,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 @@ -6581,7 +6994,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 @@ -6637,7 +7050,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 @@ -6677,7 +7090,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 @@ -6994,11 +7407,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:6997: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7410: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7001: \$? = $ac_status" >&5 + echo "$as_me:7414: \$? = $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. @@ -7262,11 +7675,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:7265: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7678: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7269: \$? = $ac_status" >&5 + echo "$as_me:7682: \$? = $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. @@ -7366,11 +7779,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:7369: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7782: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7373: \$? = $ac_status" >&5 + echo "$as_me:7786: \$? = $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 @@ -7846,11 +8259,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; } }'` @@ -7864,7 +8293,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 @@ -7905,11 +8334,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; } }'` @@ -7923,7 +8368,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 @@ -9171,11 +9616,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 @@ -9184,7 +9645,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 @@ -9266,11 +9727,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 @@ -9279,7 +9756,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 @@ -9323,17 +9800,33 @@ *) ac_try_echo=$ac_try;; esac eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 + (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=$? - 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 + (exit $ac_status); }; }; then ac_cv_lib_dld_shl_load=yes else echo "$as_me: failed program was:" >&5 @@ -9342,7 +9835,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 @@ -9414,11 +9907,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 @@ -9427,7 +9936,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 @@ -9477,11 +9986,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 @@ -9490,7 +10015,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 @@ -9541,11 +10066,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 @@ -9554,7 +10095,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 @@ -9605,11 +10146,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 @@ -9618,7 +10175,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 @@ -9674,7 +10231,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; } }'` @@ -10879,7 +11452,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 @@ -10921,11 +11494,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; } }'` @@ -10939,7 +11528,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 @@ -12110,11 +12699,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:12113: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12702: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12117: \$? = $ac_status" >&5 + echo "$as_me:12706: \$? = $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. @@ -12214,11 +12803,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:12217: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12806: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12221: \$? = $ac_status" >&5 + echo "$as_me:12810: \$? = $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 @@ -13784,11 +14373,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:13787: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14376: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13791: \$? = $ac_status" >&5 + echo "$as_me:14380: \$? = $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. @@ -13888,11 +14477,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:13891: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14480: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13895: \$? = $ac_status" >&5 + echo "$as_me:14484: \$? = $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 @@ -14358,11 +14947,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; } }'` @@ -14376,7 +14981,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 @@ -14407,11 +15012,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; } }'` @@ -14425,7 +15046,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 @@ -16091,11 +16712,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:16094: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16715: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16098: \$? = $ac_status" >&5 + echo "$as_me:16719: \$? = $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. @@ -16359,11 +16980,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:16362: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16983: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16366: \$? = $ac_status" >&5 + echo "$as_me:16987: \$? = $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. @@ -16463,11 +17084,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:16466: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17087: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16470: \$? = $ac_status" >&5 + echo "$as_me:17091: \$? = $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 @@ -16943,11 +17564,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; } }'` @@ -16961,7 +17598,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 @@ -17002,11 +17639,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; } }'` @@ -17020,7 +17673,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 @@ -19730,10 +20383,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 @@ -19910,10 +20580,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 @@ -19976,11 +20663,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 @@ -19989,7 +20692,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 @@ -20074,11 +20777,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_re_comp=yes else echo "$as_me: failed program was:" >&5 @@ -20087,7 +20806,7 @@ ac_cv_func_re_comp=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_re_comp" >&5 @@ -20275,8 +20994,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=: @@ -20285,13 +21003,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 @@ -20515,28 +21230,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'" @@ -20551,8 +21257,8 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by LLVM-TEST $as_me 2.5svn, which was -generated by GNU Autoconf 2.61. Invocation command line was +This file was extended by LLVM-TEST $as_me 2.6svn, which was +generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -20580,7 +21286,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 @@ -20598,8 +21304,8 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -LLVM-TEST config.status 2.5svn -configured by $0, generated by GNU Autoconf 2.61, +LLVM-TEST config.status 2.6svn +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. @@ -20873,8 +21579,8 @@ CPP!$CPP$ac_delim ifGNUmake!$ifGNUmake$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 From tonic at nondot.org Wed Jan 21 23:30:30 2009 From: tonic at nondot.org (Tanya Lattner) Date: Thu, 22 Jan 2009 05:30:30 -0000 Subject: [llvm-commits] [llvm] r62753 - in /llvm/branches/release_25: autoconf/configure.ac configure include/llvm/Config/config.h.in Message-ID: <200901220530.n0M5UUmG014614@zion.cs.uiuc.edu> Author: tbrethou Date: Wed Jan 21 23:30:29 2009 New Revision: 62753 URL: http://llvm.org/viewvc/llvm-project?rev=62753&view=rev Log: This is the 2.5 release. Modified: llvm/branches/release_25/autoconf/configure.ac llvm/branches/release_25/configure llvm/branches/release_25/include/llvm/Config/config.h.in Modified: llvm/branches/release_25/autoconf/configure.ac URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_25/autoconf/configure.ac?rev=62753&r1=62752&r2=62753&view=diff ============================================================================== --- llvm/branches/release_25/autoconf/configure.ac (original) +++ llvm/branches/release_25/autoconf/configure.ac Wed Jan 21 23:30:29 2009 @@ -31,7 +31,7 @@ dnl===-----------------------------------------------------------------------=== dnl Initialize autoconf and define the package name, version number and dnl email address for reporting bugs. -AC_INIT([[llvm]],[[2.5svn]],[llvmbugs at cs.uiuc.edu]) +AC_INIT([[llvm]],[[2.5]],[llvmbugs at cs.uiuc.edu]) dnl Provide a copyright substitution and ensure the copyright notice is included dnl in the output of --version option of the generated configure script. Modified: llvm/branches/release_25/configure URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_25/configure?rev=62753&r1=62752&r2=62753&view=diff ============================================================================== --- llvm/branches/release_25/configure (original) +++ llvm/branches/release_25/configure Wed Jan 21 23:30:29 2009 @@ -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.5. # # 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'" @@ -730,44 +715,44 @@ # Identity of this package. PACKAGE_NAME='llvm' PACKAGE_TARNAME='-llvm-' -PACKAGE_VERSION='2.5svn' -PACKAGE_STRING='llvm 2.5svn' +PACKAGE_VERSION='2.5' +PACKAGE_STRING='llvm 2.5' PACKAGE_BUGREPORT='llvmbugs at cs.uiuc.edu' ac_unique_file="lib/VMCore/Module.cpp" # 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) @@ -1479,7 +1463,7 @@ # 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 llvm 2.5svn to adapt to many kinds of systems. +\`configure' configures llvm 2.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1545,7 +1529,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of llvm 2.5svn:";; + short | recursive ) echo "Configuration of llvm 2.5:";; esac cat <<\_ACEOF @@ -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 @@ -1681,8 +1664,8 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -llvm configure 2.5svn -generated by GNU Autoconf 2.61 +llvm configure 2.5 +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. @@ -1697,8 +1680,8 @@ This file contains any messages produced by compilers while 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 +It was created by llvm $as_me 2.5, which was +generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -2443,7 +2426,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 @@ -2483,7 +2466,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 @@ -2540,7 +2523,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 @@ -2581,7 +2564,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 @@ -2639,7 +2622,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 @@ -2683,7 +2666,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 @@ -2824,7 +2807,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 @@ -2852,12 +2835,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 @@ -2869,6 +2846,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. @@ -3046,10 +3025,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 @@ -3104,10 +3100,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 @@ -3142,10 +3155,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 @@ -3181,10 +3211,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 @@ -3300,10 +3347,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 @@ -3393,10 +3457,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 @@ -3430,10 +3501,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 @@ -3498,10 +3576,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 @@ -3535,10 +3620,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 @@ -3593,7 +3685,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 @@ -3675,7 +3767,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 @@ -3771,10 +3863,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 @@ -3950,10 +4059,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 @@ -3995,8 +4121,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 @@ -4017,10 +4142,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. */ @@ -4055,10 +4197,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 @@ -4109,10 +4268,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 @@ -4242,7 +4418,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 @@ -4280,7 +4456,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 @@ -4319,7 +4495,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 @@ -4409,7 +4585,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 @@ -4447,7 +4623,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 @@ -4486,7 +4662,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 @@ -4939,10 +5115,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 @@ -4976,10 +5159,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 @@ -5044,10 +5234,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 @@ -5081,10 +5278,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 @@ -5141,7 +5345,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 @@ -5185,7 +5389,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 @@ -5303,10 +5507,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 @@ -5361,10 +5582,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 @@ -5399,10 +5637,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 @@ -5438,10 +5693,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 @@ -5557,10 +5829,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 @@ -5625,7 +5914,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 @@ -5669,7 +5958,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 @@ -5782,10 +6071,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 @@ -5840,10 +6146,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 @@ -5878,10 +6201,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 @@ -5917,10 +6257,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 @@ -5984,7 +6341,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 @@ -6009,70 +6366,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 @@ -6086,46 +6410,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" @@ -6140,22 +6490,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 @@ -6167,7 +6642,6 @@ _ACEOF fi -rm -f conftest.l $LEX_OUTPUT_ROOT.c fi @@ -6206,7 +6680,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 @@ -6353,7 +6827,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 @@ -6394,7 +6868,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 @@ -6435,7 +6909,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 @@ -6476,7 +6950,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 @@ -6517,7 +6991,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 @@ -6558,7 +7032,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 @@ -6599,7 +7073,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 @@ -6639,7 +7113,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 @@ -6679,7 +7153,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 @@ -6736,7 +7210,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 @@ -6777,7 +7251,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 @@ -6818,7 +7292,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 @@ -6859,7 +7333,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 @@ -6901,7 +7375,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 @@ -6957,7 +7431,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 @@ -7015,7 +7489,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 @@ -7074,7 +7548,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 @@ -7132,7 +7606,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 @@ -7216,7 +7690,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. @@ -7279,7 +7753,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 @@ -7319,7 +7793,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 @@ -7359,7 +7833,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 @@ -7399,7 +7873,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 @@ -7439,7 +7913,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 @@ -7479,7 +7953,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 @@ -7519,7 +7993,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 @@ -7592,7 +8066,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 @@ -7649,7 +8123,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 @@ -7691,7 +8165,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 @@ -7736,7 +8210,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 @@ -7781,7 +8255,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 @@ -7826,7 +8300,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 @@ -7871,7 +8345,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 @@ -7938,11 +8412,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 @@ -7951,7 +8441,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 @@ -7994,10 +8484,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}; @@ -8006,11 +8496,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; @@ -8037,7 +8527,7 @@ const int foo = 10; if (!foo) return 0; } - return !cs[0] && !zero.x; + return !x[0] && !zero.x; #endif ; @@ -8057,10 +8547,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 @@ -8125,10 +8632,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 @@ -8201,11 +8725,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 @@ -8214,7 +8754,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 @@ -8285,11 +8825,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 @@ -8298,7 +8854,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 @@ -8361,10 +8917,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 @@ -8400,10 +8973,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 @@ -9497,11 +10077,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 @@ -9510,7 +10106,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 @@ -9564,11 +10160,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 @@ -9577,7 +10189,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 @@ -9633,11 +10245,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 @@ -9646,7 +10274,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 @@ -9691,11 +10319,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 @@ -9747,11 +10391,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 @@ -9760,7 +10420,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 @@ -9816,11 +10476,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 @@ -9829,7 +10505,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 @@ -9906,11 +10582,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 @@ -9919,7 +10611,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 @@ -9941,7 +10633,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 @@ -10024,11 +10716,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 @@ -10037,7 +10745,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'}'` @@ -10124,7 +10832,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 @@ -10392,10 +11117,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 @@ -10500,10 +11232,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 @@ -10603,11 +11352,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 @@ -10616,7 +11381,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'}'` @@ -10696,10 +11461,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 @@ -10735,10 +11517,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 @@ -10844,10 +11633,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 @@ -10883,10 +11689,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 @@ -10990,10 +11803,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 @@ -11029,10 +11859,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 @@ -11165,11 +12002,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 @@ -11178,7 +12031,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'}'` @@ -11260,11 +12113,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 @@ -11273,7 +12142,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'}'` @@ -11355,11 +12224,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 @@ -11368,7 +12253,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'}'` @@ -11450,21 +12335,37 @@ 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 - - eval "$as_ac_var=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext + (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$ac_exeext conftest.$ac_ext fi ac_res=`eval echo '${'$as_ac_var'}'` { echo "$as_me:$LINENO: result: $ac_res" >&5 @@ -11546,11 +12447,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 @@ -11559,7 +12476,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'}'` @@ -12059,7 +12976,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 12062 "configure"' > conftest.$ac_ext + echo '#line 12979 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -12183,11 +13100,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 @@ -12196,7 +13129,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' @@ -12291,10 +13224,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 @@ -12328,10 +13268,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 @@ -12396,10 +13343,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 @@ -12433,10 +13387,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 @@ -12477,7 +13438,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 @@ -12495,7 +13456,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 @@ -12521,7 +13482,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 @@ -12539,7 +13500,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 @@ -12646,10 +13607,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 @@ -12692,10 +13670,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 @@ -13150,7 +14145,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 @@ -13190,7 +14185,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 @@ -13246,7 +14241,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 @@ -13286,7 +14281,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 @@ -13342,7 +14337,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 @@ -13382,7 +14377,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 @@ -13699,11 +14694,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:13702: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14697: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13706: \$? = $ac_status" >&5 + echo "$as_me:14701: \$? = $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. @@ -13967,11 +14962,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:13970: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14965: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13974: \$? = $ac_status" >&5 + echo "$as_me:14969: \$? = $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. @@ -14071,11 +15066,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:14074: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15069: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14078: \$? = $ac_status" >&5 + echo "$as_me:15073: \$? = $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 @@ -14551,11 +15546,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; } }'` @@ -14569,7 +15580,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 @@ -14610,11 +15621,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; } }'` @@ -14628,7 +15655,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 @@ -15876,11 +16903,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 @@ -15889,7 +16932,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 @@ -15971,11 +17014,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 @@ -15984,7 +17043,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 @@ -16034,11 +17093,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 @@ -16047,7 +17122,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 @@ -16119,11 +17194,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 @@ -16132,7 +17223,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 @@ -16182,11 +17273,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 @@ -16195,7 +17302,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 @@ -16246,11 +17353,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 @@ -16259,7 +17382,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 @@ -16310,11 +17433,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 @@ -16323,7 +17462,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 @@ -16379,7 +17518,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; } }'` @@ -17584,7 +18739,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 @@ -17626,11 +18781,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; } }'` @@ -17644,7 +18815,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 @@ -18815,11 +19986,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:18818: $lt_compile\"" >&5) + (eval echo "\"\$as_me:19989: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:18822: \$? = $ac_status" >&5 + echo "$as_me:19993: \$? = $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. @@ -18919,11 +20090,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:18922: $lt_compile\"" >&5) + (eval echo "\"\$as_me:20093: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:18926: \$? = $ac_status" >&5 + echo "$as_me:20097: \$? = $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 @@ -20489,11 +21660,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:20492: $lt_compile\"" >&5) + (eval echo "\"\$as_me:21663: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:20496: \$? = $ac_status" >&5 + echo "$as_me:21667: \$? = $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. @@ -20593,11 +21764,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:20596: $lt_compile\"" >&5) + (eval echo "\"\$as_me:21767: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:20600: \$? = $ac_status" >&5 + echo "$as_me:21771: \$? = $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 @@ -21063,11 +22234,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; } }'` @@ -21081,7 +22268,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 @@ -21112,11 +22299,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; } }'` @@ -21130,7 +22333,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 @@ -22796,11 +23999,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:22799: $lt_compile\"" >&5) + (eval echo "\"\$as_me:24002: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:22803: \$? = $ac_status" >&5 + echo "$as_me:24006: \$? = $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. @@ -23064,11 +24267,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:23067: $lt_compile\"" >&5) + (eval echo "\"\$as_me:24270: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:23071: \$? = $ac_status" >&5 + echo "$as_me:24274: \$? = $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. @@ -23168,11 +24371,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:23171: $lt_compile\"" >&5) + (eval echo "\"\$as_me:24374: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:23175: \$? = $ac_status" >&5 + echo "$as_me:24378: \$? = $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 @@ -23648,11 +24851,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; } }'` @@ -23666,7 +24885,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 @@ -23707,11 +24926,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; } }'` @@ -23725,7 +24960,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 @@ -25865,7 +27100,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 @@ -25905,7 +27140,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 @@ -25989,10 +27224,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 @@ -26060,11 +27312,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 @@ -26073,7 +27341,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 @@ -26131,11 +27399,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 @@ -26144,7 +27428,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 @@ -26197,11 +27481,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 @@ -26210,7 +27510,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 @@ -26262,11 +27562,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 @@ -26275,7 +27591,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 @@ -26340,11 +27656,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 @@ -26353,7 +27685,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 @@ -26431,11 +27763,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_ffi_call=$ac_res else echo "$as_me: failed program was:" >&5 @@ -26444,7 +27792,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_ffi_call+set}" = set; then break @@ -26522,11 +27870,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 @@ -26535,7 +27899,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 @@ -26606,23 +27970,39 @@ 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_pthread_pthread_mutex_init=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_pthread_pthread_mutex_init=no -fi - -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 + (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 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_pthread_pthread_mutex_init=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_pthread_pthread_mutex_init" >&5 echo "${ECHO_T}$ac_cv_lib_pthread_pthread_mutex_init" >&6; } if test $ac_cv_lib_pthread_pthread_mutex_init = yes; then @@ -26682,11 +28062,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_pthread_mutex_lock=$ac_res else echo "$as_me: failed program was:" >&5 @@ -26695,7 +28091,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_pthread_mutex_lock+set}" = set; then break @@ -26776,11 +28172,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 @@ -26789,7 +28201,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 @@ -26866,10 +28278,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 @@ -26942,11 +28371,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 @@ -26955,7 +28400,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 @@ -27026,11 +28471,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 @@ -27039,7 +28500,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 @@ -27104,10 +28565,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 @@ -27150,48 +28628,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; } @@ -27240,10 +28708,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 @@ -27420,10 +28905,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 @@ -27481,10 +28983,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 @@ -27550,10 +29069,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 @@ -27589,10 +29125,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 @@ -27700,10 +29243,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 @@ -27739,10 +29299,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 @@ -27845,10 +29412,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 @@ -27884,10 +29468,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 @@ -27993,10 +29584,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 @@ -28032,10 +29640,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 @@ -28140,10 +29755,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 @@ -28179,10 +29811,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 @@ -28286,10 +29925,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 @@ -28325,10 +29981,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 @@ -28435,10 +30098,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 @@ -28474,10 +30154,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 @@ -28574,10 +30261,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 @@ -28613,10 +30317,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 @@ -28682,7 +30393,6 @@ - { echo "$as_me:$LINENO: checking for HUGE_VAL sanity" >&5 echo $ECHO_N "checking for HUGE_VAL sanity... $ECHO_C" >&6; } if test "${ac_cv_huge_val_sanity+set}" = set; then @@ -28797,10 +30507,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 @@ -28860,10 +30587,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 @@ -28921,10 +30665,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 @@ -28960,9 +30721,7 @@ int main () { -struct tm tm; - int *p = &tm.tm_sec; - return !p; +struct tm *tp; tp->tm_sec; ; return 0; } @@ -28980,10 +30739,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 @@ -29041,10 +30817,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 @@ -29107,10 +30900,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 @@ -29168,10 +30978,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 @@ -29274,11 +31101,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 @@ -29287,7 +31130,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'}'` @@ -29371,11 +31214,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 @@ -29384,7 +31243,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'}'` @@ -29469,11 +31328,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 @@ -29482,7 +31357,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'}'` @@ -29565,11 +31440,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 @@ -29578,7 +31469,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'}'` @@ -29665,11 +31556,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 @@ -29678,7 +31585,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'}'` @@ -29762,11 +31669,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 @@ -29775,7 +31698,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'}'` @@ -29859,11 +31782,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 @@ -29872,7 +31811,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'}'` @@ -30016,11 +31955,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 @@ -30029,7 +31984,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 @@ -30060,7 +32015,7 @@ # include # define alloca _alloca # else -# ifdef HAVE_ALLOCA_H +# if HAVE_ALLOCA_H # include # else # ifdef _AIX @@ -30096,11 +32051,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 @@ -30109,7 +32080,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 @@ -30229,11 +32200,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 @@ -30242,7 +32229,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'}'` @@ -30379,10 +32366,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 @@ -30450,10 +32454,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 @@ -30524,10 +32545,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 @@ -30604,10 +32642,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 @@ -30681,10 +32736,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 @@ -30761,10 +32833,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 @@ -30841,10 +32930,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 @@ -30918,10 +33024,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 @@ -30998,10 +33121,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 @@ -31079,10 +33219,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 @@ -31160,10 +33317,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 @@ -31238,10 +33412,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 @@ -31309,10 +33500,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 @@ -31379,10 +33587,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 @@ -31450,10 +33675,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 @@ -31520,10 +33762,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 @@ -31590,10 +33849,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 @@ -31660,10 +33936,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 @@ -31734,10 +34027,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 @@ -31773,10 +34083,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 @@ -31907,11 +34224,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 @@ -31920,7 +34253,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'}'` @@ -31977,21 +34310,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 @@ -32314,11 +34647,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 @@ -32327,7 +34676,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'}'` @@ -32577,10 +34926,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 @@ -32810,8 +35176,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=: @@ -32820,13 +35185,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 @@ -33050,28 +35412,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'" @@ -33086,8 +35439,8 @@ # report actual input values of CONFIG_FILES etc. instead of their # 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 +This file was extended by llvm $as_me 2.5, which was +generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -33116,7 +35469,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 @@ -33139,8 +35492,8 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -llvm config.status 2.5svn -configured by $0, generated by GNU Autoconf 2.61, +llvm config.status 2.5 +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. @@ -33427,8 +35780,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 @@ -34066,12 +36419,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 Modified: llvm/branches/release_25/include/llvm/Config/config.h.in URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_25/include/llvm/Config/config.h.in?rev=62753&r1=62752&r2=62753&view=diff ============================================================================== --- llvm/branches/release_25/include/llvm/Config/config.h.in (original) +++ llvm/branches/release_25/include/llvm/Config/config.h.in Wed Jan 21 23:30:29 2009 @@ -20,6 +20,9 @@ /* Define if threads enabled */ #undef ENABLE_THREADS +/* Path to ffi.h */ +#undef FFI_HEADER + /* Define to 1 if you have `alloca', as a function or macro. */ #undef HAVE_ALLOCA @@ -184,6 +187,9 @@ /* Define to 1 if you have the `elf' library (-lelf). */ #undef HAVE_LIBELF +/* Define to 1 if you have the libffi library (-lffi). */ +#undef HAVE_LIBFFI + /* Define to 1 if you have the `imagehlp' library (-limagehlp). */ #undef HAVE_LIBIMAGEHLP From tonic at nondot.org Wed Jan 21 23:43:30 2009 From: tonic at nondot.org (Tanya Lattner) Date: Thu, 22 Jan 2009 05:43:30 -0000 Subject: [llvm-commits] [test-suite] r62754 - in /test-suite/branches/release_25: autoconf/configure.ac configure Message-ID: <200901220543.n0M5hVKB015431@zion.cs.uiuc.edu> Author: tbrethou Date: Wed Jan 21 23:43:25 2009 New Revision: 62754 URL: http://llvm.org/viewvc/llvm-project?rev=62754&view=rev Log: This is the 2.5 release. Modified: test-suite/branches/release_25/autoconf/configure.ac test-suite/branches/release_25/configure Modified: test-suite/branches/release_25/autoconf/configure.ac URL: http://llvm.org/viewvc/llvm-project/test-suite/branches/release_25/autoconf/configure.ac?rev=62754&r1=62753&r2=62754&view=diff ============================================================================== --- test-suite/branches/release_25/autoconf/configure.ac (original) +++ test-suite/branches/release_25/autoconf/configure.ac Wed Jan 21 23:43:25 2009 @@ -1,5 +1,5 @@ dnl Initialize autoconf -AC_INIT([[LLVM-TEST]],[[2.5svn]],[llvmbugs at cs.uiuc.edu]) +AC_INIT([[LLVM-TEST]],[[2.5]],[llvmbugs at cs.uiuc.edu]) dnl Place all of the extra autoconf files into the config subdirectory AC_CONFIG_AUX_DIR([autoconf]) Modified: test-suite/branches/release_25/configure URL: http://llvm.org/viewvc/llvm-project/test-suite/branches/release_25/configure?rev=62754&r1=62753&r2=62754&view=diff ============================================================================== --- test-suite/branches/release_25/configure (original) +++ test-suite/branches/release_25/configure Wed Jan 21 23:43:25 2009 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for LLVM-TEST 2.5svn. +# Generated by GNU Autoconf 2.60 for LLVM-TEST 2.5. # # Report bugs to . # @@ -12,8 +12,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=: @@ -22,13 +21,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 @@ -221,7 +217,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=. @@ -239,6 +235,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=: @@ -247,12 +244,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 @@ -260,6 +255,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=: @@ -268,12 +264,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 () { @@ -520,28 +514,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'" @@ -728,44 +713,44 @@ # Identity of this package. PACKAGE_NAME='LLVM-TEST' PACKAGE_TARNAME='-llvm-test-' -PACKAGE_VERSION='2.5svn' -PACKAGE_STRING='LLVM-TEST 2.5svn' +PACKAGE_VERSION='2.5' +PACKAGE_STRING='LLVM-TEST 2.5' PACKAGE_BUGREPORT='llvmbugs at cs.uiuc.edu' ac_unique_file="SingleSource/Benchmarks/Makefile" # 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" @@ -843,8 +828,8 @@ CPP ifGNUmake LEX -LEX_OUTPUT_ROOT LEXLIB +LEX_OUTPUT_ROOT FLEX YACC YFLAGS @@ -892,7 +877,6 @@ CXX CXXFLAGS LDFLAGS -LIBS CPPFLAGS CCC CC @@ -1008,10 +992,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) @@ -1027,10 +1011,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 \ @@ -1224,19 +1208,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) @@ -1405,7 +1389,7 @@ # 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 LLVM-TEST 2.5svn to adapt to many kinds of systems. +\`configure' configures LLVM-TEST 2.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1470,7 +1454,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of LLVM-TEST 2.5svn:";; + short | recursive ) echo "Configuration of LLVM-TEST 2.5:";; esac cat <<\_ACEOF @@ -1514,7 +1498,6 @@ CXXFLAGS 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 CC C compiler command @@ -1593,8 +1576,8 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -LLVM-TEST configure 2.5svn -generated by GNU Autoconf 2.61 +LLVM-TEST configure 2.5 +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. @@ -1607,8 +1590,8 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by LLVM-TEST $as_me 2.5svn, which was -generated by GNU Autoconf 2.61. Invocation command line was +It was created by LLVM-TEST $as_me 2.5, which was +generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -2565,7 +2548,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 @@ -2609,7 +2592,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 @@ -2743,7 +2726,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 @@ -2771,12 +2754,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 @@ -2788,6 +2765,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. @@ -2965,10 +2944,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 @@ -3023,10 +3019,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 @@ -3061,10 +3074,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 @@ -3100,10 +3130,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 @@ -3168,7 +3215,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 @@ -3212,7 +3259,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 @@ -3330,10 +3377,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 @@ -3388,10 +3452,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 @@ -3426,10 +3507,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 @@ -3465,10 +3563,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 @@ -3584,10 +3699,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 @@ -3676,10 +3808,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 @@ -3713,10 +3852,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 @@ -3781,10 +3927,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 @@ -3818,10 +3971,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 @@ -3912,7 +4072,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 @@ -3937,108 +4097,209 @@ 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" +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 "$LEX conftest.l") 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); } -{ 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 + (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$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +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 $ECHO_N "(cached) $ECHO_C" >&6 else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ll $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -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 +/* 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" +case "(($ac_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_lib_l_yywrap=yes 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; }; } + 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 -{ 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 +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 - - 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` + # 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 -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 + (eval "$LEX conftest.l") 2>&5 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 - ac_cv_lib_lex=$ac_lib + (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: 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 conftest.$ac_ext - test "$ac_cv_lib_lex" != 'none needed' && break - done - LIBS=$ac_save_LIBS - + { { 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 -{ 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_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; } @@ -4046,13 +4307,13 @@ 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 +# 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="$LEXLIB $ac_save_LIBS" +LIBS="$LIBS $LEXLIB" cat >conftest.$ac_ext <<_ACEOF -#define YYTEXT_POINTER 1 `cat $LEX_OUTPUT_ROOT.c` _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext @@ -4068,11 +4329,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_prog_lex_yytext_pointer=yes else echo "$as_me: failed program was:" >&5 @@ -4081,9 +4358,10 @@ 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 +rm -f "${LEX_OUTPUT_ROOT}.c" fi { echo "$as_me:$LINENO: result: $ac_cv_prog_lex_yytext_pointer" >&5 @@ -4095,7 +4373,6 @@ _ACEOF fi -rm -f conftest.l $LEX_OUTPUT_ROOT.c fi @@ -4134,7 +4411,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 @@ -4403,7 +4680,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 @@ -4485,7 +4762,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 @@ -4965,7 +5242,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4968 "configure"' > conftest.$ac_ext + echo '#line 5245 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5089,11 +5366,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 @@ -5102,7 +5395,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' @@ -5182,10 +5475,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 @@ -5361,10 +5671,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 @@ -5427,10 +5754,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 @@ -5466,10 +5810,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 @@ -5586,10 +5937,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 @@ -5623,10 +5981,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 @@ -5691,10 +6056,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 @@ -5728,10 +6100,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 @@ -5772,7 +6151,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 @@ -5790,7 +6169,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 @@ -5816,7 +6195,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 @@ -5834,7 +6213,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 @@ -5941,10 +6320,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 @@ -5987,10 +6383,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 @@ -6445,7 +6858,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 @@ -6485,7 +6898,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 @@ -6541,7 +6954,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 @@ -6581,7 +6994,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 @@ -6637,7 +7050,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 @@ -6677,7 +7090,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 @@ -6994,11 +7407,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:6997: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7410: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7001: \$? = $ac_status" >&5 + echo "$as_me:7414: \$? = $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. @@ -7262,11 +7675,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:7265: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7678: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7269: \$? = $ac_status" >&5 + echo "$as_me:7682: \$? = $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. @@ -7366,11 +7779,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:7369: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7782: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7373: \$? = $ac_status" >&5 + echo "$as_me:7786: \$? = $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 @@ -7846,11 +8259,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; } }'` @@ -7864,7 +8293,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 @@ -7905,11 +8334,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; } }'` @@ -7923,7 +8368,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 @@ -9171,11 +9616,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 @@ -9184,7 +9645,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 @@ -9266,11 +9727,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 @@ -9279,7 +9756,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 @@ -9323,17 +9800,33 @@ *) ac_try_echo=$ac_try;; esac eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 + (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=$? - 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 + (exit $ac_status); }; }; then ac_cv_lib_dld_shl_load=yes else echo "$as_me: failed program was:" >&5 @@ -9342,7 +9835,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 @@ -9414,11 +9907,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 @@ -9427,7 +9936,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 @@ -9477,11 +9986,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 @@ -9490,7 +10015,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 @@ -9541,11 +10066,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 @@ -9554,7 +10095,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 @@ -9605,11 +10146,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 @@ -9618,7 +10175,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 @@ -9674,7 +10231,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; } }'` @@ -10879,7 +11452,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 @@ -10921,11 +11494,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; } }'` @@ -10939,7 +11528,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 @@ -12110,11 +12699,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:12113: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12702: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12117: \$? = $ac_status" >&5 + echo "$as_me:12706: \$? = $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. @@ -12214,11 +12803,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:12217: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12806: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12221: \$? = $ac_status" >&5 + echo "$as_me:12810: \$? = $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 @@ -13784,11 +14373,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:13787: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14376: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13791: \$? = $ac_status" >&5 + echo "$as_me:14380: \$? = $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. @@ -13888,11 +14477,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:13891: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14480: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13895: \$? = $ac_status" >&5 + echo "$as_me:14484: \$? = $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 @@ -14358,11 +14947,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; } }'` @@ -14376,7 +14981,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 @@ -14407,11 +15012,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; } }'` @@ -14425,7 +15046,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 @@ -16091,11 +16712,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:16094: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16715: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16098: \$? = $ac_status" >&5 + echo "$as_me:16719: \$? = $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. @@ -16359,11 +16980,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:16362: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16983: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16366: \$? = $ac_status" >&5 + echo "$as_me:16987: \$? = $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. @@ -16463,11 +17084,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:16466: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17087: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16470: \$? = $ac_status" >&5 + echo "$as_me:17091: \$? = $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 @@ -16943,11 +17564,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; } }'` @@ -16961,7 +17598,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 @@ -17002,11 +17639,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; } }'` @@ -17020,7 +17673,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 @@ -19730,10 +20383,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 @@ -19910,10 +20580,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 @@ -19976,11 +20663,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 @@ -19989,7 +20692,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 @@ -20074,11 +20777,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_re_comp=yes else echo "$as_me: failed program was:" >&5 @@ -20087,7 +20806,7 @@ ac_cv_func_re_comp=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_re_comp" >&5 @@ -20275,8 +20994,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=: @@ -20285,13 +21003,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 @@ -20515,28 +21230,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'" @@ -20551,8 +21257,8 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by LLVM-TEST $as_me 2.5svn, which was -generated by GNU Autoconf 2.61. Invocation command line was +This file was extended by LLVM-TEST $as_me 2.5, which was +generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -20580,7 +21286,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 @@ -20598,8 +21304,8 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -LLVM-TEST config.status 2.5svn -configured by $0, generated by GNU Autoconf 2.61, +LLVM-TEST config.status 2.5 +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. @@ -20873,8 +21579,8 @@ CPP!$CPP$ac_delim ifGNUmake!$ifGNUmake$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 From sabre at nondot.org Wed Jan 21 23:44:07 2009 From: sabre at nondot.org (Chris Lattner) Date: Wed, 21 Jan 2009 23:44:07 -0600 Subject: [llvm-commits] CVS: llvm-www/ProjectsWithLLVM/index.html Message-ID: <200901220544.n0M5i7sQ015455@zion.cs.uiuc.edu> Changes in directory llvm-www/ProjectsWithLLVM: index.html updated: 1.44 -> 1.45 --- Log message: Add pure! --- Diffs of the changes: (+32 -0) index.html | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+) Index: llvm-www/ProjectsWithLLVM/index.html diff -u llvm-www/ProjectsWithLLVM/index.html:1.44 llvm-www/ProjectsWithLLVM/index.html:1.45 --- llvm-www/ProjectsWithLLVM/index.html:1.44 Sat Jan 10 22:03:14 2009 +++ llvm-www/ProjectsWithLLVM/index.html Wed Jan 21 23:42:57 2009 @@ -35,6 +35,7 @@
+ + +
+The Pure Programming Language Compiler +
+ +
+Albert Gr??f and his team +
+ +
+

Pure is an +algebraic/functional +programming language based on term rewriting. Programs are collections +of equations which are used to evaluate expressions in a symbolic +fashion. Pure offers dynamic typing, eager and lazy evaluation, lexical +closures, a hygienic macro system (also based on term rewriting), +built-in list and matrix support (including list and matrix +comprehensions) and an easy-to-use C interface. The interpreter uses +LLVM as a backend to JIT-compile Pure programs to fast native code.

+ +

In addition to the usual algebraic data structures, Pure also has +MATLAB-style matrices in order to support numeric computations and +signal processing in an efficient way. Pure is mainly aimed at +mathematical applications right now, but it has been designed as a +general purpose language. The dynamic interpreter environment and the C +interface make it possible to use it as a kind of functional scripting +language for many application areas. +

+
+
LDC Compiler for the D Programming Language From tonic at nondot.org Thu Jan 22 00:52:25 2009 From: tonic at nondot.org (Tanya Lattner) Date: Thu, 22 Jan 2009 06:52:25 -0000 Subject: [llvm-commits] [llvm] r62755 - in /llvm/branches/release_25: docs/LangRef.html lib/AsmParser/LLLexer.cpp Message-ID: <200901220652.n0M6qPml018006@zion.cs.uiuc.edu> Author: tbrethou Date: Thu Jan 22 00:52:25 2009 New Revision: 62755 URL: http://llvm.org/viewvc/llvm-project?rev=62755&view=rev Log: Disable support for vicmp/vfcmp from the LLVM 2.5 release branch, like we did for LLVM 2.4. These are slated to be removed (PR3370) and we don't want to have to be backwards compatible with them in the future. Modified: llvm/branches/release_25/docs/LangRef.html llvm/branches/release_25/lib/AsmParser/LLLexer.cpp Modified: llvm/branches/release_25/docs/LangRef.html URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_25/docs/LangRef.html?rev=62755&r1=62754&r2=62755&view=diff ============================================================================== --- llvm/branches/release_25/docs/LangRef.html (original) +++ llvm/branches/release_25/docs/LangRef.html Thu Jan 22 00:52:25 2009 @@ -149,8 +149,6 @@
  1. 'icmp' Instruction
  2. 'fcmp' Instruction
    3. -
  3. 'vicmp' Instruction
    4. -
  4. 'vfcmp' Instruction
  5. 'phi' Instruction
  6. 'select' Instruction
  7. 'call' Instruction
    8. @@ -1868,12 +1866,6 @@
    fcmp COND ( VAL1, VAL2 )
    Performs the fcmp operation on constants.
    -
    vicmp COND ( VAL1, VAL2 )
    -
    Performs the vicmp operation on constants.
    - -
    vfcmp COND ( VAL1, VAL2 )
    -
    Performs the vfcmp operation on constants.
    -
    extractelement ( VAL, IDX )
    Perform the extractelement @@ -4175,109 +4167,6 @@
    - 'vicmp' Instruction -
    -
    -
    Syntax:
    -
      <result> = vicmp <cond> <ty> <op1>, <op2>   ; yields {ty}:result
-
    -
    Overview:
    -

    The 'vicmp' instruction returns an integer vector value based on -element-wise comparison of its two integer vector operands.

    -
    Arguments:
    -

    The 'vicmp' instruction takes three operands. The first operand is -the condition code indicating the kind of comparison to perform. It is not -a value, just a keyword. The possible condition code are:

    -
      -
    1. eq: equal
      2. -
    2. ne: not equal
      3. -
    3. ugt: unsigned greater than
      4. -
    4. uge: unsigned greater or equal
      5. -
    5. ult: unsigned less than
      6. -
    6. ule: unsigned less or equal
      7. -
    7. sgt: signed greater than
      8. -
    8. sge: signed greater or equal
      9. -
    9. slt: signed less than
      10. -
    10. sle: signed less or equal
      11. -
    -

    The remaining two arguments must be vector or -integer typed. They must also be identical types.

    -
    Semantics:
    -

    The 'vicmp' instruction compares op1 and op2 -according to the condition code given as cond. The comparison yields a -vector of integer result, of -identical type as the values being compared. The most significant bit in each -element is 1 if the element-wise comparison evaluates to true, and is 0 -otherwise. All other bits of the result are undefined. The condition codes -are evaluated identically to the 'icmp' -instruction.

    - -
    Example:
    -
    -  <result> = vicmp eq <2 x i32> < i32 4, i32 0>, < i32 5, i32 0>   ; yields: result=<2 x i32> < i32 0, i32 -1 >
-  <result> = vicmp ult <2 x i8 > < i8 1, i8 2>, < i8 2, i8 2 >        ; yields: result=<2 x i8> < i8 -1, i8 0 >
-
    -
    - - -
    - 'vfcmp' Instruction -
    -
    -
    Syntax:
    -
      <result> = vfcmp <cond> <ty> <op1>, <op2>
    -
    Overview:
    -

    The 'vfcmp' instruction returns an integer vector value based on -element-wise comparison of its two floating point vector operands. The output -elements have the same width as the input elements.

    -
    Arguments:
    -

    The 'vfcmp' instruction takes three operands. The first operand is -the condition code indicating the kind of comparison to perform. It is not -a value, just a keyword. The possible condition code are:

    -
      -
    1. false: no comparison, always returns false
      2. -
    2. oeq: ordered and equal
      3. -
    3. ogt: ordered and greater than
      4. -
    4. oge: ordered and greater than or equal
      5. -
    5. olt: ordered and less than
      6. -
    6. ole: ordered and less than or equal
      7. -
    7. one: ordered and not equal
      8. -
    8. ord: ordered (no nans)
      9. -
    9. ueq: unordered or equal
      10. -
    10. ugt: unordered or greater than
      11. -
    11. uge: unordered or greater than or equal
      12. -
    12. ult: unordered or less than
      13. -
    13. ule: unordered or less than or equal
      14. -
    14. une: unordered or not equal
      15. -
    15. uno: unordered (either nans)
      16. -
    16. true: no comparison, always returns true
      17. -
    -

    The remaining two arguments must be vector of -floating point typed. They must also be identical -types.

    -
    Semantics:
    -

    The 'vfcmp' instruction compares op1 and op2 -according to the condition code given as cond. The comparison yields a -vector of integer result, with -an identical number of elements as the values being compared, and each element -having identical with to the width of the floating point elements. The most -significant bit in each element is 1 if the element-wise comparison evaluates to -true, and is 0 otherwise. All other bits of the result are undefined. The -condition codes are evaluated identically to the -'fcmp' instruction.

    - -
    Example:
    -
    -  ; yields: result=<2 x i32> < i32 0, i32 -1 >
-  <result> = vfcmp oeq <2 x float> < float 4, float 0 >, < float 5, float 0 >
-  
-  ; yields: result=<2 x i64> < i64 -1, i64 0 >
-  <result> = vfcmp ult <2 x double> < double 1, double 2 >, < double 2, double 2>
-
    -
    - - -
    'phi' Instruction
    Modified: llvm/branches/release_25/lib/AsmParser/LLLexer.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_25/lib/AsmParser/LLLexer.cpp?rev=62755&r1=62754&r2=62755&view=diff ============================================================================== --- llvm/branches/release_25/lib/AsmParser/LLLexer.cpp (original) +++ llvm/branches/release_25/lib/AsmParser/LLLexer.cpp Thu Jan 22 00:52:25 2009 @@ -560,7 +560,6 @@ INSTKEYWORD(shl, Shl); INSTKEYWORD(lshr, LShr); INSTKEYWORD(ashr, AShr); INSTKEYWORD(and, And); INSTKEYWORD(or, Or); INSTKEYWORD(xor, Xor); INSTKEYWORD(icmp, ICmp); INSTKEYWORD(fcmp, FCmp); - INSTKEYWORD(vicmp, VICmp); INSTKEYWORD(vfcmp, VFCmp); INSTKEYWORD(phi, PHI); INSTKEYWORD(call, Call); From tonic at nondot.org Thu Jan 22 00:54:13 2009 From: tonic at nondot.org (Tanya Lattner) Date: Thu, 22 Jan 2009 06:54:13 -0000 Subject: [llvm-commits] [llvm] r62756 - in /llvm/branches/release_25/test: Assembler/vector-cmp.ll CodeGen/X86/2008-07-23-VSetCC.ll CodeGen/X86/vfcmp.ll Transforms/ConstProp/2008-07-07-VectorCompare.ll Message-ID: <200901220654.n0M6sEPw018079@zion.cs.uiuc.edu> Author: tbrethou Date: Thu Jan 22 00:54:13 2009 New Revision: 62756 URL: http://llvm.org/viewvc/llvm-project?rev=62756&view=rev Log: Disable support for vicmp/vfcmp from the LLVM 2.5 release branch, like we did for LLVM 2.4. These are slated to be removed (PR3370) and we don't want to have to be backwards compatible with them in the future. Remove tests. Removed: llvm/branches/release_25/test/Assembler/vector-cmp.ll llvm/branches/release_25/test/CodeGen/X86/2008-07-23-VSetCC.ll llvm/branches/release_25/test/CodeGen/X86/vfcmp.ll llvm/branches/release_25/test/Transforms/ConstProp/2008-07-07-VectorCompare.ll Removed: llvm/branches/release_25/test/Assembler/vector-cmp.ll URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_25/test/Assembler/vector-cmp.ll?rev=62755&view=auto ============================================================================== --- llvm/branches/release_25/test/Assembler/vector-cmp.ll (original) +++ llvm/branches/release_25/test/Assembler/vector-cmp.ll (removed) @@ -1,16 +0,0 @@ -; RUN: llvm-as < %s | llvm-dis | llvm-as | llvm-dis | grep {global.*vicmp slt} -; PR2317 -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:128:128" -target triple = "i686-apple-darwin9.2.2" - -define <4 x i32> @foo(<4 x float> %a, <4 x float> %b) nounwind { -entry: - %cmp = vfcmp olt <4 x float> %a, %b ; <4 x i32> [#uses=1] - ret <4 x i32> %cmp -} - -global <4 x i32> vicmp slt ( <4 x i32> , <4 x i32> ) ; - - at B = external global i32; - -global <4 x i32> vicmp slt ( <4 x i32> , <4 x i32> ) ; Removed: llvm/branches/release_25/test/CodeGen/X86/2008-07-23-VSetCC.ll URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_25/test/CodeGen/X86/2008-07-23-VSetCC.ll?rev=62755&view=auto ============================================================================== --- llvm/branches/release_25/test/CodeGen/X86/2008-07-23-VSetCC.ll (original) +++ llvm/branches/release_25/test/CodeGen/X86/2008-07-23-VSetCC.ll (removed) @@ -1,30 +0,0 @@ -; RUN: llvm-as < %s | llc -march=x86 -mcpu=pentium -; PR2575 - -define void @entry(i32 %m_task_id, i32 %start_x, i32 %end_x) nounwind { - br i1 false, label %bb.nph, label %._crit_edge - -bb.nph: ; preds = %bb.nph, %0 - vicmp sgt <4 x i32> zeroinitializer, < i32 -128, i32 -128, i32 -128, i32 -128 > ; <<4 x i32>>:1 [#uses=1] - extractelement <4 x i32> %1, i32 3 ; :2 [#uses=1] - lshr i32 %2, 31 ; :3 [#uses=1] - trunc i32 %3 to i1 ; :4 [#uses=1] - select i1 %4, i32 -1, i32 0 ; :5 [#uses=1] - insertelement <4 x i32> zeroinitializer, i32 %5, i32 3 ; <<4 x i32>>:6 [#uses=1] - and <4 x i32> zeroinitializer, %6 ; <<4 x i32>>:7 [#uses=1] - bitcast <4 x i32> %7 to <4 x float> ; <<4 x float>>:8 [#uses=1] - mul <4 x float> zeroinitializer, %8 ; <<4 x float>>:9 [#uses=1] - bitcast <4 x float> %9 to <4 x i32> ; <<4 x i32>>:10 [#uses=1] - or <4 x i32> %10, zeroinitializer ; <<4 x i32>>:11 [#uses=1] - bitcast <4 x i32> %11 to <4 x float> ; <<4 x float>>:12 [#uses=1] - mul <4 x float> %12, < float 1.000000e+02, float 1.000000e+02, float 1.000000e+02, float 1.000000e+02 > ; <<4 x float>>:13 [#uses=1] - sub <4 x float> %13, < float 1.000000e+02, float 1.000000e+02, float 1.000000e+02, float 1.000000e+02 > ; <<4 x float>>:14 [#uses=1] - extractelement <4 x float> %14, i32 3 ; :15 [#uses=1] - call float @fmaxf( float 0.000000e+00, float %15 ) ; :16 [#uses=0] - br label %bb.nph - -._crit_edge: ; preds = %0 - ret void -} - -declare float @fmaxf(float, float) Removed: llvm/branches/release_25/test/CodeGen/X86/vfcmp.ll URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_25/test/CodeGen/X86/vfcmp.ll?rev=62755&view=auto ============================================================================== --- llvm/branches/release_25/test/CodeGen/X86/vfcmp.ll (original) +++ llvm/branches/release_25/test/CodeGen/X86/vfcmp.ll (removed) @@ -1,13 +0,0 @@ -; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 -; PR2620 - -define void @t(i32 %m_task_id, i32 %start_x, i32 %end_x) nounwind { - vfcmp olt <2 x double> zeroinitializer, zeroinitializer ; <<2 x i64>>:1 [#uses=1] - extractelement <2 x i64> %1, i32 1 ; :2 [#uses=1] - lshr i64 %2, 63 ; :3 [#uses=1] - trunc i64 %3 to i1 ; :4 [#uses=1] - zext i1 %4 to i8 ; :5 [#uses=1] - insertelement <2 x i8> zeroinitializer, i8 %5, i32 1 ; <<2 x i8>>:6 [#uses=1] - store <2 x i8> %6, <2 x i8>* null - ret void -} Removed: llvm/branches/release_25/test/Transforms/ConstProp/2008-07-07-VectorCompare.ll URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_25/test/Transforms/ConstProp/2008-07-07-VectorCompare.ll?rev=62755&view=auto ============================================================================== --- llvm/branches/release_25/test/Transforms/ConstProp/2008-07-07-VectorCompare.ll (original) +++ llvm/branches/release_25/test/Transforms/ConstProp/2008-07-07-VectorCompare.ll (removed) @@ -1,28 +0,0 @@ -; RUN: llvm-as < %s | opt -constprop -disable-output -; PR2529 -define <4 x i32> @test1(i32 %argc, i8** %argv) { -entry: - %foo = vicmp slt <4 x i32> undef, - ret <4 x i32> %foo -} - -define <4 x i32> @test2(i32 %argc, i8** %argv) { -entry: - %foo = vicmp slt <4 x i32> , - ret <4 x i32> %foo -} - - -define <4 x i32> @test3() { - %foo = vfcmp ueq <4 x float> , - ret <4 x i32> %foo -} - -define <4 x i32> @test4() { - %foo = vfcmp ueq <4 x float> , - - ret <4 x i32> %foo -} - From sabre at nondot.org Thu Jan 22 01:04:01 2009 From: sabre at nondot.org (Chris Lattner) Date: Thu, 22 Jan 2009 07:04:01 -0000 Subject: [llvm-commits] [llvm] r62757 - in /llvm/trunk: lib/Analysis/MemoryDependenceAnalysis.cpp test/Transforms/GVN/2009-01-21-SortInvalidation.ll Message-ID: <200901220704.n0M742rX018385@zion.cs.uiuc.edu> Author: lattner Date: Thu Jan 22 01:04:01 2009 New Revision: 62757 URL: http://llvm.org/viewvc/llvm-project?rev=62757&view=rev Log: Fix PR3358, a really nasty bug where recursive phi translated analyses could be run without the caches properly sorted. This can fix all sorts of weirdness. Many thanks to Bill for coming up with the 'issorted' verification idea. Added: llvm/trunk/test/Transforms/GVN/2009-01-21-SortInvalidation.ll Modified: llvm/trunk/lib/Analysis/MemoryDependenceAnalysis.cpp Modified: llvm/trunk/lib/Analysis/MemoryDependenceAnalysis.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/MemoryDependenceAnalysis.cpp?rev=62757&r1=62756&r2=62757&view=diff ============================================================================== --- llvm/trunk/lib/Analysis/MemoryDependenceAnalysis.cpp (original) +++ llvm/trunk/lib/Analysis/MemoryDependenceAnalysis.cpp Thu Jan 22 01:04:01 2009 @@ -326,6 +326,19 @@ return LocalCache; } +#ifndef NDEBUG +/// AssertSorted - This method is used when -debug is specified to verify that +/// cache arrays are properly kept sorted. +static void AssertSorted(MemoryDependenceAnalysis::NonLocalDepInfo &Cache, + int Count = -1) { + if (Count == -1) Count = Cache.size(); + if (Count == 0) return; + + for (unsigned i = 1; i != unsigned(Count); ++i) + assert(Cache[i-1] <= Cache[i] && "Cache isn't sorted!"); +} +#endif + /// getNonLocalCallDependency - Perform a full dependency query for the /// specified call, returning the set of blocks that the value is /// potentially live across. The returned set of results will include a @@ -386,6 +399,7 @@ SmallPtrSet Visited; unsigned NumSortedEntries = Cache.size(); + DEBUG(AssertSorted(Cache)); // Iterate while we still have blocks to update. while (!DirtyBlocks.empty()) { @@ -398,6 +412,7 @@ // Do a binary search to see if we already have an entry for this block in // the cache set. If so, find it. + DEBUG(AssertSorted(Cache, NumSortedEntries)); NonLocalDepInfo::iterator Entry = std::upper_bound(Cache.begin(), Cache.begin()+NumSortedEntries, std::make_pair(DirtyBB, MemDepResult())); @@ -647,6 +662,7 @@ // won't get any reuse from currently inserted values, because we don't // revisit blocks after we insert info for them. unsigned NumSortedEntries = Cache->size(); + DEBUG(AssertSorted(*Cache)); while (!Worklist.empty()) { BasicBlock *BB = Worklist.pop_back_val(); @@ -659,6 +675,7 @@ // Get the dependency info for Pointer in BB. If we have cached // information, we will use it, otherwise we compute it. + DEBUG(AssertSorted(*Cache, NumSortedEntries)); MemDepResult Dep = GetNonLocalInfoForBlock(Pointer, PointeeSize, isLoad, BB, Cache, NumSortedEntries); @@ -705,7 +722,7 @@ // If this is directly a PHI node, just use the incoming values for each // pred as the phi translated version. if (PHINode *PtrPHI = dyn_cast(PtrInst)) { - for (BasicBlock **PI = PredCache->GetPreds(BB); *PI; ++PI){ + for (BasicBlock **PI = PredCache->GetPreds(BB); *PI; ++PI) { BasicBlock *Pred = *PI; Value *PredPtr = PtrPHI->getIncomingValueForBlock(Pred); @@ -728,6 +745,21 @@ // treat this as a phi translation failure. goto PredTranslationFailure; } + + // We may have added values to the cache list before this PHI + // translation. If so, we haven't done anything to ensure that the + // cache remains sorted. Sort it now (if needed) so that recursive + // invocations of getNonLocalPointerDepFromBB that could reuse the cache + // value will only see properly sorted cache arrays. + if (NumSortedEntries != Cache->size()) { + std::sort(Cache->begin(), Cache->end()); + NumSortedEntries = Cache->size(); + } + + // FIXME: it is entirely possible that PHI translating will end up with + // the same value. Consider PHI translating something like: + // X = phi [x, bb1], [y, bb2]. PHI translating for bb1 doesn't *need* + // to recurse here, pedantically speaking. // If we have a problem phi translating, fall through to the code below // to handle the failure condition. @@ -739,7 +771,8 @@ // Refresh the CacheInfo/Cache pointer so that it isn't invalidated. CacheInfo = &NonLocalPointerDeps[CacheKey]; Cache = &CacheInfo->second; - + NumSortedEntries = Cache->size(); + // Since we did phi translation, the "Cache" set won't contain all of the // results for the query. This is ok (we can still use it to accelerate // specific block queries) but we can't do the fastpath "return all @@ -817,7 +850,7 @@ // Added many values, do a full scale sort. std::sort(Cache->begin(), Cache->end()); } - + DEBUG(AssertSorted(*Cache)); return false; } Added: llvm/trunk/test/Transforms/GVN/2009-01-21-SortInvalidation.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/GVN/2009-01-21-SortInvalidation.ll?rev=62757&view=auto ============================================================================== --- llvm/trunk/test/Transforms/GVN/2009-01-21-SortInvalidation.ll (added) +++ llvm/trunk/test/Transforms/GVN/2009-01-21-SortInvalidation.ll Thu Jan 22 01:04:01 2009 @@ -0,0 +1,55 @@ +; RUN: llvm-as < %s | opt -gvn | llvm-dis +; PR3358 +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" + %struct.re_pattern_buffer = type { i8*, i64, i64, i64, i8*, i8*, i64, i8 } + %struct.re_registers = type { i32, i32*, i32* } + +define fastcc i32 @byte_re_match_2_internal(%struct.re_pattern_buffer* nocapture %bufp, i8* %string1, i32 %size1, i8* %string2, i32 %size2, i32 %pos, %struct.re_registers* %regs, i32 %stop) nounwind { +entry: + br label %bb159 + +succeed_label: ; preds = %bb159 + ret i32 0 + +bb159: ; preds = %bb664, %bb554, %bb159, %bb159, %bb159, %entry + %d.0 = phi i8* [ null, %entry ], [ %d.0, %bb159 ], [ %d.0, %bb554 ], [ %d.0, %bb159 ], [ %d.0, %bb159 ], [ %d.12, %bb664 ] ; [#uses=5] + switch i32 0, label %bb661 [ + i32 0, label %bb159 + i32 1, label %succeed_label + i32 13, label %bb159 + i32 14, label %bb159 + i32 16, label %bb411 + i32 24, label %bb622 + i32 28, label %bb543 + ] + +bb411: ; preds = %bb411, %bb159 + br label %bb411 + +bb543: ; preds = %bb159 + br i1 false, label %bb549, label %bb550 + +bb549: ; preds = %bb543 + br label %bb554 + +bb550: ; preds = %bb543 + br i1 false, label %bb554, label %bb552 + +bb552: ; preds = %bb550 + %0 = load i8* %d.0, align 8 ; [#uses=0] + br label %bb554 + +bb554: ; preds = %bb552, %bb550, %bb549 + br i1 false, label %bb159, label %bb661 + +bb622: ; preds = %bb622, %bb159 + br label %bb622 + +bb661: ; preds = %bb554, %bb159 + %d.12 = select i1 false, i8* null, i8* null ; [#uses=1] + br label %bb664 + +bb664: ; preds = %bb664, %bb661 + br i1 false, label %bb159, label %bb664 +} From sabre at nondot.org Thu Jan 22 01:08:58 2009 From: sabre at nondot.org (Chris Lattner) Date: Thu, 22 Jan 2009 07:08:58 -0000 Subject: [llvm-commits] [llvm] r62758 - /llvm/trunk/test/Transforms/SimplifyCFG/2009-01-19-UnconditionalTrappingConstantExpr.ll Message-ID: <200901220708.n0M78wE8018547@zion.cs.uiuc.edu> Author: lattner Date: Thu Jan 22 01:08:58 2009 New Revision: 62758 URL: http://llvm.org/viewvc/llvm-project?rev=62758&view=rev Log: fix a testcase. Modified: llvm/trunk/test/Transforms/SimplifyCFG/2009-01-19-UnconditionalTrappingConstantExpr.ll Modified: llvm/trunk/test/Transforms/SimplifyCFG/2009-01-19-UnconditionalTrappingConstantExpr.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/SimplifyCFG/2009-01-19-UnconditionalTrappingConstantExpr.ll?rev=62758&r1=62757&r2=62758&view=diff ============================================================================== --- llvm/trunk/test/Transforms/SimplifyCFG/2009-01-19-UnconditionalTrappingConstantExpr.ll (original) +++ llvm/trunk/test/Transforms/SimplifyCFG/2009-01-19-UnconditionalTrappingConstantExpr.ll Thu Jan 22 01:08:58 2009 @@ -1,5 +1,4 @@ ; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis | grep {br i1 } | count 4 -; XFAIL: * ; PR3354 ; Do not merge bb1 into the entry block, it might trap. @@ -23,7 +22,7 @@ br i1 %tmp34, label %bb5, label %bb6 bb5: ; preds = %bb4 - br i1 icmp sgt (i32 sdiv (i32 32767, i32 0), i32 0), label %bb6, label %bb7 + br i1 icmp sgt (i32 sdiv (i32 32767, i32 ptrtoint (i32* @G to i32)), i32 0), label %bb6, label %bb7 bb6: ret i32 42 bb7: From tonic at nondot.org Thu Jan 22 01:14:42 2009 From: tonic at nondot.org (Tanya Lattner) Date: Thu, 22 Jan 2009 07:14:42 -0000 Subject: [llvm-commits] [llvm] r62759 - in /llvm/branches/release_25: lib/Analysis/MemoryDependenceAnalysis.cpp test/Transforms/GVN/2009-01-21-SortInvalidation.ll Message-ID: <200901220714.n0M7EgOr018850@zion.cs.uiuc.edu> Author: tbrethou Date: Thu Jan 22 01:14:42 2009 New Revision: 62759 URL: http://llvm.org/viewvc/llvm-project?rev=62759&view=rev Log: Merge from mainline. Fix PR3358, a really nasty bug where recursive phi translated analyses could be run without the caches properly sorted. This can fix all sorts of weirdness. Many thanks to Bill for coming up with the 'issorted' verification idea. Added: llvm/branches/release_25/test/Transforms/GVN/2009-01-21-SortInvalidation.ll - copied unchanged from r62757, llvm/trunk/test/Transforms/GVN/2009-01-21-SortInvalidation.ll Modified: llvm/branches/release_25/lib/Analysis/MemoryDependenceAnalysis.cpp Modified: llvm/branches/release_25/lib/Analysis/MemoryDependenceAnalysis.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_25/lib/Analysis/MemoryDependenceAnalysis.cpp?rev=62759&r1=62758&r2=62759&view=diff ============================================================================== --- llvm/branches/release_25/lib/Analysis/MemoryDependenceAnalysis.cpp (original) +++ llvm/branches/release_25/lib/Analysis/MemoryDependenceAnalysis.cpp Thu Jan 22 01:14:42 2009 @@ -326,6 +326,19 @@ return LocalCache; } +#ifndef NDEBUG +/// AssertSorted - This method is used when -debug is specified to verify that +/// cache arrays are properly kept sorted. +static void AssertSorted(MemoryDependenceAnalysis::NonLocalDepInfo &Cache, + int Count = -1) { + if (Count == -1) Count = Cache.size(); + if (Count == 0) return; + + for (unsigned i = 1; i != unsigned(Count); ++i) + assert(Cache[i-1] <= Cache[i] && "Cache isn't sorted!"); +} +#endif + /// getNonLocalCallDependency - Perform a full dependency query for the /// specified call, returning the set of blocks that the value is /// potentially live across. The returned set of results will include a @@ -386,6 +399,7 @@ SmallPtrSet Visited; unsigned NumSortedEntries = Cache.size(); + DEBUG(AssertSorted(Cache)); // Iterate while we still have blocks to update. while (!DirtyBlocks.empty()) { @@ -398,6 +412,7 @@ // Do a binary search to see if we already have an entry for this block in // the cache set. If so, find it. + DEBUG(AssertSorted(Cache, NumSortedEntries)); NonLocalDepInfo::iterator Entry = std::upper_bound(Cache.begin(), Cache.begin()+NumSortedEntries, std::make_pair(DirtyBB, MemDepResult())); @@ -647,6 +662,7 @@ // won't get any reuse from currently inserted values, because we don't // revisit blocks after we insert info for them. unsigned NumSortedEntries = Cache->size(); + DEBUG(AssertSorted(*Cache)); while (!Worklist.empty()) { BasicBlock *BB = Worklist.pop_back_val(); @@ -659,6 +675,7 @@ // Get the dependency info for Pointer in BB. If we have cached // information, we will use it, otherwise we compute it. + DEBUG(AssertSorted(*Cache, NumSortedEntries)); MemDepResult Dep = GetNonLocalInfoForBlock(Pointer, PointeeSize, isLoad, BB, Cache, NumSortedEntries); @@ -705,7 +722,7 @@ // If this is directly a PHI node, just use the incoming values for each // pred as the phi translated version. if (PHINode *PtrPHI = dyn_cast(PtrInst)) { - for (BasicBlock **PI = PredCache->GetPreds(BB); *PI; ++PI){ + for (BasicBlock **PI = PredCache->GetPreds(BB); *PI; ++PI) { BasicBlock *Pred = *PI; Value *PredPtr = PtrPHI->getIncomingValueForBlock(Pred); @@ -728,6 +745,21 @@ // treat this as a phi translation failure. goto PredTranslationFailure; } + + // We may have added values to the cache list before this PHI + // translation. If so, we haven't done anything to ensure that the + // cache remains sorted. Sort it now (if needed) so that recursive + // invocations of getNonLocalPointerDepFromBB that could reuse the cache + // value will only see properly sorted cache arrays. + if (NumSortedEntries != Cache->size()) { + std::sort(Cache->begin(), Cache->end()); + NumSortedEntries = Cache->size(); + } + + // FIXME: it is entirely possible that PHI translating will end up with + // the same value. Consider PHI translating something like: + // X = phi [x, bb1], [y, bb2]. PHI translating for bb1 doesn't *need* + // to recurse here, pedantically speaking. // If we have a problem phi translating, fall through to the code below // to handle the failure condition. @@ -739,7 +771,8 @@ // Refresh the CacheInfo/Cache pointer so that it isn't invalidated. CacheInfo = &NonLocalPointerDeps[CacheKey]; Cache = &CacheInfo->second; - + NumSortedEntries = Cache->size(); + // Since we did phi translation, the "Cache" set won't contain all of the // results for the query. This is ok (we can still use it to accelerate // specific block queries) but we can't do the fastpath "return all @@ -817,7 +850,7 @@ // Added many values, do a full scale sort. std::sort(Cache->begin(), Cache->end()); } - + DEBUG(AssertSorted(*Cache)); return false; } From sabre at nondot.org Thu Jan 22 01:16:03 2009 From: sabre at nondot.org (Chris Lattner) Date: Thu, 22 Jan 2009 07:16:03 -0000 Subject: [llvm-commits] [llvm] r62760 - /llvm/trunk/lib/Target/README.txt Message-ID: <200901220716.n0M7G3sw018901@zion.cs.uiuc.edu> Author: lattner Date: Thu Jan 22 01:16:03 2009 New Revision: 62760 URL: http://llvm.org/viewvc/llvm-project?rev=62760&view=rev Log: add a note 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=62760&r1=62759&r2=62760&view=diff ============================================================================== --- llvm/trunk/lib/Target/README.txt (original) +++ llvm/trunk/lib/Target/README.txt Thu Jan 22 01:16:03 2009 @@ -1673,3 +1673,13 @@ sarl $5, %eax //===---------------------------------------------------------------------===// + +GCC PR31029: + +int test(int x) { return 1-x == x; } // --> return false +int test2(int x) { return 2-x == x; } // --> return x == 1 ? + +Always foldable for odd constants, what is the rule for even? + +//===---------------------------------------------------------------------===// + From sabre at nondot.org Thu Jan 22 01:21:55 2009 From: sabre at nondot.org (Chris Lattner) Date: Thu, 22 Jan 2009 07:21:55 -0000 Subject: [llvm-commits] [llvm] r62761 - /llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp Message-ID: <200901220721.n0M7LtBn019180@zion.cs.uiuc.edu> Author: lattner Date: Thu Jan 22 01:21:55 2009 New Revision: 62761 URL: http://llvm.org/viewvc/llvm-project?rev=62761&view=rev Log: fix a typo 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=62761&r1=62760&r2=62761&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp Thu Jan 22 01:21:55 2009 @@ -4380,7 +4380,7 @@ assert(From != To.getNode() && "Cannot replace uses of with self"); // Iterate over all the existing uses of From. This specifically avoids - // visiting any new uses of From that arrise while the replacement is + // visiting any new uses of From that arise while the replacement is // happening, because any such uses would be the result of CSE: If an // existing node looks like From after one of its operands is replaced // by To, we don't want to replace of all its users with To too. From clattner at apple.com Thu Jan 22 01:26:12 2009 From: clattner at apple.com (Chris Lattner) Date: Wed, 21 Jan 2009 23:26:12 -0800 Subject: [llvm-commits] [llvm] r62533 - in /llvm/trunk: lib/CodeGen/SelectionDAG/DAGCombiner.cpp lib/CodeGen/SelectionDAG/SelectionDAG.cpp test/CodeGen/X86/pr3018.ll In-Reply-To: <200901192144.n0JLiNcY008949@zion.cs.uiuc.edu> References: <200901192144.n0JLiNcY008949@zion.cs.uiuc.edu> Message-ID: On Jan 19, 2009, at 1:44 PM, Dan Gohman wrote: > URL: http://llvm.org/viewvc/llvm-project?rev=62533&view=rev > Log: > Fix SelectionDAG::ReplaceAllUsesWith to behave correctly when > uses are added to the From node while it is processing From's > use list, because of automatic local CSE. The fix is to avoid > visiting any new uses. > > Fix a few places in the DAGCombiner that assumed that after > a RAUW call, the From node has no users and may be deleted. > > This fixes PR3018. Thank you for fixing this Dan! > + // Iterate over all the existing uses of From. This specifically > avoids > + // visiting any new uses of From that arrise while the > replacement is > + // happening, because any such uses would be the result of CSE: > If an > + // existing node looks like From after one of its operands is > replaced > + // by To, we don't want to replace of all its users with To too. > + // See PR3018 for more info. Just from reading this, it isn't clear to me why this is safe. Is it that any new uses get added to the start of the use list? If so, please mention this. Your implementation of this fix is dramatically better than anything I could come up with :) One other random thing. The RAUW methods now look like this: while (UI != UE) { SDNode *U = *UI; do ++UI; while (UI != UE && *UI == U); // This node is about to morph, remove its old self from the CSE maps. RemoveNodeFromCSEMaps(U); int operandNum = 0; for (SDNode::op_iterator I = U->op_begin(), E = U->op_end(); I != E; ++I, ++operandNum) if (I->getVal() == From) { From->removeUser(operandNum, U); *I = To; I->setUser(U); To.getNode()->addUser(operandNum, U); } // Now that we have modified U, add it back to the CSE maps. If it already // exists there, recursively merge the results together. if (SDNode *Existing = AddNonLeafNodeToCSEMaps(U)) { ... It seems pretty silly to me to do the op_iterator scan right after scanning over the uses like that (from the compile time standpoint). Would something like this work:? while (UI != UE) { SDNode *U = *UI; // This node is about to morph, remove its old self from the CSE maps. RemoveNodeFromCSEMaps(U); do { unsigned OpNo = UI.getOperandNo(); ++UI; From->removeUser(OpNo, U); U->setOperand(OpNo, To); To->addUser(OpNo, U); } while (UI != UE && *UI == U); // Now that we have modified U, add it back to the CSE maps. If it already // exists there, recursively merge the results together. if (SDNode *Existing = AddNonLeafNodeToCSEMaps(U)) { ... -Chris From echeng at apple.com Thu Jan 22 00:48:22 2009 From: echeng at apple.com (Evan Cheng) Date: Wed, 21 Jan 2009 22:48:22 -0800 Subject: [llvm-commits] [llvm] r62553 - in /llvm/trunk: autoconf/configure.ac lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp In-Reply-To: <200901200051.n0K0pfn5015144@zion.cs.uiuc.edu> References: <200901200051.n0K0pfn5015144@zion.cs.uiuc.edu> Message-ID: <4E1D5688-21B6-4968-9BF9-EF7A76BE85F5@apple.com> > > > -#ifdef __linux__ > -#include > +#ifdef HAVE_LIBFFI > +#include FFI_HEADER Is this portable code? I am having trouble building on one of my Mac. llvm[3]: Compiling ExternalFunctions.cpp for Debug build ExternalFunctions.cpp:37:10: error: #include expects "FILENAME" or Evan > > #endif > > -using std::vector; > - > using namespace llvm; > > -typedef GenericValue (*ExFunc)(FunctionType *, const > vector &); > -static ManagedStatic > Functions; > +typedef GenericValue (*ExFunc)(const FunctionType *, > + const std::vector &); > +static ManagedStatic > > ExportedFunctions; > static std::map FuncNames; > > +#ifdef HAVE_LIBFFI > +typedef void (*RawFunc)(void); > +static ManagedStatic > > RawFunctions; > +#endif // HAVE_LIBFFI > + > static Interpreter *TheInterpreter; > > static char getTypeID(const Type *Ty) { > @@ -89,34 +94,181 @@ > if (FnPtr == 0) // Try calling a generic function... if it > exists... > FnPtr = (ExFunc) > (intptr_t)sys::DynamicLibrary::SearchForAddressOfSymbol( > ("lle_X_"+F->getName()).c_str()); > - if (FnPtr == 0) > - FnPtr = (ExFunc)(intptr_t) > - sys::DynamicLibrary::SearchForAddressOfSymbol(F->getName()); > if (FnPtr != 0) > - Functions->insert(std::make_pair(F, FnPtr)); // Cache for later > + ExportedFunctions->insert(std::make_pair(F, FnPtr)); // Cache > for later > return FnPtr; > } > > +#ifdef HAVE_LIBFFI > +static ffi_type *ffiTypeFor(const Type *Ty) { > + switch (Ty->getTypeID()) { > + case Type::VoidTyID: return &ffi_type_void; > + case Type::IntegerTyID: > + switch (cast(Ty)->getBitWidth()) { > + case 8: return &ffi_type_sint8; > + case 16: return &ffi_type_sint16; > + case 32: return &ffi_type_sint32; > + case 64: return &ffi_type_sint64; > + } > + case Type::FloatTyID: return &ffi_type_float; > + case Type::DoubleTyID: return &ffi_type_double; > + case Type::PointerTyID: return &ffi_type_pointer; > + default: break; > + } > + // TODO: Support other types such as StructTyID, ArrayTyID, > OpaqueTyID, etc. > + cerr << "Type could not be mapped for use with libffi.\n"; > + abort(); > + return NULL; > +} > + > +static void *ffiValueFor(const Type *Ty, const GenericValue &AV, > + void *ArgDataPtr) { > + switch (Ty->getTypeID()) { > + case Type::IntegerTyID: > + switch (cast(Ty)->getBitWidth()) { > + case 8: { > + int8_t *I8Ptr = (int8_t *) ArgDataPtr; > + *I8Ptr = (int8_t) AV.IntVal.getZExtValue(); > + return ArgDataPtr; > + } > + case 16: { > + int16_t *I16Ptr = (int16_t *) ArgDataPtr; > + *I16Ptr = (int16_t) AV.IntVal.getZExtValue(); > + return ArgDataPtr; > + } > + case 32: { > + int32_t *I32Ptr = (int32_t *) ArgDataPtr; > + *I32Ptr = (int32_t) AV.IntVal.getZExtValue(); > + return ArgDataPtr; > + } > + case 64: { > + int64_t *I64Ptr = (int64_t *) ArgDataPtr; > + *I64Ptr = (int64_t) AV.IntVal.getZExtValue(); > + return ArgDataPtr; > + } > + } > + case Type::FloatTyID: { > + float *FloatPtr = (float *) ArgDataPtr; > + *FloatPtr = AV.DoubleVal; > + return ArgDataPtr; > + } > + case Type::DoubleTyID: { > + double *DoublePtr = (double *) ArgDataPtr; > + *DoublePtr = AV.DoubleVal; > + return ArgDataPtr; > + } > + case Type::PointerTyID: { > + void **PtrPtr = (void **) ArgDataPtr; > + *PtrPtr = GVTOP(AV); > + return ArgDataPtr; > + } > + default: break; > + } > + // TODO: Support other types such as StructTyID, ArrayTyID, > OpaqueTyID, etc. > + cerr << "Type value could not be mapped for use with libffi.\n"; > + abort(); > + return NULL; > +} > + > +static bool ffiInvoke(RawFunc Fn, Function *F, > + const std::vector &ArgVals, > + const TargetData *TD, GenericValue &Result) { > + ffi_cif cif; > + const FunctionType *FTy = F->getFunctionType(); > + const unsigned NumArgs = F->arg_size(); > + > + // TODO: We don't have type information about the remaining > arguments, because > + // this information is never passed into > ExecutionEngine::runFunction(). > + if (ArgVals.size() > NumArgs && F->isVarArg()) { > + cerr << "Calling external var arg function '" << F->getName() > + << "' is not supported by the Interpreter.\n"; > + abort(); > + } > + > + unsigned ArgBytes = 0; > + > + std::vector args(NumArgs); > + for (Function::const_arg_iterator A = F->arg_begin(), E = F- > >arg_end(); > + A != E; ++A) { > + const unsigned ArgNo = A->getArgNo(); > + const Type *ArgTy = FTy->getParamType(ArgNo); > + args[ArgNo] = ffiTypeFor(ArgTy); > + ArgBytes += TD->getTypeStoreSize(ArgTy); > + } > + > + uint8_t *ArgData = (uint8_t*) alloca(ArgBytes); > + uint8_t *ArgDataPtr = ArgData; > + std::vector values(NumArgs); > + for (Function::const_arg_iterator A = F->arg_begin(), E = F- > >arg_end(); > + A != E; ++A) { > + const unsigned ArgNo = A->getArgNo(); > + const Type *ArgTy = FTy->getParamType(ArgNo); > + values[ArgNo] = ffiValueFor(ArgTy, ArgVals[ArgNo], ArgDataPtr); > + ArgDataPtr += TD->getTypeStoreSize(ArgTy); > + } > + > + const Type *RetTy = FTy->getReturnType(); > + ffi_type *rtype = ffiTypeFor(RetTy); > + > + if (ffi_prep_cif(&cif, FFI_DEFAULT_ABI, NumArgs, rtype, &args[0]) > == FFI_OK) { > + void *ret = NULL; > + if (RetTy->getTypeID() != Type::VoidTyID) > + ret = alloca(TD->getTypeStoreSize(RetTy)); > + ffi_call(&cif, Fn, ret, &values[0]); > + switch (RetTy->getTypeID()) { > + case Type::IntegerTyID: > + switch (cast(RetTy)->getBitWidth()) { > + case 8: Result.IntVal = APInt(8 , *(int8_t *) ret); break; > + case 16: Result.IntVal = APInt(16, *(int16_t*) ret); break; > + case 32: Result.IntVal = APInt(32, *(int32_t*) ret); break; > + case 64: Result.IntVal = APInt(64, *(int64_t*) ret); break; > + } > + break; > + case Type::FloatTyID: Result.FloatVal = *(float *) ret; > break; > + case Type::DoubleTyID: Result.DoubleVal = *(double*) ret; > break; > + case Type::PointerTyID: Result.PointerVal = *(void **) ret; > break; > + default: break; > + } > + return true; > + } > + > + return false; > +} > +#endif // HAVE_LIBFFI > + > GenericValue Interpreter::callExternalFunction(Function *F, > const std::vector > &ArgVals) { > TheInterpreter = this; > > // Do a lookup to see if the function is in our cache... this > should just be a > // deferred annotation! > - std::map::iterator FI = Functions- > >find(F); > - ExFunc Fn = (FI == Functions->end()) ? lookupFunction(F) : FI- > >second; > - if (Fn == 0) { > - cerr << "Tried to execute an unknown external function: " > - << F->getType()->getDescription() << " " << F->getName() > << "\n"; > - if (F->getName() == "__main") > - return GenericValue(); > - abort(); > + std::map::iterator FI = > ExportedFunctions->find(F); > + if (ExFunc Fn = (FI == ExportedFunctions->end()) ? > lookupFunction(F) > + : FI->second) > + return Fn(F->getFunctionType(), ArgVals); > + > +#ifdef HAVE_LIBFFI > + std::map::iterator RF = RawFunctions- > >find(F); > + RawFunc RawFn; > + if (RF == RawFunctions->end()) { > + RawFn = (RawFunc)(intptr_t) > + sys::DynamicLibrary::SearchForAddressOfSymbol(F->getName()); > + if (RawFn != 0) > + RawFunctions->insert(std::make_pair(F, RawFn)); // Cache for > later > + } else { > + RawFn = RF->second; > } > > - // TODO: FIXME when types are not const! > - GenericValue Result = Fn(const_cast(F- > >getFunctionType()), > - ArgVals); > - return Result; > + GenericValue Result; > + if (RawFn != 0 && ffiInvoke(RawFn, F, ArgVals, getTargetData(), > Result)) > + return Result; > +#endif // HAVE_LIBFFI > + > + cerr << "Tried to execute an unknown external function: " > + << F->getType()->getDescription() << " " << F->getName() << > "\n"; > + if (F->getName() != "__main") > + abort(); > + return GenericValue(); > } > > > @@ -125,24 +277,9 @@ > // > extern "C" { // Don't add C++ manglings to llvm mangling :) > > -// void putchar(ubyte) > -GenericValue lle_X_putchar(FunctionType *FT, const > vector &Args){ > - cout << ((char)Args[0].IntVal.getZExtValue()) << std::flush; > - return Args[0]; > -} > - > -// void _IO_putc(int c, FILE* fp) > -GenericValue lle_X__IO_putc(FunctionType *FT, const > vector &Args){ > -#ifdef __linux__ > - _IO_putc((char)Args[0].IntVal.getZExtValue(), (FILE*) > Args[1].PointerVal); > -#else > - assert(0 && "Can't call _IO_putc on this platform"); > -#endif > - return Args[0]; > -} > - > // void atexit(Function*) > -GenericValue lle_X_atexit(FunctionType *FT, const > vector &Args) { > +GenericValue lle_X_atexit(const FunctionType *FT, > + const std::vector &Args) { > assert(Args.size() == 1); > TheInterpreter->addAtExitHandler((Function*)GVTOP(Args[0])); > GenericValue GV; > @@ -151,163 +288,23 @@ > } > > // void exit(int) > -GenericValue lle_X_exit(FunctionType *FT, const > vector &Args) { > +GenericValue lle_X_exit(const FunctionType *FT, > + const std::vector &Args) { > TheInterpreter->exitCalled(Args[0]); > return GenericValue(); > } > > // void abort(void) > -GenericValue lle_X_abort(FunctionType *FT, const > vector &Args) { > +GenericValue lle_X_abort(const FunctionType *FT, > + const std::vector &Args) { > raise (SIGABRT); > return GenericValue(); > } > > -// void *malloc(uint) > -GenericValue lle_X_malloc(FunctionType *FT, const > vector &Args) { > - assert(Args.size() == 1 && "Malloc expects one argument!"); > - assert(isa(FT->getReturnType()) && "malloc must > return pointer"); > - return PTOGV(malloc(Args[0].IntVal.getZExtValue())); > -} > - > -// void *calloc(uint, uint) > -GenericValue lle_X_calloc(FunctionType *FT, const > vector &Args) { > - assert(Args.size() == 2 && "calloc expects two arguments!"); > - assert(isa(FT->getReturnType()) && "calloc must > return pointer"); > - return PTOGV(calloc(Args[0].IntVal.getZExtValue(), > - Args[1].IntVal.getZExtValue())); > -} > - > -// void *calloc(uint, uint) > -GenericValue lle_X_realloc(FunctionType *FT, const > vector &Args) { > - assert(Args.size() == 2 && "calloc expects two arguments!"); > - assert(isa(FT->getReturnType()) &&"realloc must > return pointer"); > - return PTOGV(realloc(GVTOP(Args[0]), > Args[1].IntVal.getZExtValue())); > -} > - > -// void free(void *) > -GenericValue lle_X_free(FunctionType *FT, const > vector &Args) { > - assert(Args.size() == 1); > - free(GVTOP(Args[0])); > - return GenericValue(); > -} > - > -// int atoi(char *) > -GenericValue lle_X_atoi(FunctionType *FT, const > vector &Args) { > - assert(Args.size() == 1); > - GenericValue GV; > - GV.IntVal = APInt(32, atoi((char*)GVTOP(Args[0]))); > - return GV; > -} > - > -// double pow(double, double) > -GenericValue lle_X_pow(FunctionType *FT, const vector > &Args) { > - assert(Args.size() == 2); > - GenericValue GV; > - GV.DoubleVal = pow(Args[0].DoubleVal, Args[1].DoubleVal); > - return GV; > -} > - > -// double sin(double) > -GenericValue lle_X_sin(FunctionType *FT, const vector > &Args) { > - assert(Args.size() == 1); > - GenericValue GV; > - GV.DoubleVal = sin(Args[0].DoubleVal); > - return GV; > -} > - > -// double cos(double) > -GenericValue lle_X_cos(FunctionType *FT, const vector > &Args) { > - assert(Args.size() == 1); > - GenericValue GV; > - GV.DoubleVal = cos(Args[0].DoubleVal); > - return GV; > -} > - > -// double exp(double) > -GenericValue lle_X_exp(FunctionType *FT, const vector > &Args) { > - assert(Args.size() == 1); > - GenericValue GV; > - GV.DoubleVal = exp(Args[0].DoubleVal); > - return GV; > -} > - > -// double sqrt(double) > -GenericValue lle_X_sqrt(FunctionType *FT, const > vector &Args) { > - assert(Args.size() == 1); > - GenericValue GV; > - GV.DoubleVal = sqrt(Args[0].DoubleVal); > - return GV; > -} > - > -// double log(double) > -GenericValue lle_X_log(FunctionType *FT, const vector > &Args) { > - assert(Args.size() == 1); > - GenericValue GV; > - GV.DoubleVal = log(Args[0].DoubleVal); > - return GV; > -} > - > -// double floor(double) > -GenericValue lle_X_floor(FunctionType *FT, const > vector &Args) { > - assert(Args.size() == 1); > - GenericValue GV; > - GV.DoubleVal = floor(Args[0].DoubleVal); > - return GV; > -} > - > -#ifdef HAVE_RAND48 > - > -// double drand48() > -GenericValue lle_X_drand48(FunctionType *FT, const > vector &Args) { > - assert(Args.empty()); > - GenericValue GV; > - GV.DoubleVal = drand48(); > - return GV; > -} > - > -// long lrand48() > -GenericValue lle_X_lrand48(FunctionType *FT, const > vector &Args) { > - assert(Args.empty()); > - GenericValue GV; > - GV.IntVal = APInt(32, lrand48()); > - return GV; > -} > - > -// void srand48(long) > -GenericValue lle_X_srand48(FunctionType *FT, const > vector &Args) { > - assert(Args.size() == 1); > - srand48(Args[0].IntVal.getZExtValue()); > - return GenericValue(); > -} > - > -#endif > - > -// int rand() > -GenericValue lle_X_rand(FunctionType *FT, const > vector &Args) { > - assert(Args.empty()); > - GenericValue GV; > - GV.IntVal = APInt(32, rand()); > - return GV; > -} > - > -// void srand(uint) > -GenericValue lle_X_srand(FunctionType *FT, const > vector &Args) { > - assert(Args.size() == 1); > - srand(Args[0].IntVal.getZExtValue()); > - return GenericValue(); > -} > - > -// int puts(const char*) > -GenericValue lle_X_puts(FunctionType *FT, const > vector &Args) { > - assert(Args.size() == 1); > - GenericValue GV; > - GV.IntVal = APInt(32, puts((char*)GVTOP(Args[0]))); > - return GV; > -} > - > -// int sprintf(sbyte *, sbyte *, ...) - a very rough implementation > to make > +// int sprintf(char *, const char *, ...) - a very rough > implementation to make > // output useful. > -GenericValue lle_X_sprintf(FunctionType *FT, const > vector &Args) { > +GenericValue lle_X_sprintf(const FunctionType *FT, > + const std::vector &Args) { > char *OutputBuffer = (char *)GVTOP(Args[0]); > const char *FmtStr = (const char *)GVTOP(Args[1]); > unsigned ArgNo = 2; > @@ -384,10 +381,12 @@ > return GV; > } > > -// int printf(sbyte *, ...) - a very rough implementation to make > output useful. > -GenericValue lle_X_printf(FunctionType *FT, const > vector &Args) { > +// int printf(const char *, ...) - a very rough implementation to > make output > +// useful. > +GenericValue lle_X_printf(const FunctionType *FT, > + const std::vector &Args) { > char Buffer[10000]; > - vector NewArgs; > + std::vector NewArgs; > NewArgs.push_back(PTOGV((void*)&Buffer[0])); > NewArgs.insert(NewArgs.end(), Args.begin(), Args.end()); > GenericValue GV = lle_X_sprintf(FT, NewArgs); > @@ -472,7 +471,8 @@ > } > > // int sscanf(const char *format, ...); > -GenericValue lle_X_sscanf(FunctionType *FT, const > vector &args) { > +GenericValue lle_X_sscanf(const FunctionType *FT, > + const std::vector &args) { > assert(args.size() < 10 && "Only handle up to 10 args to sscanf > right now!"); > > char *Args[10]; > @@ -488,7 +488,8 @@ > } > > // int scanf(const char *format, ...); > -GenericValue lle_X_scanf(FunctionType *FT, const > vector &args) { > +GenericValue lle_X_scanf(const FunctionType *FT, > + const std::vector &args) { > assert(args.size() < 10 && "Only handle up to 10 args to scanf > right now!"); > > char *Args[10]; > @@ -503,324 +504,33 @@ > return GV; > } > > - > -// int clock(void) - Profiling implementation > -GenericValue lle_i_clock(FunctionType *FT, const > vector &Args) { > - extern unsigned int clock(void); > - GenericValue GV; > - GV.IntVal = APInt(32, clock()); > - return GV; > -} > - > - > -// > = > = > = > ----------------------------------------------------------------------= > ==// > -// String Functions... > -// > = > = > = > ----------------------------------------------------------------------= > ==// > - > -// int strcmp(const char *S1, const char *S2); > -GenericValue lle_X_strcmp(FunctionType *FT, const > vector &Args) { > - assert(Args.size() == 2); > - GenericValue Ret; > - Ret.IntVal = APInt(32, strcmp((char*)GVTOP(Args[0]), > (char*)GVTOP(Args[1]))); > - return Ret; > -} > - > -// char *strcat(char *Dest, const char *src); > -GenericValue lle_X_strcat(FunctionType *FT, const > vector &Args) { > - assert(Args.size() == 2); > - assert(isa(FT->getReturnType()) &&"strcat must > return pointer"); > - return PTOGV(strcat((char*)GVTOP(Args[0]), (char*)GVTOP(Args[1]))); > -} > - > -// char *strcpy(char *Dest, const char *src); > -GenericValue lle_X_strcpy(FunctionType *FT, const > vector &Args) { > - assert(Args.size() == 2); > - assert(isa(FT->getReturnType()) &&"strcpy must > return pointer"); > - return PTOGV(strcpy((char*)GVTOP(Args[0]), (char*)GVTOP(Args[1]))); > -} > - > -static GenericValue size_t_to_GV (size_t n) { > - GenericValue Ret; > - if (sizeof (size_t) == sizeof (uint64_t)) { > - Ret.IntVal = APInt(64, n); > - } else { > - assert (sizeof (size_t) == sizeof (unsigned int)); > - Ret.IntVal = APInt(32, n); > - } > - return Ret; > -} > - > -static size_t GV_to_size_t (GenericValue GV) { > - size_t count; > - if (sizeof (size_t) == sizeof (uint64_t)) { > - count = (size_t)GV.IntVal.getZExtValue(); > - } else { > - assert (sizeof (size_t) == sizeof (unsigned int)); > - count = (size_t)GV.IntVal.getZExtValue(); > - } > - return count; > -} > - > -// size_t strlen(const char *src); > -GenericValue lle_X_strlen(FunctionType *FT, const > vector &Args) { > - assert(Args.size() == 1); > - size_t strlenResult = strlen ((char *) GVTOP (Args[0])); > - return size_t_to_GV (strlenResult); > -} > - > -// char *strdup(const char *src); > -GenericValue lle_X_strdup(FunctionType *FT, const > vector &Args) { > - assert(Args.size() == 1); > - assert(isa(FT->getReturnType()) && "strdup must > return pointer"); > - return PTOGV(strdup((char*)GVTOP(Args[0]))); > -} > - > -// char *__strdup(const char *src); > -GenericValue lle_X___strdup(FunctionType *FT, const > vector &Args) { > - assert(Args.size() == 1); > - assert(isa(FT->getReturnType()) &&"_strdup must > return pointer"); > - return PTOGV(strdup((char*)GVTOP(Args[0]))); > -} > - > -// void *memset(void *S, int C, size_t N) > -GenericValue lle_X_memset(FunctionType *FT, const > vector &Args) { > - assert(Args.size() == 3); > - size_t count = GV_to_size_t (Args[2]); > - assert(isa(FT->getReturnType()) && "memset must > return pointer"); > - return PTOGV(memset(GVTOP(Args[0]), > uint32_t(Args[1].IntVal.getZExtValue()), > - count)); > -} > - > -// void *memcpy(void *Dest, void *src, size_t Size); > -GenericValue lle_X_memcpy(FunctionType *FT, const > vector &Args) { > - assert(Args.size() == 3); > - assert(isa(FT->getReturnType()) && "memcpy must > return pointer"); > - size_t count = GV_to_size_t (Args[2]); > - return PTOGV(memcpy((char*)GVTOP(Args[0]), (char*)GVTOP(Args[1]), > count)); > -} > - > -// void *memcpy(void *Dest, void *src, size_t Size); > -GenericValue lle_X_memmove(FunctionType *FT, const > vector &Args) { > - assert(Args.size() == 3); > - assert(isa(FT->getReturnType()) && "memmove must > return pointer"); > - size_t count = GV_to_size_t (Args[2]); > - return PTOGV(memmove((char*)GVTOP(Args[0]), > (char*)GVTOP(Args[1]), count)); > -} > - > -// > = > = > = > ----------------------------------------------------------------------= > ==// > -// IO Functions... > -// > = > = > = > ----------------------------------------------------------------------= > ==// > - > -// getFILE - Turn a pointer in the host address space into a legit > pointer in > -// the interpreter address space. This is an identity > transformation. > -#define getFILE(ptr) ((FILE*)ptr) > - > -// FILE *fopen(const char *filename, const char *mode); > -GenericValue lle_X_fopen(FunctionType *FT, const > vector &Args) { > - assert(Args.size() == 2); > - assert(isa(FT->getReturnType()) && "fopen must > return pointer"); > - return PTOGV(fopen((const char *)GVTOP(Args[0]), > - (const char *)GVTOP(Args[1]))); > -} > - > -// int fclose(FILE *F); > -GenericValue lle_X_fclose(FunctionType *FT, const > vector &Args) { > - assert(Args.size() == 1); > - GenericValue GV; > - GV.IntVal = APInt(32, fclose(getFILE(GVTOP(Args[0])))); > - return GV; > -} > - > -// int feof(FILE *stream); > -GenericValue lle_X_feof(FunctionType *FT, const > vector &Args) { > - assert(Args.size() == 1); > - GenericValue GV; > - > - GV.IntVal = APInt(32, feof(getFILE(GVTOP(Args[0])))); > - return GV; > -} > - > -// size_t fread(void *ptr, size_t size, size_t nitems, FILE *stream); > -GenericValue lle_X_fread(FunctionType *FT, const > vector &Args) { > - assert(Args.size() == 4); > - size_t result; > - > - result = fread((void*)GVTOP(Args[0]), GV_to_size_t (Args[1]), > - GV_to_size_t (Args[2]), getFILE(GVTOP(Args[3]))); > - return size_t_to_GV (result); > -} > - > -// size_t fwrite(const void *ptr, size_t size, size_t nitems, FILE > *stream); > -GenericValue lle_X_fwrite(FunctionType *FT, const > vector &Args) { > - assert(Args.size() == 4); > - size_t result; > - > - result = fwrite((void*)GVTOP(Args[0]), GV_to_size_t (Args[1]), > - GV_to_size_t (Args[2]), getFILE(GVTOP(Args[3]))); > - return size_t_to_GV (result); > -} > - > -// char *fgets(char *s, int n, FILE *stream); > -GenericValue lle_X_fgets(FunctionType *FT, const > vector &Args) { > - assert(Args.size() == 3); > - return PTOGV(fgets((char*)GVTOP(Args[0]), > Args[1].IntVal.getZExtValue(), > - getFILE(GVTOP(Args[2])))); > -} > - > -// FILE *freopen(const char *path, const char *mode, FILE *stream); > -GenericValue lle_X_freopen(FunctionType *FT, const > vector &Args) { > - assert(Args.size() == 3); > - assert(isa(FT->getReturnType()) &&"freopen must > return pointer"); > - return PTOGV(freopen((char*)GVTOP(Args[0]), (char*)GVTOP(Args[1]), > - getFILE(GVTOP(Args[2])))); > -} > - > -// int fflush(FILE *stream); > -GenericValue lle_X_fflush(FunctionType *FT, const > vector &Args) { > - assert(Args.size() == 1); > - GenericValue GV; > - GV.IntVal = APInt(32, fflush(getFILE(GVTOP(Args[0])))); > - return GV; > -} > - > -// int getc(FILE *stream); > -GenericValue lle_X_getc(FunctionType *FT, const > vector &Args) { > - assert(Args.size() == 1); > - GenericValue GV; > - GV.IntVal = APInt(32, getc(getFILE(GVTOP(Args[0])))); > - return GV; > -} > - > -// int _IO_getc(FILE *stream); > -GenericValue lle_X__IO_getc(FunctionType *F, const > vector &Args) { > - return lle_X_getc(F, Args); > -} > - > -// int fputc(int C, FILE *stream); > -GenericValue lle_X_fputc(FunctionType *FT, const > vector &Args) { > - assert(Args.size() == 2); > - GenericValue GV; > - GV.IntVal = APInt(32, fputc(Args[0].IntVal.getZExtValue(), > - getFILE(GVTOP(Args[1])))); > - return GV; > -} > - > -// int ungetc(int C, FILE *stream); > -GenericValue lle_X_ungetc(FunctionType *FT, const > vector &Args) { > - assert(Args.size() == 2); > - GenericValue GV; > - GV.IntVal = APInt(32, ungetc(Args[0].IntVal.getZExtValue(), > - getFILE(GVTOP(Args[1])))); > - return GV; > -} > - > -// int ferror (FILE *stream); > -GenericValue lle_X_ferror(FunctionType *FT, const > vector &Args) { > - assert(Args.size() == 1); > - GenericValue GV; > - GV.IntVal = APInt(32, ferror (getFILE(GVTOP(Args[0])))); > - return GV; > -} > - > -// int fprintf(FILE *,sbyte *, ...) - a very rough implementation > to make output > -// useful. > -GenericValue lle_X_fprintf(FunctionType *FT, const > vector &Args) { > +// int fprintf(FILE *, const char *, ...) - a very rough > implementation to make > +// output useful. > +GenericValue lle_X_fprintf(const FunctionType *FT, > + const std::vector &Args) { > assert(Args.size() >= 2); > char Buffer[10000]; > - vector NewArgs; > + std::vector NewArgs; > NewArgs.push_back(PTOGV(Buffer)); > NewArgs.insert(NewArgs.end(), Args.begin()+1, Args.end()); > GenericValue GV = lle_X_sprintf(FT, NewArgs); > > - fputs(Buffer, getFILE(GVTOP(Args[0]))); > - return GV; > -} > - > -// int __cxa_guard_acquire (__guard *g); > -GenericValue lle_X___cxa_guard_acquire(FunctionType *FT, > - const vector > &Args) { > - assert(Args.size() == 1); > - GenericValue GV; > -#ifdef __linux__ > - GV.IntVal = APInt(32, __cxxabiv1::__cxa_guard_acquire ( > - (__cxxabiv1::__guard*)GVTOP(Args[0]))); > -#else > - assert(0 && "Can't call __cxa_guard_acquire on this platform"); > -#endif > + fputs(Buffer, (FILE *) GVTOP(Args[0])); > return GV; > } > > -// void __cxa_guard_release (__guard *g); > -GenericValue lle_X___cxa_guard_release(FunctionType *FT, > - const vector > &Args) { > - assert(Args.size() == 1); > -#ifdef __linux__ > - __cxxabiv1::__cxa_guard_release > ((__cxxabiv1::__guard*)GVTOP(Args[0])); > -#else > - assert(0 && "Can't call __cxa_guard_release on this platform"); > -#endif > - return GenericValue(); > -} > - > } // End extern "C" > > > void Interpreter::initializeExternalFunctions() { > - FuncNames["lle_X_putchar"] = lle_X_putchar; > - FuncNames["lle_X__IO_putc"] = lle_X__IO_putc; > + FuncNames["lle_X_atexit"] = lle_X_atexit; > FuncNames["lle_X_exit"] = lle_X_exit; > FuncNames["lle_X_abort"] = lle_X_abort; > - FuncNames["lle_X_malloc"] = lle_X_malloc; > - FuncNames["lle_X_calloc"] = lle_X_calloc; > - FuncNames["lle_X_realloc"] = lle_X_realloc; > - FuncNames["lle_X_free"] = lle_X_free; > - FuncNames["lle_X_atoi"] = lle_X_atoi; > - FuncNames["lle_X_pow"] = lle_X_pow; > - FuncNames["lle_X_sin"] = lle_X_sin; > - FuncNames["lle_X_cos"] = lle_X_cos; > - FuncNames["lle_X_exp"] = lle_X_exp; > - FuncNames["lle_X_log"] = lle_X_log; > - FuncNames["lle_X_floor"] = lle_X_floor; > - FuncNames["lle_X_srand"] = lle_X_srand; > - FuncNames["lle_X_rand"] = lle_X_rand; > -#ifdef HAVE_RAND48 > - FuncNames["lle_X_drand48"] = lle_X_drand48; > - FuncNames["lle_X_srand48"] = lle_X_srand48; > - FuncNames["lle_X_lrand48"] = lle_X_lrand48; > -#endif > - FuncNames["lle_X_sqrt"] = lle_X_sqrt; > - FuncNames["lle_X_puts"] = lle_X_puts; > + > FuncNames["lle_X_printf"] = lle_X_printf; > FuncNames["lle_X_sprintf"] = lle_X_sprintf; > FuncNames["lle_X_sscanf"] = lle_X_sscanf; > FuncNames["lle_X_scanf"] = lle_X_scanf; > - FuncNames["lle_i_clock"] = lle_i_clock; > - > - FuncNames["lle_X_strcmp"] = lle_X_strcmp; > - FuncNames["lle_X_strcat"] = lle_X_strcat; > - FuncNames["lle_X_strcpy"] = lle_X_strcpy; > - FuncNames["lle_X_strlen"] = lle_X_strlen; > - FuncNames["lle_X___strdup"] = lle_X___strdup; > - FuncNames["lle_X_memset"] = lle_X_memset; > - FuncNames["lle_X_memcpy"] = lle_X_memcpy; > - FuncNames["lle_X_memmove"] = lle_X_memmove; > - > - FuncNames["lle_X_fopen"] = lle_X_fopen; > - FuncNames["lle_X_fclose"] = lle_X_fclose; > - FuncNames["lle_X_feof"] = lle_X_feof; > - FuncNames["lle_X_fread"] = lle_X_fread; > - FuncNames["lle_X_fwrite"] = lle_X_fwrite; > - FuncNames["lle_X_fgets"] = lle_X_fgets; > - FuncNames["lle_X_fflush"] = lle_X_fflush; > - FuncNames["lle_X_fgetc"] = lle_X_getc; > - FuncNames["lle_X_getc"] = lle_X_getc; > - FuncNames["lle_X__IO_getc"] = lle_X__IO_getc; > - FuncNames["lle_X_fputc"] = lle_X_fputc; > - FuncNames["lle_X_ungetc"] = lle_X_ungetc; > FuncNames["lle_X_fprintf"] = lle_X_fprintf; > - FuncNames["lle_X_freopen"] = lle_X_freopen; > - > - FuncNames["lle_X___cxa_guard_acquire"] = lle_X___cxa_guard_acquire; > - FuncNames["lle_X____cxa_guard_release"] = > lle_X___cxa_guard_release; > } > > > > _______________________________________________ > 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/20090121/947c0540/attachment.html From nicholas at mxc.ca Thu Jan 22 01:54:19 2009 From: nicholas at mxc.ca (Nick Lewycky) Date: Wed, 21 Jan 2009 23:54:19 -0800 Subject: [llvm-commits] [llvm] r62553 - in /llvm/trunk: autoconf/configure.ac lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp In-Reply-To: <4E1D5688-21B6-4968-9BF9-EF7A76BE85F5@apple.com> References: <200901200051.n0K0pfn5015144@zion.cs.uiuc.edu> <4E1D5688-21B6-4968-9BF9-EF7A76BE85F5@apple.com> Message-ID: <4978262B.7090305@mxc.ca> Evan Cheng wrote: >> >> >> -#ifdef __linux__ >> -#include >> +#ifdef HAVE_LIBFFI >> +#include FFI_HEADER > > Is this portable code? I am having trouble building on one of my Mac. > > llvm[3]: Compiling ExternalFunctions.cpp for Debug build > ExternalFunctions.cpp:37:10: error: #include expects "FILENAME" or > I was hoping it would be, but apparently not. Could you tell me what your include/llvm/Config/config.h says for HAVE_LIBFFI and FFI_HEADER ? And if you happen to know, do you have libffi installed, and ffi.h? Nick > Evan >> > >> #endif >> >> -using std::vector; >> - >> using namespace llvm; >> >> -typedef GenericValue (*ExFunc)(FunctionType *, const >> vector &); >> -static ManagedStatic > Functions; >> +typedef GenericValue (*ExFunc)(const FunctionType *, >> + const std::vector &); >> +static ManagedStatic > >> ExportedFunctions; >> static std::map FuncNames; >> >> +#ifdef HAVE_LIBFFI >> +typedef void (*RawFunc)(void); >> +static ManagedStatic > RawFunctions; >> +#endif // HAVE_LIBFFI >> + >> static Interpreter *TheInterpreter; >> >> static char getTypeID(const Type *Ty) { >> @@ -89,34 +94,181 @@ >> if (FnPtr == 0) // Try calling a generic function... if it exists... >> FnPtr = >> (ExFunc)(intptr_t)sys::DynamicLibrary::SearchForAddressOfSymbol( >> ("lle_X_"+F->getName()).c_str()); >> - if (FnPtr == 0) >> - FnPtr = (ExFunc)(intptr_t) >> - sys::DynamicLibrary::SearchForAddressOfSymbol(F->getName()); >> if (FnPtr != 0) >> - Functions->insert(std::make_pair(F, FnPtr)); // Cache for later >> + ExportedFunctions->insert(std::make_pair(F, FnPtr)); // Cache >> for later >> return FnPtr; >> } >> >> +#ifdef HAVE_LIBFFI >> +static ffi_type *ffiTypeFor(const Type *Ty) { >> + switch (Ty->getTypeID()) { >> + case Type::VoidTyID: return &ffi_type_void; >> + case Type::IntegerTyID: >> + switch (cast(Ty)->getBitWidth()) { >> + case 8: return &ffi_type_sint8; >> + case 16: return &ffi_type_sint16; >> + case 32: return &ffi_type_sint32; >> + case 64: return &ffi_type_sint64; >> + } >> + case Type::FloatTyID: return &ffi_type_float; >> + case Type::DoubleTyID: return &ffi_type_double; >> + case Type::PointerTyID: return &ffi_type_pointer; >> + default: break; >> + } >> + // TODO: Support other types such as StructTyID, ArrayTyID, >> OpaqueTyID, etc. >> + cerr << "Type could not be mapped for use with libffi.\n"; >> + abort(); >> + return NULL; >> +} >> + >> +static void *ffiValueFor(const Type *Ty, const GenericValue &AV, >> + void *ArgDataPtr) { >> + switch (Ty->getTypeID()) { >> + case Type::IntegerTyID: >> + switch (cast(Ty)->getBitWidth()) { >> + case 8: { >> + int8_t *I8Ptr = (int8_t *) ArgDataPtr; >> + *I8Ptr = (int8_t) AV.IntVal.getZExtValue(); >> + return ArgDataPtr; >> + } >> + case 16: { >> + int16_t *I16Ptr = (int16_t *) ArgDataPtr; >> + *I16Ptr = (int16_t) AV.IntVal.getZExtValue(); >> + return ArgDataPtr; >> + } >> + case 32: { >> + int32_t *I32Ptr = (int32_t *) ArgDataPtr; >> + *I32Ptr = (int32_t) AV.IntVal.getZExtValue(); >> + return ArgDataPtr; >> + } >> + case 64: { >> + int64_t *I64Ptr = (int64_t *) ArgDataPtr; >> + *I64Ptr = (int64_t) AV.IntVal.getZExtValue(); >> + return ArgDataPtr; >> + } >> + } >> + case Type::FloatTyID: { >> + float *FloatPtr = (float *) ArgDataPtr; >> + *FloatPtr = AV.DoubleVal; >> + return ArgDataPtr; >> + } >> + case Type::DoubleTyID: { >> + double *DoublePtr = (double *) ArgDataPtr; >> + *DoublePtr = AV.DoubleVal; >> + return ArgDataPtr; >> + } >> + case Type::PointerTyID: { >> + void **PtrPtr = (void **) ArgDataPtr; >> + *PtrPtr = GVTOP(AV); >> + return ArgDataPtr; >> + } >> + default: break; >> + } >> + // TODO: Support other types such as StructTyID, ArrayTyID, >> OpaqueTyID, etc. >> + cerr << "Type value could not be mapped for use with libffi.\n"; >> + abort(); >> + return NULL; >> +} >> + >> +static bool ffiInvoke(RawFunc Fn, Function *F, >> + const std::vector &ArgVals, >> + const TargetData *TD, GenericValue &Result) { >> + ffi_cif cif; >> + const FunctionType *FTy = F->getFunctionType(); >> + const unsigned NumArgs = F->arg_size(); >> + >> + // TODO: We don't have type information about the remaining >> arguments, because >> + // this information is never passed into >> ExecutionEngine::runFunction(). >> + if (ArgVals.size() > NumArgs && F->isVarArg()) { >> + cerr << "Calling external var arg function '" << F->getName() >> + << "' is not supported by the Interpreter.\n"; >> + abort(); >> + } >> + >> + unsigned ArgBytes = 0; >> + >> + std::vector args(NumArgs); >> + for (Function::const_arg_iterator A = F->arg_begin(), E = F->arg_end(); >> + A != E; ++A) { >> + const unsigned ArgNo = A->getArgNo(); >> + const Type *ArgTy = FTy->getParamType(ArgNo); >> + args[ArgNo] = ffiTypeFor(ArgTy); >> + ArgBytes += TD->getTypeStoreSize(ArgTy); >> + } >> + >> + uint8_t *ArgData = (uint8_t*) alloca(ArgBytes); >> + uint8_t *ArgDataPtr = ArgData; >> + std::vector values(NumArgs); >> + for (Function::const_arg_iterator A = F->arg_begin(), E = F->arg_end(); >> + A != E; ++A) { >> + const unsigned ArgNo = A->getArgNo(); >> + const Type *ArgTy = FTy->getParamType(ArgNo); >> + values[ArgNo] = ffiValueFor(ArgTy, ArgVals[ArgNo], ArgDataPtr); >> + ArgDataPtr += TD->getTypeStoreSize(ArgTy); >> + } >> + >> + const Type *RetTy = FTy->getReturnType(); >> + ffi_type *rtype = ffiTypeFor(RetTy); >> + >> + if (ffi_prep_cif(&cif, FFI_DEFAULT_ABI, NumArgs, rtype, &args[0]) >> == FFI_OK) { >> + void *ret = NULL; >> + if (RetTy->getTypeID() != Type::VoidTyID) >> + ret = alloca(TD->getTypeStoreSize(RetTy)); >> + ffi_call(&cif, Fn, ret, &values[0]); >> + switch (RetTy->getTypeID()) { >> + case Type::IntegerTyID: >> + switch (cast(RetTy)->getBitWidth()) { >> + case 8: Result.IntVal = APInt(8 , *(int8_t *) ret); break; >> + case 16: Result.IntVal = APInt(16, *(int16_t*) ret); break; >> + case 32: Result.IntVal = APInt(32, *(int32_t*) ret); break; >> + case 64: Result.IntVal = APInt(64, *(int64_t*) ret); break; >> + } >> + break; >> + case Type::FloatTyID: Result.FloatVal = *(float *) ret; break; >> + case Type::DoubleTyID: Result.DoubleVal = *(double*) ret; break; >> + case Type::PointerTyID: Result.PointerVal = *(void **) ret; break; >> + default: break; >> + } >> + return true; >> + } >> + >> + return false; >> +} >> +#endif // HAVE_LIBFFI >> + >> GenericValue Interpreter::callExternalFunction(Function *F, >> const std::vector >> &ArgVals) { >> TheInterpreter = this; >> >> // Do a lookup to see if the function is in our cache... this should >> just be a >> // deferred annotation! >> - std::map::iterator FI = Functions->find(F); >> - ExFunc Fn = (FI == Functions->end()) ? lookupFunction(F) : FI->second; >> - if (Fn == 0) { >> - cerr << "Tried to execute an unknown external function: " >> - << F->getType()->getDescription() << " " << F->getName() << >> "\n"; >> - if (F->getName() == "__main") >> - return GenericValue(); >> - abort(); >> + std::map::iterator FI = >> ExportedFunctions->find(F); >> + if (ExFunc Fn = (FI == ExportedFunctions->end()) ? lookupFunction(F) >> + : FI->second) >> + return Fn(F->getFunctionType(), ArgVals); >> + >> +#ifdef HAVE_LIBFFI >> + std::map::iterator RF = >> RawFunctions->find(F); >> + RawFunc RawFn; >> + if (RF == RawFunctions->end()) { >> + RawFn = (RawFunc)(intptr_t) >> + sys::DynamicLibrary::SearchForAddressOfSymbol(F->getName()); >> + if (RawFn != 0) >> + RawFunctions->insert(std::make_pair(F, RawFn)); // Cache for later >> + } else { >> + RawFn = RF->second; >> } >> >> - // TODO: FIXME when types are not const! >> - GenericValue Result = >> Fn(const_cast(F->getFunctionType()), >> - ArgVals); >> - return Result; >> + GenericValue Result; >> + if (RawFn != 0 && ffiInvoke(RawFn, F, ArgVals, getTargetData(), >> Result)) >> + return Result; >> +#endif // HAVE_LIBFFI >> + >> + cerr << "Tried to execute an unknown external function: " >> + << F->getType()->getDescription() << " " << F->getName() << "\n"; >> + if (F->getName() != "__main") >> + abort(); >> + return GenericValue(); >> } >> >> >> @@ -125,24 +277,9 @@ >> // >> extern "C" { // Don't add C++ manglings to llvm mangling :) >> >> -// void putchar(ubyte) >> -GenericValue lle_X_putchar(FunctionType *FT, const >> vector &Args){ >> - cout << ((char)Args[0].IntVal.getZExtValue()) << std::flush; >> - return Args[0]; >> -} >> - >> -// void _IO_putc(int c, FILE* fp) >> -GenericValue lle_X__IO_putc(FunctionType *FT, const >> vector &Args){ >> -#ifdef __linux__ >> - _IO_putc((char)Args[0].IntVal.getZExtValue(), (FILE*) >> Args[1].PointerVal); >> -#else >> - assert(0 && "Can't call _IO_putc on this platform"); >> -#endif >> - return Args[0]; >> -} >> - >> // void atexit(Function*) >> -GenericValue lle_X_atexit(FunctionType *FT, const >> vector &Args) { >> +GenericValue lle_X_atexit(const FunctionType *FT, >> + const std::vector &Args) { >> assert(Args.size() == 1); >> TheInterpreter->addAtExitHandler((Function*)GVTOP(Args[0])); >> GenericValue GV; >> @@ -151,163 +288,23 @@ >> } >> >> // void exit(int) >> -GenericValue lle_X_exit(FunctionType *FT, const vector >> &Args) { >> +GenericValue lle_X_exit(const FunctionType *FT, >> + const std::vector &Args) { >> TheInterpreter->exitCalled(Args[0]); >> return GenericValue(); >> } >> >> // void abort(void) >> -GenericValue lle_X_abort(FunctionType *FT, const vector >> &Args) { >> +GenericValue lle_X_abort(const FunctionType *FT, >> + const std::vector &Args) { >> raise (SIGABRT); >> return GenericValue(); >> } >> >> -// void *malloc(uint) >> -GenericValue lle_X_malloc(FunctionType *FT, const >> vector &Args) { >> - assert(Args.size() == 1 && "Malloc expects one argument!"); >> - assert(isa(FT->getReturnType()) && "malloc must return >> pointer"); >> - return PTOGV(malloc(Args[0].IntVal.getZExtValue())); >> -} >> - >> -// void *calloc(uint, uint) >> -GenericValue lle_X_calloc(FunctionType *FT, const >> vector &Args) { >> - assert(Args.size() == 2 && "calloc expects two arguments!"); >> - assert(isa(FT->getReturnType()) && "calloc must return >> pointer"); >> - return PTOGV(calloc(Args[0].IntVal.getZExtValue(), >> - Args[1].IntVal.getZExtValue())); >> -} >> - >> -// void *calloc(uint, uint) >> -GenericValue lle_X_realloc(FunctionType *FT, const >> vector &Args) { >> - assert(Args.size() == 2 && "calloc expects two arguments!"); >> - assert(isa(FT->getReturnType()) &&"realloc must return >> pointer"); >> - return PTOGV(realloc(GVTOP(Args[0]), Args[1].IntVal.getZExtValue())); >> -} >> - >> -// void free(void *) >> -GenericValue lle_X_free(FunctionType *FT, const vector >> &Args) { >> - assert(Args.size() == 1); >> - free(GVTOP(Args[0])); >> - return GenericValue(); >> -} >> - >> -// int atoi(char *) >> -GenericValue lle_X_atoi(FunctionType *FT, const vector >> &Args) { >> - assert(Args.size() == 1); >> - GenericValue GV; >> - GV.IntVal = APInt(32, atoi((char*)GVTOP(Args[0]))); >> - return GV; >> -} >> - >> -// double pow(double, double) >> -GenericValue lle_X_pow(FunctionType *FT, const vector >> &Args) { >> - assert(Args.size() == 2); >> - GenericValue GV; >> - GV.DoubleVal = pow(Args[0].DoubleVal, Args[1].DoubleVal); >> - return GV; >> -} >> - >> -// double sin(double) >> -GenericValue lle_X_sin(FunctionType *FT, const vector >> &Args) { >> - assert(Args.size() == 1); >> - GenericValue GV; >> - GV.DoubleVal = sin(Args[0].DoubleVal); >> - return GV; >> -} >> - >> -// double cos(double) >> -GenericValue lle_X_cos(FunctionType *FT, const vector >> &Args) { >> - assert(Args.size() == 1); >> - GenericValue GV; >> - GV.DoubleVal = cos(Args[0].DoubleVal); >> - return GV; >> -} >> - >> -// double exp(double) >> -GenericValue lle_X_exp(FunctionType *FT, const vector >> &Args) { >> - assert(Args.size() == 1); >> - GenericValue GV; >> - GV.DoubleVal = exp(Args[0].DoubleVal); >> - return GV; >> -} >> - >> -// double sqrt(double) >> -GenericValue lle_X_sqrt(FunctionType *FT, const vector >> &Args) { >> - assert(Args.size() == 1); >> - GenericValue GV; >> - GV.DoubleVal = sqrt(Args[0].DoubleVal); >> - return GV; >> -} >> - >> -// double log(double) >> -GenericValue lle_X_log(FunctionType *FT, const vector >> &Args) { >> - assert(Args.size() == 1); >> - GenericValue GV; >> - GV.DoubleVal = log(Args[0].DoubleVal); >> - return GV; >> -} >> - >> -// double floor(double) >> -GenericValue lle_X_floor(FunctionType *FT, const vector >> &Args) { >> - assert(Args.size() == 1); >> - GenericValue GV; >> - GV.DoubleVal = floor(Args[0].DoubleVal); >> - return GV; >> -} >> - >> -#ifdef HAVE_RAND48 >> - >> -// double drand48() >> -GenericValue lle_X_drand48(FunctionType *FT, const >> vector &Args) { >> - assert(Args.empty()); >> - GenericValue GV; >> - GV.DoubleVal = drand48(); >> - return GV; >> -} >> - >> -// long lrand48() >> -GenericValue lle_X_lrand48(FunctionType *FT, const >> vector &Args) { >> - assert(Args.empty()); >> - GenericValue GV; >> - GV.IntVal = APInt(32, lrand48()); >> - return GV; >> -} >> - >> -// void srand48(long) >> -GenericValue lle_X_srand48(FunctionType *FT, const >> vector &Args) { >> - assert(Args.size() == 1); >> - srand48(Args[0].IntVal.getZExtValue()); >> - return GenericValue(); >> -} >> - >> -#endif >> - >> -// int rand() >> -GenericValue lle_X_rand(FunctionType *FT, const vector >> &Args) { >> - assert(Args.empty()); >> - GenericValue GV; >> - GV.IntVal = APInt(32, rand()); >> - return GV; >> -} >> - >> -// void srand(uint) >> -GenericValue lle_X_srand(FunctionType *FT, const vector >> &Args) { >> - assert(Args.size() == 1); >> - srand(Args[0].IntVal.getZExtValue()); >> - return GenericValue(); >> -} >> - >> -// int puts(const char*) >> -GenericValue lle_X_puts(FunctionType *FT, const vector >> &Args) { >> - assert(Args.size() == 1); >> - GenericValue GV; >> - GV.IntVal = APInt(32, puts((char*)GVTOP(Args[0]))); >> - return GV; >> -} >> - >> -// int sprintf(sbyte *, sbyte *, ...) - a very rough implementation >> to make >> +// int sprintf(char *, const char *, ...) - a very rough >> implementation to make >> // output useful. >> -GenericValue lle_X_sprintf(FunctionType *FT, const >> vector &Args) { >> +GenericValue lle_X_sprintf(const FunctionType *FT, >> + const std::vector &Args) { >> char *OutputBuffer = (char *)GVTOP(Args[0]); >> const char *FmtStr = (const char *)GVTOP(Args[1]); >> unsigned ArgNo = 2; >> @@ -384,10 +381,12 @@ >> return GV; >> } >> >> -// int printf(sbyte *, ...) - a very rough implementation to make >> output useful. >> -GenericValue lle_X_printf(FunctionType *FT, const >> vector &Args) { >> +// int printf(const char *, ...) - a very rough implementation to >> make output >> +// useful. >> +GenericValue lle_X_printf(const FunctionType *FT, >> + const std::vector &Args) { >> char Buffer[10000]; >> - vector NewArgs; >> + std::vector NewArgs; >> NewArgs.push_back(PTOGV((void*)&Buffer[0])); >> NewArgs.insert(NewArgs.end(), Args.begin(), Args.end()); >> GenericValue GV = lle_X_sprintf(FT, NewArgs); >> @@ -472,7 +471,8 @@ >> } >> >> // int sscanf(const char *format, ...); >> -GenericValue lle_X_sscanf(FunctionType *FT, const >> vector &args) { >> +GenericValue lle_X_sscanf(const FunctionType *FT, >> + const std::vector &args) { >> assert(args.size() < 10 && "Only handle up to 10 args to sscanf >> right now!"); >> >> char *Args[10]; >> @@ -488,7 +488,8 @@ >> } >> >> // int scanf(const char *format, ...); >> -GenericValue lle_X_scanf(FunctionType *FT, const vector >> &args) { >> +GenericValue lle_X_scanf(const FunctionType *FT, >> + const std::vector &args) { >> assert(args.size() < 10 && "Only handle up to 10 args to scanf right >> now!"); >> >> char *Args[10]; >> @@ -503,324 +504,33 @@ >> return GV; >> } >> >> - >> -// int clock(void) - Profiling implementation >> -GenericValue lle_i_clock(FunctionType *FT, const vector >> &Args) { >> - extern unsigned int clock(void); >> - GenericValue GV; >> - GV.IntVal = APInt(32, clock()); >> - return GV; >> -} >> - >> - >> -//===----------------------------------------------------------------------===// >> -// String Functions... >> -//===----------------------------------------------------------------------===// >> - >> -// int strcmp(const char *S1, const char *S2); >> -GenericValue lle_X_strcmp(FunctionType *FT, const >> vector &Args) { >> - assert(Args.size() == 2); >> - GenericValue Ret; >> - Ret.IntVal = APInt(32, strcmp((char*)GVTOP(Args[0]), >> (char*)GVTOP(Args[1]))); >> - return Ret; >> -} >> - >> -// char *strcat(char *Dest, const char *src); >> -GenericValue lle_X_strcat(FunctionType *FT, const >> vector &Args) { >> - assert(Args.size() == 2); >> - assert(isa(FT->getReturnType()) &&"strcat must return >> pointer"); >> - return PTOGV(strcat((char*)GVTOP(Args[0]), (char*)GVTOP(Args[1]))); >> -} >> - >> -// char *strcpy(char *Dest, const char *src); >> -GenericValue lle_X_strcpy(FunctionType *FT, const >> vector &Args) { >> - assert(Args.size() == 2); >> - assert(isa(FT->getReturnType()) &&"strcpy must return >> pointer"); >> - return PTOGV(strcpy((char*)GVTOP(Args[0]), (char*)GVTOP(Args[1]))); >> -} >> - >> -static GenericValue size_t_to_GV (size_t n) { >> - GenericValue Ret; >> - if (sizeof (size_t) == sizeof (uint64_t)) { >> - Ret.IntVal = APInt(64, n); >> - } else { >> - assert (sizeof (size_t) == sizeof (unsigned int)); >> - Ret.IntVal = APInt(32, n); >> - } >> - return Ret; >> -} >> - >> -static size_t GV_to_size_t (GenericValue GV) { >> - size_t count; >> - if (sizeof (size_t) == sizeof (uint64_t)) { >> - count = (size_t)GV.IntVal.getZExtValue(); >> - } else { >> - assert (sizeof (size_t) == sizeof (unsigned int)); >> - count = (size_t)GV.IntVal.getZExtValue(); >> - } >> - return count; >> -} >> - >> -// size_t strlen(const char *src); >> -GenericValue lle_X_strlen(FunctionType *FT, const >> vector &Args) { >> - assert(Args.size() == 1); >> - size_t strlenResult = strlen ((char *) GVTOP (Args[0])); >> - return size_t_to_GV (strlenResult); >> -} >> - >> -// char *strdup(const char *src); >> -GenericValue lle_X_strdup(FunctionType *FT, const >> vector &Args) { >> - assert(Args.size() == 1); >> - assert(isa(FT->getReturnType()) && "strdup must return >> pointer"); >> - return PTOGV(strdup((char*)GVTOP(Args[0]))); >> -} >> - >> -// char *__strdup(const char *src); >> -GenericValue lle_X___strdup(FunctionType *FT, const >> vector &Args) { >> - assert(Args.size() == 1); >> - assert(isa(FT->getReturnType()) &&"_strdup must return >> pointer"); >> - return PTOGV(strdup((char*)GVTOP(Args[0]))); >> -} >> - >> -// void *memset(void *S, int C, size_t N) >> -GenericValue lle_X_memset(FunctionType *FT, const >> vector &Args) { >> - assert(Args.size() == 3); >> - size_t count = GV_to_size_t (Args[2]); >> - assert(isa(FT->getReturnType()) && "memset must return >> pointer"); >> - return PTOGV(memset(GVTOP(Args[0]), >> uint32_t(Args[1].IntVal.getZExtValue()), >> - count)); >> -} >> - >> -// void *memcpy(void *Dest, void *src, size_t Size); >> -GenericValue lle_X_memcpy(FunctionType *FT, const >> vector &Args) { >> - assert(Args.size() == 3); >> - assert(isa(FT->getReturnType()) && "memcpy must return >> pointer"); >> - size_t count = GV_to_size_t (Args[2]); >> - return PTOGV(memcpy((char*)GVTOP(Args[0]), (char*)GVTOP(Args[1]), >> count)); >> -} >> - >> -// void *memcpy(void *Dest, void *src, size_t Size); >> -GenericValue lle_X_memmove(FunctionType *FT, const >> vector &Args) { >> - assert(Args.size() == 3); >> - assert(isa(FT->getReturnType()) && "memmove must >> return pointer"); >> - size_t count = GV_to_size_t (Args[2]); >> - return PTOGV(memmove((char*)GVTOP(Args[0]), (char*)GVTOP(Args[1]), >> count)); >> -} >> - >> -//===----------------------------------------------------------------------===// >> -// IO Functions... >> -//===----------------------------------------------------------------------===// >> - >> -// getFILE - Turn a pointer in the host address space into a legit >> pointer in >> -// the interpreter address space. This is an identity transformation. >> -#define getFILE(ptr) ((FILE*)ptr) >> - >> -// FILE *fopen(const char *filename, const char *mode); >> -GenericValue lle_X_fopen(FunctionType *FT, const vector >> &Args) { >> - assert(Args.size() == 2); >> - assert(isa(FT->getReturnType()) && "fopen must return >> pointer"); >> - return PTOGV(fopen((const char *)GVTOP(Args[0]), >> - (const char *)GVTOP(Args[1]))); >> -} >> - >> -// int fclose(FILE *F); >> -GenericValue lle_X_fclose(FunctionType *FT, const >> vector &Args) { >> - assert(Args.size() == 1); >> - GenericValue GV; >> - GV.IntVal = APInt(32, fclose(getFILE(GVTOP(Args[0])))); >> - return GV; >> -} >> - >> -// int feof(FILE *stream); >> -GenericValue lle_X_feof(FunctionType *FT, const vector >> &Args) { >> - assert(Args.size() == 1); >> - GenericValue GV; >> - >> - GV.IntVal = APInt(32, feof(getFILE(GVTOP(Args[0])))); >> - return GV; >> -} >> - >> -// size_t fread(void *ptr, size_t size, size_t nitems, FILE *stream); >> -GenericValue lle_X_fread(FunctionType *FT, const vector >> &Args) { >> - assert(Args.size() == 4); >> - size_t result; >> - >> - result = fread((void*)GVTOP(Args[0]), GV_to_size_t (Args[1]), >> - GV_to_size_t (Args[2]), getFILE(GVTOP(Args[3]))); >> - return size_t_to_GV (result); >> -} >> - >> -// size_t fwrite(const void *ptr, size_t size, size_t nitems, FILE >> *stream); >> -GenericValue lle_X_fwrite(FunctionType *FT, const >> vector &Args) { >> - assert(Args.size() == 4); >> - size_t result; >> - >> - result = fwrite((void*)GVTOP(Args[0]), GV_to_size_t (Args[1]), >> - GV_to_size_t (Args[2]), getFILE(GVTOP(Args[3]))); >> - return size_t_to_GV (result); >> -} >> - >> -// char *fgets(char *s, int n, FILE *stream); >> -GenericValue lle_X_fgets(FunctionType *FT, const vector >> &Args) { >> - assert(Args.size() == 3); >> - return PTOGV(fgets((char*)GVTOP(Args[0]), >> Args[1].IntVal.getZExtValue(), >> - getFILE(GVTOP(Args[2])))); >> -} >> - >> -// FILE *freopen(const char *path, const char *mode, FILE *stream); >> -GenericValue lle_X_freopen(FunctionType *FT, const >> vector &Args) { >> - assert(Args.size() == 3); >> - assert(isa(FT->getReturnType()) &&"freopen must return >> pointer"); >> - return PTOGV(freopen((char*)GVTOP(Args[0]), (char*)GVTOP(Args[1]), >> - getFILE(GVTOP(Args[2])))); >> -} >> - >> -// int fflush(FILE *stream); >> -GenericValue lle_X_fflush(FunctionType *FT, const >> vector &Args) { >> - assert(Args.size() == 1); >> - GenericValue GV; >> - GV.IntVal = APInt(32, fflush(getFILE(GVTOP(Args[0])))); >> - return GV; >> -} >> - >> -// int getc(FILE *stream); >> -GenericValue lle_X_getc(FunctionType *FT, const vector >> &Args) { >> - assert(Args.size() == 1); >> - GenericValue GV; >> - GV.IntVal = APInt(32, getc(getFILE(GVTOP(Args[0])))); >> - return GV; >> -} >> - >> -// int _IO_getc(FILE *stream); >> -GenericValue lle_X__IO_getc(FunctionType *F, const >> vector &Args) { >> - return lle_X_getc(F, Args); >> -} >> - >> -// int fputc(int C, FILE *stream); >> -GenericValue lle_X_fputc(FunctionType *FT, const vector >> &Args) { >> - assert(Args.size() == 2); >> - GenericValue GV; >> - GV.IntVal = APInt(32, fputc(Args[0].IntVal.getZExtValue(), >> - getFILE(GVTOP(Args[1])))); >> - return GV; >> -} >> - >> -// int ungetc(int C, FILE *stream); >> -GenericValue lle_X_ungetc(FunctionType *FT, const >> vector &Args) { >> - assert(Args.size() == 2); >> - GenericValue GV; >> - GV.IntVal = APInt(32, ungetc(Args[0].IntVal.getZExtValue(), >> - getFILE(GVTOP(Args[1])))); >> - return GV; >> -} >> - >> -// int ferror (FILE *stream); >> -GenericValue lle_X_ferror(FunctionType *FT, const >> vector &Args) { >> - assert(Args.size() == 1); >> - GenericValue GV; >> - GV.IntVal = APInt(32, ferror (getFILE(GVTOP(Args[0])))); >> - return GV; >> -} >> - >> -// int fprintf(FILE *,sbyte *, ...) - a very rough implementation to >> make output >> -// useful. >> -GenericValue lle_X_fprintf(FunctionType *FT, const >> vector &Args) { >> +// int fprintf(FILE *, const char *, ...) - a very rough >> implementation to make >> +// output useful. >> +GenericValue lle_X_fprintf(const FunctionType *FT, >> + const std::vector &Args) { >> assert(Args.size() >= 2); >> char Buffer[10000]; >> - vector NewArgs; >> + std::vector NewArgs; >> NewArgs.push_back(PTOGV(Buffer)); >> NewArgs.insert(NewArgs.end(), Args.begin()+1, Args.end()); >> GenericValue GV = lle_X_sprintf(FT, NewArgs); >> >> - fputs(Buffer, getFILE(GVTOP(Args[0]))); >> - return GV; >> -} >> - >> -// int __cxa_guard_acquire (__guard *g); >> -GenericValue lle_X___cxa_guard_acquire(FunctionType *FT, >> - const vector >> &Args) { >> - assert(Args.size() == 1); >> - GenericValue GV; >> -#ifdef __linux__ >> - GV.IntVal = APInt(32, __cxxabiv1::__cxa_guard_acquire ( >> - (__cxxabiv1::__guard*)GVTOP(Args[0]))); >> -#else >> - assert(0 && "Can't call __cxa_guard_acquire on this platform"); >> -#endif >> + fputs(Buffer, (FILE *) GVTOP(Args[0])); >> return GV; >> } >> >> -// void __cxa_guard_release (__guard *g); >> -GenericValue lle_X___cxa_guard_release(FunctionType *FT, >> - const vector >> &Args) { >> - assert(Args.size() == 1); >> -#ifdef __linux__ >> - __cxxabiv1::__cxa_guard_release ((__cxxabiv1::__guard*)GVTOP(Args[0])); >> -#else >> - assert(0 && "Can't call __cxa_guard_release on this platform"); >> -#endif >> - return GenericValue(); >> -} >> - >> } // End extern "C" >> >> >> void Interpreter::initializeExternalFunctions() { >> - FuncNames["lle_X_putchar"] = lle_X_putchar; >> - FuncNames["lle_X__IO_putc"] = lle_X__IO_putc; >> + FuncNames["lle_X_atexit"] = lle_X_atexit; >> FuncNames["lle_X_exit"] = lle_X_exit; >> FuncNames["lle_X_abort"] = lle_X_abort; >> - FuncNames["lle_X_malloc"] = lle_X_malloc; >> - FuncNames["lle_X_calloc"] = lle_X_calloc; >> - FuncNames["lle_X_realloc"] = lle_X_realloc; >> - FuncNames["lle_X_free"] = lle_X_free; >> - FuncNames["lle_X_atoi"] = lle_X_atoi; >> - FuncNames["lle_X_pow"] = lle_X_pow; >> - FuncNames["lle_X_sin"] = lle_X_sin; >> - FuncNames["lle_X_cos"] = lle_X_cos; >> - FuncNames["lle_X_exp"] = lle_X_exp; >> - FuncNames["lle_X_log"] = lle_X_log; >> - FuncNames["lle_X_floor"] = lle_X_floor; >> - FuncNames["lle_X_srand"] = lle_X_srand; >> - FuncNames["lle_X_rand"] = lle_X_rand; >> -#ifdef HAVE_RAND48 >> - FuncNames["lle_X_drand48"] = lle_X_drand48; >> - FuncNames["lle_X_srand48"] = lle_X_srand48; >> - FuncNames["lle_X_lrand48"] = lle_X_lrand48; >> -#endif >> - FuncNames["lle_X_sqrt"] = lle_X_sqrt; >> - FuncNames["lle_X_puts"] = lle_X_puts; >> + >> FuncNames["lle_X_printf"] = lle_X_printf; >> FuncNames["lle_X_sprintf"] = lle_X_sprintf; >> FuncNames["lle_X_sscanf"] = lle_X_sscanf; >> FuncNames["lle_X_scanf"] = lle_X_scanf; >> - FuncNames["lle_i_clock"] = lle_i_clock; >> - >> - FuncNames["lle_X_strcmp"] = lle_X_strcmp; >> - FuncNames["lle_X_strcat"] = lle_X_strcat; >> - FuncNames["lle_X_strcpy"] = lle_X_strcpy; >> - FuncNames["lle_X_strlen"] = lle_X_strlen; >> - FuncNames["lle_X___strdup"] = lle_X___strdup; >> - FuncNames["lle_X_memset"] = lle_X_memset; >> - FuncNames["lle_X_memcpy"] = lle_X_memcpy; >> - FuncNames["lle_X_memmove"] = lle_X_memmove; >> - >> - FuncNames["lle_X_fopen"] = lle_X_fopen; >> - FuncNames["lle_X_fclose"] = lle_X_fclose; >> - FuncNames["lle_X_feof"] = lle_X_feof; >> - FuncNames["lle_X_fread"] = lle_X_fread; >> - FuncNames["lle_X_fwrite"] = lle_X_fwrite; >> - FuncNames["lle_X_fgets"] = lle_X_fgets; >> - FuncNames["lle_X_fflush"] = lle_X_fflush; >> - FuncNames["lle_X_fgetc"] = lle_X_getc; >> - FuncNames["lle_X_getc"] = lle_X_getc; >> - FuncNames["lle_X__IO_getc"] = lle_X__IO_getc; >> - FuncNames["lle_X_fputc"] = lle_X_fputc; >> - FuncNames["lle_X_ungetc"] = lle_X_ungetc; >> FuncNames["lle_X_fprintf"] = lle_X_fprintf; >> - FuncNames["lle_X_freopen"] = lle_X_freopen; >> - >> - FuncNames["lle_X___cxa_guard_acquire"] = lle_X___cxa_guard_acquire; >> - FuncNames["lle_X____cxa_guard_release"] = lle_X___cxa_guard_release; >> } >> >> >> >> _______________________________________________ >> 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 evan.cheng at apple.com Thu Jan 22 03:10:12 2009 From: evan.cheng at apple.com (Evan Cheng) Date: Thu, 22 Jan 2009 09:10:12 -0000 Subject: [llvm-commits] [llvm] r62762 - in /llvm/trunk: include/llvm/CodeGen/FastISel.h include/llvm/Target/TargetRegisterInfo.h lib/CodeGen/SelectionDAG/FastISel.cpp lib/CodeGen/SelectionDAG/ScheduleDAGSDNodesEmit.cpp lib/Target/X86/X86FastISel.cpp utils/TableGen/FastISelEmitter.cpp utils/TableGen/RegisterInfoEmitter.cpp Message-ID: <200901220910.n0M9ACLm032348@zion.cs.uiuc.edu> Author: evancheng Date: Thu Jan 22 03:10:11 2009 New Revision: 62762 URL: http://llvm.org/viewvc/llvm-project?rev=62762&view=rev Log: Eliminate a couple of fields from TargetRegisterClass: SubRegClasses and SuperRegClasses. These are not necessary. Also eliminate getSubRegisterRegClass and getSuperRegisterRegClass. These are slow and their results can change if register file names change. Just use TargetLowering::getRegClassFor() to get the right TargetRegisterClass instead. Modified: llvm/trunk/include/llvm/CodeGen/FastISel.h llvm/trunk/include/llvm/Target/TargetRegisterInfo.h llvm/trunk/lib/CodeGen/SelectionDAG/FastISel.cpp llvm/trunk/lib/CodeGen/SelectionDAG/ScheduleDAGSDNodesEmit.cpp llvm/trunk/lib/Target/X86/X86FastISel.cpp llvm/trunk/utils/TableGen/FastISelEmitter.cpp llvm/trunk/utils/TableGen/RegisterInfoEmitter.cpp Modified: llvm/trunk/include/llvm/CodeGen/FastISel.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/FastISel.h?rev=62762&r1=62761&r2=62762&view=diff ============================================================================== --- llvm/trunk/include/llvm/CodeGen/FastISel.h (original) +++ llvm/trunk/include/llvm/CodeGen/FastISel.h Thu Jan 22 03:10:11 2009 @@ -259,8 +259,9 @@ uint64_t Imm); /// FastEmitInst_extractsubreg - Emit a MachineInstr for an extract_subreg - /// from a specified index of a superregister. - unsigned FastEmitInst_extractsubreg(unsigned Op0, uint32_t Idx); + /// from a specified index of a superregister to a specified type. + unsigned FastEmitInst_extractsubreg(MVT::SimpleValueType RetVT, + unsigned Op0, uint32_t Idx); /// FastEmitBranch - Emit an unconditional branch to the given block, /// unless it is the immediate (fall-through) successor, and update Modified: llvm/trunk/include/llvm/Target/TargetRegisterInfo.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/TargetRegisterInfo.h?rev=62762&r1=62761&r2=62762&view=diff ============================================================================== --- llvm/trunk/include/llvm/Target/TargetRegisterInfo.h (original) +++ llvm/trunk/include/llvm/Target/TargetRegisterInfo.h Thu Jan 22 03:10:11 2009 @@ -60,8 +60,6 @@ const vt_iterator VTs; const sc_iterator SubClasses; const sc_iterator SuperClasses; - const sc_iterator SubRegClasses; - const sc_iterator SuperRegClasses; const unsigned RegSize, Alignment; // Size & Alignment of register in bytes const int CopyCost; const iterator RegsBegin, RegsEnd; @@ -70,12 +68,9 @@ const MVT *vts, const TargetRegisterClass * const *subcs, const TargetRegisterClass * const *supcs, - const TargetRegisterClass * const *subregcs, - const TargetRegisterClass * const *superregcs, unsigned RS, unsigned Al, int CC, iterator RB, iterator RE) : ID(id), VTs(vts), SubClasses(subcs), SuperClasses(supcs), - SubRegClasses(subregcs), SuperRegClasses(superregcs), RegSize(RS), Alignment(Al), CopyCost(CC), RegsBegin(RB), RegsEnd(RE) {} virtual ~TargetRegisterClass() {} // Allow subclasses @@ -170,30 +165,6 @@ return I; } - /// subregclasses_begin / subregclasses_end - Loop over all of - /// the subregister classes of this register class. - sc_iterator subregclasses_begin() const { - return SubRegClasses; - } - - sc_iterator subregclasses_end() const { - sc_iterator I = SubRegClasses; - while (*I != NULL) ++I; - return I; - } - - /// superregclasses_begin / superregclasses_end - Loop over all of - /// the superregister classes of this register class. - sc_iterator superregclasses_begin() const { - return SuperRegClasses; - } - - sc_iterator superregclasses_end() const { - sc_iterator I = SuperRegClasses; - while (*I != NULL) ++I; - return I; - } - /// allocation_order_begin/end - These methods define a range of registers /// which specify the registers in this class that are valid to register /// allocate, and the preferred order to allocate them in. For example, Modified: llvm/trunk/lib/CodeGen/SelectionDAG/FastISel.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/FastISel.cpp?rev=62762&r1=62761&r2=62762&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/FastISel.cpp (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/FastISel.cpp Thu Jan 22 03:10:11 2009 @@ -943,11 +943,11 @@ return ResultReg; } -unsigned FastISel::FastEmitInst_extractsubreg(unsigned Op0, uint32_t Idx) { +unsigned FastISel::FastEmitInst_extractsubreg(MVT::SimpleValueType RetVT, + unsigned Op0, uint32_t Idx) { const TargetRegisterClass* RC = MRI.getRegClass(Op0); - const TargetRegisterClass* SRC = *(RC->subregclasses_begin()+Idx-1); - unsigned ResultReg = createResultReg(SRC); + unsigned ResultReg = createResultReg(TLI.getRegClassFor(RetVT)); const TargetInstrDesc &II = TII.get(TargetInstrInfo::EXTRACT_SUBREG); if (II.getNumDefs() >= 1) Modified: llvm/trunk/lib/CodeGen/SelectionDAG/ScheduleDAGSDNodesEmit.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/ScheduleDAGSDNodesEmit.cpp?rev=62762&r1=62761&r2=62762&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/ScheduleDAGSDNodesEmit.cpp (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/ScheduleDAGSDNodesEmit.cpp Thu Jan 22 03:10:11 2009 @@ -333,33 +333,6 @@ } } -/// getSubRegisterRegClass - Returns the register class of specified register -/// class' "SubIdx"'th sub-register class. -static const TargetRegisterClass* -getSubRegisterRegClass(const TargetRegisterClass *TRC, unsigned SubIdx) { - // Pick the register class of the subregister - TargetRegisterInfo::regclass_iterator I = - TRC->subregclasses_begin() + SubIdx-1; - assert(I < TRC->subregclasses_end() && - "Invalid subregister index for register class"); - return *I; -} - -/// getSuperRegisterRegClass - Returns the register class of a superreg A whose -/// "SubIdx"'th sub-register class is the specified register class and whose -/// type matches the specified type. -static const TargetRegisterClass* -getSuperRegisterRegClass(const TargetRegisterClass *TRC, - unsigned SubIdx, MVT VT) { - // Pick the register class of the superegister for this type - for (TargetRegisterInfo::regclass_iterator I = TRC->superregclasses_begin(), - E = TRC->superregclasses_end(); I != E; ++I) - if ((*I)->hasType(VT) && getSubRegisterRegClass(*I, SubIdx) == TRC) - return *I; - assert(false && "Couldn't find the register class"); - return 0; -} - /// EmitSubregNode - Generate machine code for subreg nodes. /// void ScheduleDAGSDNodes::EmitSubregNode(SDNode *Node, @@ -389,9 +362,7 @@ MachineInstr *MI = BuildMI(MF, TII->get(TargetInstrInfo::EXTRACT_SUBREG)); // Figure out the register class to create for the destreg. - unsigned VReg = getVR(Node->getOperand(0), VRBaseMap); - const TargetRegisterClass *TRC = MRI.getRegClass(VReg); - const TargetRegisterClass *SRC = getSubRegisterRegClass(TRC, SubIdx); + const TargetRegisterClass *SRC = TLI->getRegClassFor(Node->getValueType(0)); if (VRBase) { // Grab the destination register @@ -416,7 +387,6 @@ SDValue N0 = Node->getOperand(0); SDValue N1 = Node->getOperand(1); SDValue N2 = Node->getOperand(2); - unsigned SubReg = getVR(N1, VRBaseMap); unsigned SubIdx = cast(N2)->getZExtValue(); @@ -425,8 +395,7 @@ if (VRBase) { TRC = MRI.getRegClass(VRBase); } else { - TRC = getSuperRegisterRegClass(MRI.getRegClass(SubReg), SubIdx, - Node->getValueType(0)); + TRC = TLI->getRegClassFor(Node->getValueType(0)); assert(TRC && "Couldn't determine register class for insert_subreg"); VRBase = MRI.createVirtualRegister(TRC); // Create the reg } Modified: llvm/trunk/lib/Target/X86/X86FastISel.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86FastISel.cpp?rev=62762&r1=62761&r2=62762&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/X86FastISel.cpp (original) +++ llvm/trunk/lib/Target/X86/X86FastISel.cpp Thu Jan 22 03:10:11 2009 @@ -1011,7 +1011,8 @@ BuildMI(MBB, TII.get(CopyOpc), CopyReg).addReg(InputReg); // Then issue an extract_subreg. - unsigned ResultReg = FastEmitInst_extractsubreg(CopyReg, X86::SUBREG_8BIT); + unsigned ResultReg = FastEmitInst_extractsubreg(DstVT.getSimpleVT(), + CopyReg, X86::SUBREG_8BIT); if (!ResultReg) return false; Modified: llvm/trunk/utils/TableGen/FastISelEmitter.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/FastISelEmitter.cpp?rev=62762&r1=62761&r2=62762&view=diff ============================================================================== --- llvm/trunk/utils/TableGen/FastISelEmitter.cpp (original) +++ llvm/trunk/utils/TableGen/FastISelEmitter.cpp Thu Jan 22 03:10:11 2009 @@ -440,7 +440,8 @@ Operands.PrintArguments(OS, *Memo.PhysRegs); OS << ");\n"; } else { - OS << "extractsubreg(Op0, "; + OS << "extractsubreg(" << getName(RetVT); + OS << ", Op0, "; OS << (unsigned)Memo.SubRegNo; OS << ");\n"; } @@ -534,7 +535,7 @@ Operands.PrintArguments(OS, *Memo.PhysRegs); OS << ");\n"; } else { - OS << "extractsubreg(Op0, "; + OS << "extractsubreg(RetVT, Op0, "; OS << (unsigned)Memo.SubRegNo; OS << ");\n"; } Modified: llvm/trunk/utils/TableGen/RegisterInfoEmitter.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/RegisterInfoEmitter.cpp?rev=62762&r1=62761&r2=62762&view=diff ============================================================================== --- llvm/trunk/utils/TableGen/RegisterInfoEmitter.cpp (original) +++ llvm/trunk/utils/TableGen/RegisterInfoEmitter.cpp Thu Jan 22 03:10:11 2009 @@ -240,83 +240,7 @@ << RegisterClasses[i].getName() << "RegClass;\n"; std::map > SuperClassMap; - std::map > SuperRegClassMap; OS << "\n"; - - // Emit the sub-register classes for each RegisterClass - for (unsigned rc = 0, e = RegisterClasses.size(); rc != e; ++rc) { - const CodeGenRegisterClass &RC = RegisterClasses[rc]; - - // Give the register class a legal C name if it's anonymous. - std::string Name = RC.TheDef->getName(); - - OS << " // " << Name - << " Sub-register Classes...\n" - << " static const TargetRegisterClass* const " - << Name << "SubRegClasses [] = {\n "; - - bool Empty = true; - - for (unsigned subrc = 0, subrcMax = RC.SubRegClasses.size(); - subrc != subrcMax; ++subrc) { - unsigned rc2 = 0, e2 = RegisterClasses.size(); - for (; rc2 != e2; ++rc2) { - const CodeGenRegisterClass &RC2 = RegisterClasses[rc2]; - if (RC.SubRegClasses[subrc]->getName() == RC2.getName()) { - if (!Empty) - OS << ", "; - OS << "&" << getQualifiedName(RC2.TheDef) << "RegClass"; - Empty = false; - - std::map >::iterator SCMI = - SuperRegClassMap.find(rc2); - if (SCMI == SuperRegClassMap.end()) { - SuperRegClassMap.insert(std::make_pair(rc2, std::set())); - SCMI = SuperRegClassMap.find(rc2); - } - SCMI->second.insert(rc); - break; - } - } - if (rc2 == e2) - throw "Register Class member '" + - RC.SubRegClasses[subrc]->getName() + - "' is not a valid RegisterClass!"; - } - - OS << (!Empty ? ", " : "") << "NULL"; - OS << "\n };\n\n"; - } - - // Emit the super-register classes for each RegisterClass - for (unsigned rc = 0, e = RegisterClasses.size(); rc != e; ++rc) { - const CodeGenRegisterClass &RC = RegisterClasses[rc]; - - // Give the register class a legal C name if it's anonymous. - std::string Name = RC.TheDef->getName(); - - OS << " // " << Name - << " Super-register Classes...\n" - << " static const TargetRegisterClass* const " - << Name << "SuperRegClasses [] = {\n "; - - bool Empty = true; - std::map >::iterator I = - SuperRegClassMap.find(rc); - if (I != SuperRegClassMap.end()) { - for (std::set::iterator II = I->second.begin(), - EE = I->second.end(); II != EE; ++II) { - const CodeGenRegisterClass &RC2 = RegisterClasses[*II]; - if (!Empty) - OS << ", "; - OS << "&" << getQualifiedName(RC2.TheDef) << "RegClass"; - Empty = false; - } - } - - OS << (!Empty ? ", " : "") << "NULL"; - OS << "\n };\n\n"; - } // Emit the sub-classes array for each RegisterClass for (unsigned rc = 0, e = RegisterClasses.size(); rc != e; ++rc) { @@ -398,8 +322,6 @@ << RC.getName() + "VTs" << ", " << RC.getName() + "Subclasses" << ", " << RC.getName() + "Superclasses" << ", " - << RC.getName() + "SubRegClasses" << ", " - << RC.getName() + "SuperRegClasses" << ", " << RC.SpillSize/8 << ", " << RC.SpillAlignment/8 << ", " << RC.CopyCost << ", " From sanjiv.gupta at microchip.com Thu Jan 22 04:14:29 2009 From: sanjiv.gupta at microchip.com (Sanjiv Gupta) Date: Thu, 22 Jan 2009 10:14:29 -0000 Subject: [llvm-commits] [llvm] r62763 - /llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp Message-ID: <200901221014.n0MAEUgF002421@zion.cs.uiuc.edu> Author: sgupta Date: Thu Jan 22 04:14:21 2009 New Revision: 62763 URL: http://llvm.org/viewvc/llvm-project?rev=62763&view=rev Log: Few targets like the tiny little PIC16 have only 16-bit pointers. Modified: llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp Modified: llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp?rev=62763&r1=62762&r2=62763&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp (original) +++ llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp Thu Jan 22 04:14:21 2009 @@ -1516,6 +1516,10 @@ assert(TAI->getData64bitsDirective() && "Target cannot handle 64-bit pointer exprs!"); O << TAI->getData64bitsDirective(); + } else if (TD->getPointerSize() == 2) { + O << TAI->getData16bitsDirective(); + } else if (TD->getPointerSize() == 1) { + O << TAI->getData8bitsDirective(); } else { O << TAI->getData32bitsDirective(); } From sanjiv.gupta at microchip.com Thu Jan 22 04:41:39 2009 From: sanjiv.gupta at microchip.com (sanjiv gupta) Date: Thu, 22 Jan 2009 16:11:39 +0530 Subject: [llvm-commits] [llvm] r62553 - in /llvm/trunk: autoconf/configure.ac lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp In-Reply-To: <4978262B.7090305@mxc.ca> References: <200901200051.n0K0pfn5015144@zion.cs.uiuc.edu> <4E1D5688-21B6-4968-9BF9-EF7A76BE85F5@apple.com> <4978262B.7090305@mxc.ca> Message-ID: <1232620899.3037.4.camel@idc-lt-i00171.microchip.com> On Wed, 2009-01-21 at 23:54 -0800, Nick Lewycky wrote: > Evan Cheng wrote: > >> > >> > >> -#ifdef __linux__ > >> -#include > >> +#ifdef HAVE_LIBFFI > >> +#include FFI_HEADER > > > > Is this portable code? I am having trouble building on one of my Mac. > > > > llvm[3]: Compiling ExternalFunctions.cpp for Debug build > > ExternalFunctions.cpp:37:10: error: #include expects "FILENAME" or > > > > I was hoping it would be, but apparently not. > > Could you tell me what your include/llvm/Config/config.h says for > HAVE_LIBFFI and FFI_HEADER ? And if you happen to know, do you have > libffi installed, and ffi.h? > > Nick This breaks the build on my linux box with gcc 4.2.3. config.h says /* Path to ffi.h */ /* #undef FFI_HEADER */ /* Define to 1 if you have the libffi library (-lffi). */ #define HAVE_LIBFFI 1 > > > Evan > >> > > > >> #endif > >> > >> -using std::vector; > >> - > >> using namespace llvm; > >> > >> -typedef GenericValue (*ExFunc)(FunctionType *, const > >> vector &); > >> -static ManagedStatic > Functions; > >> +typedef GenericValue (*ExFunc)(const FunctionType *, > >> + const std::vector &); > >> +static ManagedStatic > > >> ExportedFunctions; > >> static std::map FuncNames; > >> > >> +#ifdef HAVE_LIBFFI > >> +typedef void (*RawFunc)(void); > >> +static ManagedStatic > RawFunctions; > >> +#endif // HAVE_LIBFFI > >> + > >> static Interpreter *TheInterpreter; > >> > >> static char getTypeID(const Type *Ty) { > >> @@ -89,34 +94,181 @@ > >> if (FnPtr == 0) // Try calling a generic function... if it exists... > >> FnPtr = > >> (ExFunc)(intptr_t)sys::DynamicLibrary::SearchForAddressOfSymbol( > >> ("lle_X_"+F->getName()).c_str()); > >> - if (FnPtr == 0) > >> - FnPtr = (ExFunc)(intptr_t) > >> - sys::DynamicLibrary::SearchForAddressOfSymbol(F->getName()); > >> if (FnPtr != 0) > >> - Functions->insert(std::make_pair(F, FnPtr)); // Cache for later > >> + ExportedFunctions->insert(std::make_pair(F, FnPtr)); // Cache > >> for later > >> return FnPtr; > >> } > >> > >> +#ifdef HAVE_LIBFFI > >> +static ffi_type *ffiTypeFor(const Type *Ty) { > >> + switch (Ty->getTypeID()) { > >> + case Type::VoidTyID: return &ffi_type_void; > >> + case Type::IntegerTyID: > >> + switch (cast(Ty)->getBitWidth()) { > >> + case 8: return &ffi_type_sint8; > >> + case 16: return &ffi_type_sint16; > >> + case 32: return &ffi_type_sint32; > >> + case 64: return &ffi_type_sint64; > >> + } > >> + case Type::FloatTyID: return &ffi_type_float; > >> + case Type::DoubleTyID: return &ffi_type_double; > >> + case Type::PointerTyID: return &ffi_type_pointer; > >> + default: break; > >> + } > >> + // TODO: Support other types such as StructTyID, ArrayTyID, > >> OpaqueTyID, etc. > >> + cerr << "Type could not be mapped for use with libffi.\n"; > >> + abort(); > >> + return NULL; > >> +} > >> + > >> +static void *ffiValueFor(const Type *Ty, const GenericValue &AV, > >> + void *ArgDataPtr) { > >> + switch (Ty->getTypeID()) { > >> + case Type::IntegerTyID: > >> + switch (cast(Ty)->getBitWidth()) { > >> + case 8: { > >> + int8_t *I8Ptr = (int8_t *) ArgDataPtr; > >> + *I8Ptr = (int8_t) AV.IntVal.getZExtValue(); > >> + return ArgDataPtr; > >> + } > >> + case 16: { > >> + int16_t *I16Ptr = (int16_t *) ArgDataPtr; > >> + *I16Ptr = (int16_t) AV.IntVal.getZExtValue(); > >> + return ArgDataPtr; > >> + } > >> + case 32: { > >> + int32_t *I32Ptr = (int32_t *) ArgDataPtr; > >> + *I32Ptr = (int32_t) AV.IntVal.getZExtValue(); > >> + return ArgDataPtr; > >> + } > >> + case 64: { > >> + int64_t *I64Ptr = (int64_t *) ArgDataPtr; > >> + *I64Ptr = (int64_t) AV.IntVal.getZExtValue(); > >> + return ArgDataPtr; > >> + } > >> + } > >> + case Type::FloatTyID: { > >> + float *FloatPtr = (float *) ArgDataPtr; > >> + *FloatPtr = AV.DoubleVal; > >> + return ArgDataPtr; > >> + } > >> + case Type::DoubleTyID: { > >> + double *DoublePtr = (double *) ArgDataPtr; > >> + *DoublePtr = AV.DoubleVal; > >> + return ArgDataPtr; > >> + } > >> + case Type::PointerTyID: { > >> + void **PtrPtr = (void **) ArgDataPtr; > >> + *PtrPtr = GVTOP(AV); > >> + return ArgDataPtr; > >> + } > >> + default: break; > >> + } > >> + // TODO: Support other types such as StructTyID, ArrayTyID, > >> OpaqueTyID, etc. > >> + cerr << "Type value could not be mapped for use with libffi.\n"; > >> + abort(); > >> + return NULL; > >> +} > >> + > >> +static bool ffiInvoke(RawFunc Fn, Function *F, > >> + const std::vector &ArgVals, > >> + const TargetData *TD, GenericValue &Result) { > >> + ffi_cif cif; > >> + const FunctionType *FTy = F->getFunctionType(); > >> + const unsigned NumArgs = F->arg_size(); > >> + > >> + // TODO: We don't have type information about the remaining > >> arguments, because > >> + // this information is never passed into > >> ExecutionEngine::runFunction(). > >> + if (ArgVals.size() > NumArgs && F->isVarArg()) { > >> + cerr << "Calling external var arg function '" << F->getName() > >> + << "' is not supported by the Interpreter.\n"; > >> + abort(); > >> + } > >> + > >> + unsigned ArgBytes = 0; > >> + > >> + std::vector args(NumArgs); > >> + for (Function::const_arg_iterator A = F->arg_begin(), E = F->arg_end(); > >> + A != E; ++A) { > >> + const unsigned ArgNo = A->getArgNo(); > >> + const Type *ArgTy = FTy->getParamType(ArgNo); > >> + args[ArgNo] = ffiTypeFor(ArgTy); > >> + ArgBytes += TD->getTypeStoreSize(ArgTy); > >> + } > >> + > >> + uint8_t *ArgData = (uint8_t*) alloca(ArgBytes); > >> + uint8_t *ArgDataPtr = ArgData; > >> + std::vector values(NumArgs); > >> + for (Function::const_arg_iterator A = F->arg_begin(), E = F->arg_end(); > >> + A != E; ++A) { > >> + const unsigned ArgNo = A->getArgNo(); > >> + const Type *ArgTy = FTy->getParamType(ArgNo); > >> + values[ArgNo] = ffiValueFor(ArgTy, ArgVals[ArgNo], ArgDataPtr); > >> + ArgDataPtr += TD->getTypeStoreSize(ArgTy); > >> + } > >> + > >> + const Type *RetTy = FTy->getReturnType(); > >> + ffi_type *rtype = ffiTypeFor(RetTy); > >> + > >> + if (ffi_prep_cif(&cif, FFI_DEFAULT_ABI, NumArgs, rtype, &args[0]) > >> == FFI_OK) { > >> + void *ret = NULL; > >> + if (RetTy->getTypeID() != Type::VoidTyID) > >> + ret = alloca(TD->getTypeStoreSize(RetTy)); > >> + ffi_call(&cif, Fn, ret, &values[0]); > >> + switch (RetTy->getTypeID()) { > >> + case Type::IntegerTyID: > >> + switch (cast(RetTy)->getBitWidth()) { > >> + case 8: Result.IntVal = APInt(8 , *(int8_t *) ret); break; > >> + case 16: Result.IntVal = APInt(16, *(int16_t*) ret); break; > >> + case 32: Result.IntVal = APInt(32, *(int32_t*) ret); break; > >> + case 64: Result.IntVal = APInt(64, *(int64_t*) ret); break; > >> + } > >> + break; > >> + case Type::FloatTyID: Result.FloatVal = *(float *) ret; break; > >> + case Type::DoubleTyID: Result.DoubleVal = *(double*) ret; break; > >> + case Type::PointerTyID: Result.PointerVal = *(void **) ret; break; > >> + default: break; > >> + } > >> + return true; > >> + } > >> + > >> + return false; > >> +} > >> +#endif // HAVE_LIBFFI > >> + > >> GenericValue Interpreter::callExternalFunction(Function *F, > >> const std::vector > >> &ArgVals) { > >> TheInterpreter = this; > >> > >> // Do a lookup to see if the function is in our cache... this should > >> just be a > >> // deferred annotation! > >> - std::map::iterator FI = Functions->find(F); > >> - ExFunc Fn = (FI == Functions->end()) ? lookupFunction(F) : FI->second; > >> - if (Fn == 0) { > >> - cerr << "Tried to **MOBILE CODE** an unknown external function: " > >> - << F->getType()->getDescription() << " " << F->getName() << > >> "\n"; > >> - if (F->getName() == "__main") > >> - return GenericValue(); > >> - abort(); > >> + std::map::iterator FI = > >> ExportedFunctions->find(F); > >> + if (ExFunc Fn = (FI == ExportedFunctions->end()) ? lookupFunction(F) > >> + : FI->second) > >> + return Fn(F->getFunctionType(), ArgVals); > >> + > >> +#ifdef HAVE_LIBFFI > >> + std::map::iterator RF = > >> RawFunctions->find(F); > >> + RawFunc RawFn; > >> + if (RF == RawFunctions->end()) { > >> + RawFn = (RawFunc)(intptr_t) > >> + sys::DynamicLibrary::SearchForAddressOfSymbol(F->getName()); > >> + if (RawFn != 0) > >> + RawFunctions->insert(std::make_pair(F, RawFn)); // Cache for later > >> + } else { > >> + RawFn = RF->second; > >> } > >> > >> - // TODO: FIXME when types are not const! > >> - GenericValue Result = > >> Fn(const_cast(F->getFunctionType()), > >> - ArgVals); > >> - return Result; > >> + GenericValue Result; > >> + if (RawFn != 0 && ffiInvoke(RawFn, F, ArgVals, getTargetData(), > >> Result)) > >> + return Result; > >> +#endif // HAVE_LIBFFI > >> + > >> + cerr << "Tried to **MOBILE CODE** an unknown external function: " > >> + << F->getType()->getDescription() << " " << F->getName() << "\n"; > >> + if (F->getName() != "__main") > >> + abort(); > >> + return GenericValue(); > >> } > >> > >> > >> @@ -125,24 +277,9 @@ > >> // > >> extern "C" { // Don't add C++ manglings to llvm mangling :) > >> > >> -// void putchar(ubyte) > >> -GenericValue lle_X_putchar(FunctionType *FT, const > >> vector &Args){ > >> - cout << ((char)Args[0].IntVal.getZExtValue()) << std::flush; > >> - return Args[0]; > >> -} > >> - > >> -// void _IO_putc(int c, FILE* fp) > >> -GenericValue lle_X__IO_putc(FunctionType *FT, const > >> vector &Args){ > >> -#ifdef __linux__ > >> - _IO_putc((char)Args[0].IntVal.getZExtValue(), (FILE*) > >> Args[1].PointerVal); > >> -#else > >> - assert(0 && "Can't call _IO_putc on this platform"); > >> -#endif > >> - return Args[0]; > >> -} > >> - > >> // void atexit(Function*) > >> -GenericValue lle_X_atexit(FunctionType *FT, const > >> vector &Args) { > >> +GenericValue lle_X_atexit(const FunctionType *FT, > >> + const std::vector &Args) { > >> assert(Args.size() == 1); > >> TheInterpreter->addAtExitHandler((Function*)GVTOP(Args[0])); > >> GenericValue GV; > >> @@ -151,163 +288,23 @@ > >> } > >> > >> // void exit(int) > >> -GenericValue lle_X_exit(FunctionType *FT, const vector > >> &Args) { > >> +GenericValue lle_X_exit(const FunctionType *FT, > >> + const std::vector &Args) { > >> TheInterpreter->exitCalled(Args[0]); > >> return GenericValue(); > >> } > >> > >> // void abort(void) > >> -GenericValue lle_X_abort(FunctionType *FT, const vector > >> &Args) { > >> +GenericValue lle_X_abort(const FunctionType *FT, > >> + const std::vector &Args) { > >> raise (SIGABRT); > >> return GenericValue(); > >> } > >> > >> -// void *malloc(uint) > >> -GenericValue lle_X_malloc(FunctionType *FT, const > >> vector &Args) { > >> - assert(Args.size() == 1 && "Malloc expects one argument!"); > >> - assert(isa(FT->getReturnType()) && "malloc must return > >> pointer"); > >> - return PTOGV(malloc(Args[0].IntVal.getZExtValue())); > >> -} > >> - > >> -// void *calloc(uint, uint) > >> -GenericValue lle_X_calloc(FunctionType *FT, const > >> vector &Args) { > >> - assert(Args.size() == 2 && "calloc expects two arguments!"); > >> - assert(isa(FT->getReturnType()) && "calloc must return > >> pointer"); > >> - return PTOGV(calloc(Args[0].IntVal.getZExtValue(), > >> - Args[1].IntVal.getZExtValue())); > >> -} > >> - > >> -// void *calloc(uint, uint) > >> -GenericValue lle_X_realloc(FunctionType *FT, const > >> vector &Args) { > >> - assert(Args.size() == 2 && "calloc expects two arguments!"); > >> - assert(isa(FT->getReturnType()) &&"realloc must return > >> pointer"); > >> - return PTOGV(realloc(GVTOP(Args[0]), Args[1].IntVal.getZExtValue())); > >> -} > >> - > >> -// void free(void *) > >> -GenericValue lle_X_free(FunctionType *FT, const vector > >> &Args) { > >> - assert(Args.size() == 1); > >> - free(GVTOP(Args[0])); > >> - return GenericValue(); > >> -} > >> - > >> -// int atoi(char *) > >> -GenericValue lle_X_atoi(FunctionType *FT, const vector > >> &Args) { > >> - assert(Args.size() == 1); > >> - GenericValue GV; > >> - GV.IntVal = APInt(32, atoi((char*)GVTOP(Args[0]))); > >> - return GV; > >> -} > >> - > >> -// double pow(double, double) > >> -GenericValue lle_X_pow(FunctionType *FT, const vector > >> &Args) { > >> - assert(Args.size() == 2); > >> - GenericValue GV; > >> - GV.DoubleVal = pow(Args[0].DoubleVal, Args[1].DoubleVal); > >> - return GV; > >> -} > >> - > >> -// double sin(double) > >> -GenericValue lle_X_sin(FunctionType *FT, const vector > >> &Args) { > >> - assert(Args.size() == 1); > >> - GenericValue GV; > >> - GV.DoubleVal = sin(Args[0].DoubleVal); > >> - return GV; > >> -} > >> - > >> -// double cos(double) > >> -GenericValue lle_X_cos(FunctionType *FT, const vector > >> &Args) { > >> - assert(Args.size() == 1); > >> - GenericValue GV; > >> - GV.DoubleVal = cos(Args[0].DoubleVal); > >> - return GV; > >> -} > >> - > >> -// double exp(double) > >> -GenericValue lle_X_exp(FunctionType *FT, const vector > >> &Args) { > >> - assert(Args.size() == 1); > >> - GenericValue GV; > >> - GV.DoubleVal = exp(Args[0].DoubleVal); > >> - return GV; > >> -} > >> - > >> -// double sqrt(double) > >> -GenericValue lle_X_sqrt(FunctionType *FT, const vector > >> &Args) { > >> - assert(Args.size() == 1); > >> - GenericValue GV; > >> - GV.DoubleVal = sqrt(Args[0].DoubleVal); > >> - return GV; > >> -} > >> - > >> -// double log(double) > >> -GenericValue lle_X_log(FunctionType *FT, const vector > >> &Args) { > >> - assert(Args.size() == 1); > >> - GenericValue GV; > >> - GV.DoubleVal = log(Args[0].DoubleVal); > >> - return GV; > >> -} > >> - > >> -// double floor(double) > >> -GenericValue lle_X_floor(FunctionType *FT, const vector > >> &Args) { > >> - assert(Args.size() == 1); > >> - GenericValue GV; > >> - GV.DoubleVal = floor(Args[0].DoubleVal); > >> - return GV; > >> -} > >> - > >> -#ifdef HAVE_RAND48 > >> - > >> -// double drand48() > >> -GenericValue lle_X_drand48(FunctionType *FT, const > >> vector &Args) { > >> - assert(Args.empty()); > >> - GenericValue GV; > >> - GV.DoubleVal = drand48(); > >> - return GV; > >> -} > >> - > >> -// long lrand48() > >> -GenericValue lle_X_lrand48(FunctionType *FT, const > >> vector &Args) { > >> - assert(Args.empty()); > >> - GenericValue GV; > >> - GV.IntVal = APInt(32, lrand48()); > >> - return GV; > >> -} > >> - > >> -// void srand48(long) > >> -GenericValue lle_X_srand48(FunctionType *FT, const > >> vector &Args) { > >> - assert(Args.size() == 1); > >> - srand48(Args[0].IntVal.getZExtValue()); > >> - return GenericValue(); > >> -} > >> - > >> -#endif > >> - > >> -// int rand() > >> -GenericValue lle_X_rand(FunctionType *FT, const vector > >> &Args) { > >> - assert(Args.empty()); > >> - GenericValue GV; > >> - GV.IntVal = APInt(32, rand()); > >> - return GV; > >> -} > >> - > >> -// void srand(uint) > >> -GenericValue lle_X_srand(FunctionType *FT, const vector > >> &Args) { > >> - assert(Args.size() == 1); > >> - srand(Args[0].IntVal.getZExtValue()); > >> - return GenericValue(); > >> -} > >> - > >> -// int puts(const char*) > >> -GenericValue lle_X_puts(FunctionType *FT, const vector > >> &Args) { > >> - assert(Args.size() == 1); > >> - GenericValue GV; > >> - GV.IntVal = APInt(32, puts((char*)GVTOP(Args[0]))); > >> - return GV; > >> -} > >> - > >> -// int sprintf(sbyte *, sbyte *, ...) - a very rough implementation > >> to make > >> +// int sprintf(char *, const char *, ...) - a very rough > >> implementation to make > >> // output useful. > >> -GenericValue lle_X_sprintf(FunctionType *FT, const > >> vector &Args) { > >> +GenericValue lle_X_sprintf(const FunctionType *FT, > >> + const std::vector &Args) { > >> char *OutputBuffer = (char *)GVTOP(Args[0]); > >> const char *FmtStr = (const char *)GVTOP(Args[1]); > >> unsigned ArgNo = 2; > >> @@ -384,10 +381,12 @@ > >> return GV; > >> } > >> > >> -// int printf(sbyte *, ...) - a very rough implementation to make > >> output useful. > >> -GenericValue lle_X_printf(FunctionType *FT, const > >> vector &Args) { > >> +// int printf(const char *, ...) - a very rough implementation to > >> make output > >> +// useful. > >> +GenericValue lle_X_printf(const FunctionType *FT, > >> + const std::vector &Args) { > >> char Buffer[10000]; > >> - vector NewArgs; > >> + std::vector NewArgs; > >> NewArgs.push_back(PTOGV((void*)&Buffer[0])); > >> NewArgs.insert(NewArgs.end(), Args.begin(), Args.end()); > >> GenericValue GV = lle_X_sprintf(FT, NewArgs); > >> @@ -472,7 +471,8 @@ > >> } > >> > >> // int sscanf(const char *format, ...); > >> -GenericValue lle_X_sscanf(FunctionType *FT, const > >> vector &args) { > >> +GenericValue lle_X_sscanf(const FunctionType *FT, > >> + const std::vector &args) { > >> assert(args.size() < 10 && "Only handle up to 10 args to sscanf > >> right now!"); > >> > >> char *Args[10]; > >> @@ -488,7 +488,8 @@ > >> } > >> > >> // int scanf(const char *format, ...); > >> -GenericValue lle_X_scanf(FunctionType *FT, const vector > >> &args) { > >> +GenericValue lle_X_scanf(const FunctionType *FT, > >> + const std::vector &args) { > >> assert(args.size() < 10 && "Only handle up to 10 args to scanf right > >> now!"); > >> > >> char *Args[10]; > >> @@ -503,324 +504,33 @@ > >> return GV; > >> } > >> > >> - > >> -// int clock(void) - Profiling implementation > >> -GenericValue lle_i_clock(FunctionType *FT, const vector > >> &Args) { > >> - extern unsigned int clock(void); > >> - GenericValue GV; > >> - GV.IntVal = APInt(32, clock()); > >> - return GV; > >> -} > >> - > >> - > >> -//===----------------------------------------------------------------------===// > >> -// String Functions... > >> -//===----------------------------------------------------------------------===// > >> - > >> -// int strcmp(const char *S1, const char *S2); > >> -GenericValue lle_X_strcmp(FunctionType *FT, const > >> vector &Args) { > >> - assert(Args.size() == 2); > >> - GenericValue Ret; > >> - Ret.IntVal = APInt(32, strcmp((char*)GVTOP(Args[0]), > >> (char*)GVTOP(Args[1]))); > >> - return Ret; > >> -} > >> - > >> -// char *strcat(char *Dest, const char *src); > >> -GenericValue lle_X_strcat(FunctionType *FT, const > >> vector &Args) { > >> - assert(Args.size() == 2); > >> - assert(isa(FT->getReturnType()) &&"strcat must return > >> pointer"); > >> - return PTOGV(strcat((char*)GVTOP(Args[0]), (char*)GVTOP(Args[1]))); > >> -} > >> - > >> -// char *strcpy(char *Dest, const char *src); > >> -GenericValue lle_X_strcpy(FunctionType *FT, const > >> vector &Args) { > >> - assert(Args.size() == 2); > >> - assert(isa(FT->getReturnType()) &&"strcpy must return > >> pointer"); > >> - return PTOGV(strcpy((char*)GVTOP(Args[0]), (char*)GVTOP(Args[1]))); > >> -} > >> - > >> -static GenericValue size_t_to_GV (size_t n) { > >> - GenericValue Ret; > >> - if (sizeof (size_t) == sizeof (uint64_t)) { > >> - Ret.IntVal = APInt(64, n); > >> - } else { > >> - assert (sizeof (size_t) == sizeof (unsigned int)); > >> - Ret.IntVal = APInt(32, n); > >> - } > >> - return Ret; > >> -} > >> - > >> -static size_t GV_to_size_t (GenericValue GV) { > >> - size_t count; > >> - if (sizeof (size_t) == sizeof (uint64_t)) { > >> - count = (size_t)GV.IntVal.getZExtValue(); > >> - } else { > >> - assert (sizeof (size_t) == sizeof (unsigned int)); > >> - count = (size_t)GV.IntVal.getZExtValue(); > >> - } > >> - return count; > >> -} > >> - > >> -// size_t strlen(const char *src); > >> -GenericValue lle_X_strlen(FunctionType *FT, const > >> vector &Args) { > >> - assert(Args.size() == 1); > >> - size_t strlenResult = strlen ((char *) GVTOP (Args[0])); > >> - return size_t_to_GV (strlenResult); > >> -} > >> - > >> -// char *strdup(const char *src); > >> -GenericValue lle_X_strdup(FunctionType *FT, const > >> vector &Args) { > >> - assert(Args.size() == 1); > >> - assert(isa(FT->getReturnType()) && "strdup must return > >> pointer"); > >> - return PTOGV(strdup((char*)GVTOP(Args[0]))); > >> -} > >> - > >> -// char *__strdup(const char *src); > >> -GenericValue lle_X___strdup(FunctionType *FT, const > >> vector &Args) { > >> - assert(Args.size() == 1); > >> - assert(isa(FT->getReturnType()) &&"_strdup must return > >> pointer"); > >> - return PTOGV(strdup((char*)GVTOP(Args[0]))); > >> -} > >> - > >> -// void *memset(void *S, int C, size_t N) > >> -GenericValue lle_X_memset(FunctionType *FT, const > >> vector &Args) { > >> - assert(Args.size() == 3); > >> - size_t count = GV_to_size_t (Args[2]); > >> - assert(isa(FT->getReturnType()) && "memset must return > >> pointer"); > >> - return PTOGV(memset(GVTOP(Args[0]), > >> uint32_t(Args[1].IntVal.getZExtValue()), > >> - count)); > >> -} > >> - > >> -// void *memcpy(void *Dest, void *src, size_t Size); > >> -GenericValue lle_X_memcpy(FunctionType *FT, const > >> vector &Args) { > >> - assert(Args.size() == 3); > >> - assert(isa(FT->getReturnType()) && "memcpy must return > >> pointer"); > >> - size_t count = GV_to_size_t (Args[2]); > >> - return PTOGV(memcpy((char*)GVTOP(Args[0]), (char*)GVTOP(Args[1]), > >> count)); > >> -} > >> - > >> -// void *memcpy(void *Dest, void *src, size_t Size); > >> -GenericValue lle_X_memmove(FunctionType *FT, const > >> vector &Args) { > >> - assert(Args.size() == 3); > >> - assert(isa(FT->getReturnType()) && "memmove must > >> return pointer"); > >> - size_t count = GV_to_size_t (Args[2]); > >> - return PTOGV(memmove((char*)GVTOP(Args[0]), (char*)GVTOP(Args[1]), > >> count)); > >> -} > >> - > >> -//===----------------------------------------------------------------------===// > >> -// IO Functions... > >> -//===----------------------------------------------------------------------===// > >> - > >> -// **MOBILE CODE** - Turn a pointer in the host address space into a legit > >> pointer in > >> -// the interpreter address space. This is an identity transformation. > >> -#define **MOBILE CODE**(ptr) ((FILE*)ptr) > >> - > >> -// FILE *fopen(const char *filename, const char *mode); > >> -GenericValue lle_X_fopen(FunctionType *FT, const vector > >> &Args) { > >> - assert(Args.size() == 2); > >> - assert(isa(FT->getReturnType()) && "fopen must return > >> pointer"); > >> - return PTOGV(fopen((const char *)GVTOP(Args[0]), > >> - (const char *)GVTOP(Args[1]))); > >> -} > >> - > >> -// int fclose(FILE *F); > >> -GenericValue lle_X_fclose(FunctionType *FT, const > >> vector &Args) { > >> - assert(Args.size() == 1); > >> - GenericValue GV; > >> - GV.IntVal = APInt(32, fclose(**MOBILE CODE**(GVTOP(Args[0])))); > >> - return GV; > >> -} > >> - > >> -// int feof(FILE *stream); > >> -GenericValue lle_X_feof(FunctionType *FT, const vector > >> &Args) { > >> - assert(Args.size() == 1); > >> - GenericValue GV; > >> - > >> - GV.IntVal = APInt(32, feof(**MOBILE CODE**(GVTOP(Args[0])))); > >> - return GV; > >> -} > >> - > >> -// size_t fread(void *ptr, size_t size, size_t nitems, FILE *stream); > >> -GenericValue lle_X_fread(FunctionType *FT, const vector > >> &Args) { > >> - assert(Args.size() == 4); > >> - size_t result; > >> - > >> - result = fread((void*)GVTOP(Args[0]), GV_to_size_t (Args[1]), > >> - GV_to_size_t (Args[2]), **MOBILE CODE**(GVTOP(Args[3]))); > >> - return size_t_to_GV (result); > >> -} > >> - > >> -// size_t fwrite(const void *ptr, size_t size, size_t nitems, FILE > >> *stream); > >> -GenericValue lle_X_fwrite(FunctionType *FT, const > >> vector &Args) { > >> - assert(Args.size() == 4); > >> - size_t result; > >> - > >> - result = fwrite((void*)GVTOP(Args[0]), GV_to_size_t (Args[1]), > >> - GV_to_size_t (Args[2]), **MOBILE CODE**(GVTOP(Args[3]))); > >> - return size_t_to_GV (result); > >> -} > >> - > >> -// char *fgets(char *s, int n, FILE *stream); > >> -GenericValue lle_X_fgets(FunctionType *FT, const vector > >> &Args) { > >> - assert(Args.size() == 3); > >> - return PTOGV(fgets((char*)GVTOP(Args[0]), > >> Args[1].IntVal.getZExtValue(), > >> - **MOBILE CODE**(GVTOP(Args[2])))); > >> -} > >> - > >> -// FILE *freopen(const char *path, const char *mode, FILE *stream); > >> -GenericValue lle_X_freopen(FunctionType *FT, const > >> vector &Args) { > >> - assert(Args.size() == 3); > >> - assert(isa(FT->getReturnType()) &&"freopen must return > >> pointer"); > >> - return PTOGV(freopen((char*)GVTOP(Args[0]), (char*)GVTOP(Args[1]), > >> - **MOBILE CODE**(GVTOP(Args[2])))); > >> -} > >> - > >> -// int fflush(FILE *stream); > >> -GenericValue lle_X_fflush(FunctionType *FT, const > >> vector &Args) { > >> - assert(Args.size() == 1); > >> - GenericValue GV; > >> - GV.IntVal = APInt(32, fflush(**MOBILE CODE**(GVTOP(Args[0])))); > >> - return GV; > >> -} > >> - > >> -// int getc(FILE *stream); > >> -GenericValue lle_X_getc(FunctionType *FT, const vector > >> &Args) { > >> - assert(Args.size() == 1); > >> - GenericValue GV; > >> - GV.IntVal = APInt(32, getc(**MOBILE CODE**(GVTOP(Args[0])))); > >> - return GV; > >> -} > >> - > >> -// int _IO_getc(FILE *stream); > >> -GenericValue lle_X__IO_getc(FunctionType *F, const > >> vector &Args) { > >> - return lle_X_getc(F, Args); > >> -} > >> - > >> -// int fputc(int C, FILE *stream); > >> -GenericValue lle_X_fputc(FunctionType *FT, const vector > >> &Args) { > >> - assert(Args.size() == 2); > >> - GenericValue GV; > >> - GV.IntVal = APInt(32, fputc(Args[0].IntVal.getZExtValue(), > >> - **MOBILE CODE**(GVTOP(Args[1])))); > >> - return GV; > >> -} > >> - > >> -// int ungetc(int C, FILE *stream); > >> -GenericValue lle_X_ungetc(FunctionType *FT, const > >> vector &Args) { > >> - assert(Args.size() == 2); > >> - GenericValue GV; > >> - GV.IntVal = APInt(32, ungetc(Args[0].IntVal.getZExtValue(), > >> - **MOBILE CODE**(GVTOP(Args[1])))); > >> - return GV; > >> -} > >> - > >> -// int ferror (FILE *stream); > >> -GenericValue lle_X_ferror(FunctionType *FT, const > >> vector &Args) { > >> - assert(Args.size() == 1); > >> - GenericValue GV; > >> - GV.IntVal = APInt(32, ferror (**MOBILE CODE**(GVTOP(Args[0])))); > >> - return GV; > >> -} > >> - > >> -// int fprintf(FILE *,sbyte *, ...) - a very rough implementation to > >> make output > >> -// useful. > >> -GenericValue lle_X_fprintf(FunctionType *FT, const > >> vector &Args) { > >> +// int fprintf(FILE *, const char *, ...) - a very rough > >> implementation to make > >> +// output useful. > >> +GenericValue lle_X_fprintf(const FunctionType *FT, > >> + const std::vector &Args) { > >> assert(Args.size() >= 2); > >> char Buffer[10000]; > >> - vector NewArgs; > >> + std::vector NewArgs; > >> NewArgs.push_back(PTOGV(Buffer)); > >> NewArgs.insert(NewArgs.end(), Args.begin()+1, Args.end()); > >> GenericValue GV = lle_X_sprintf(FT, NewArgs); > >> > >> - fputs(Buffer, **MOBILE CODE**(GVTOP(Args[0]))); > >> - return GV; > >> -} > >> - > >> -// int __cxa_guard_acquire (__guard *g); > >> -GenericValue lle_X___cxa_guard_acquire(FunctionType *FT, > >> - const vector > >> &Args) { > >> - assert(Args.size() == 1); > >> - GenericValue GV; > >> -#ifdef __linux__ > >> - GV.IntVal = APInt(32, __cxxabiv1::__cxa_guard_acquire ( > >> - (__cxxabiv1::__guard*)GVTOP(Args[0]))); > >> -#else > >> - assert(0 && "Can't call __cxa_guard_acquire on this platform"); > >> -#endif > >> + fputs(Buffer, (FILE *) GVTOP(Args[0])); > >> return GV; > >> } > >> > >> -// void __cxa_guard_release (__guard *g); > >> -GenericValue lle_X___cxa_guard_release(FunctionType *FT, > >> - const vector > >> &Args) { > >> - assert(Args.size() == 1); > >> -#ifdef __linux__ > >> - __cxxabiv1::__cxa_guard_release ((__cxxabiv1::__guard*)GVTOP(Args[0])); > >> -#else > >> - assert(0 && "Can't call __cxa_guard_release on this platform"); > >> -#endif > >> - return GenericValue(); > >> -} > >> - > >> } // End extern "C" > >> > >> > >> void Interpreter::initializeExternalFunctions() { > >> - FuncNames["lle_X_putchar"] = lle_X_putchar; > >> - FuncNames["lle_X__IO_putc"] = lle_X__IO_putc; > >> + FuncNames["lle_X_atexit"] = lle_X_atexit; > >> FuncNames["lle_X_exit"] = lle_X_exit; > >> FuncNames["lle_X_abort"] = lle_X_abort; > >> - FuncNames["lle_X_malloc"] = lle_X_malloc; > >> - FuncNames["lle_X_calloc"] = lle_X_calloc; > >> - FuncNames["lle_X_realloc"] = lle_X_realloc; > >> - FuncNames["lle_X_free"] = lle_X_free; > >> - FuncNames["lle_X_atoi"] = lle_X_atoi; > >> - FuncNames["lle_X_pow"] = lle_X_pow; > >> - FuncNames["lle_X_sin"] = lle_X_sin; > >> - FuncNames["lle_X_cos"] = lle_X_cos; > >> - FuncNames["lle_X_exp"] = lle_X_exp; > >> - FuncNames["lle_X_log"] = lle_X_log; > >> - FuncNames["lle_X_floor"] = lle_X_floor; > >> - FuncNames["lle_X_srand"] = lle_X_srand; > >> - FuncNames["lle_X_rand"] = lle_X_rand; > >> -#ifdef HAVE_RAND48 > >> - FuncNames["lle_X_drand48"] = lle_X_drand48; > >> - FuncNames["lle_X_srand48"] = lle_X_srand48; > >> - FuncNames["lle_X_lrand48"] = lle_X_lrand48; > >> -#endif > >> - FuncNames["lle_X_sqrt"] = lle_X_sqrt; > >> - FuncNames["lle_X_puts"] = lle_X_puts; > >> + > >> FuncNames["lle_X_printf"] = lle_X_printf; > >> FuncNames["lle_X_sprintf"] = lle_X_sprintf; > >> FuncNames["lle_X_sscanf"] = lle_X_sscanf; > >> FuncNames["lle_X_scanf"] = lle_X_scanf; > >> - FuncNames["lle_i_clock"] = lle_i_clock; > >> - > >> - FuncNames["lle_X_strcmp"] = lle_X_strcmp; > >> - FuncNames["lle_X_strcat"] = lle_X_strcat; > >> - FuncNames["lle_X_strcpy"] = lle_X_strcpy; > >> - FuncNames["lle_X_strlen"] = lle_X_strlen; > >> - FuncNames["lle_X___strdup"] = lle_X___strdup; > >> - FuncNames["lle_X_memset"] = lle_X_memset; > >> - FuncNames["lle_X_memcpy"] = lle_X_memcpy; > >> - FuncNames["lle_X_memmove"] = lle_X_memmove; > >> - > >> - FuncNames["lle_X_fopen"] = lle_X_fopen; > >> - FuncNames["lle_X_fclose"] = lle_X_fclose; > >> - FuncNames["lle_X_feof"] = lle_X_feof; > >> - FuncNames["lle_X_fread"] = lle_X_fread; > >> - FuncNames["lle_X_fwrite"] = lle_X_fwrite; > >> - FuncNames["lle_X_fgets"] = lle_X_fgets; > >> - FuncNames["lle_X_fflush"] = lle_X_fflush; > >> - FuncNames["lle_X_fgetc"] = lle_X_getc; > >> - FuncNames["lle_X_getc"] = lle_X_getc; > >> - FuncNames["lle_X__IO_getc"] = lle_X__IO_getc; > >> - FuncNames["lle_X_fputc"] = lle_X_fputc; > >> - FuncNames["lle_X_ungetc"] = lle_X_ungetc; > >> FuncNames["lle_X_fprintf"] = lle_X_fprintf; > >> - FuncNames["lle_X_freopen"] = lle_X_freopen; > >> - > >> - FuncNames["lle_X___cxa_guard_acquire"] = lle_X___cxa_guard_acquire; > >> - FuncNames["lle_X____cxa_guard_release"] = lle_X___cxa_guard_release; > >> } > >> > >> > >> > >> _______________________________________________ > >> 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 > > _______________________________________________ > 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 Jan 22 09:07:17 2009 From: baldrick at free.fr (Duncan Sands) Date: Thu, 22 Jan 2009 15:07:17 -0000 Subject: [llvm-commits] [llvm] r62764 - /llvm/trunk/test/FrontendC++/2006-11-06-StackTrace.cpp Message-ID: <200901221507.n0MF7HPI012851@zion.cs.uiuc.edu> Author: baldrick Date: Thu Jan 22 09:07:15 2009 New Revision: 62764 URL: http://llvm.org/viewvc/llvm-project?rev=62764&view=rev Log: This passes on linux. Modified: llvm/trunk/test/FrontendC++/2006-11-06-StackTrace.cpp Modified: llvm/trunk/test/FrontendC++/2006-11-06-StackTrace.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/FrontendC%2B%2B/2006-11-06-StackTrace.cpp?rev=62764&r1=62763&r2=62764&view=diff ============================================================================== --- llvm/trunk/test/FrontendC++/2006-11-06-StackTrace.cpp (original) +++ llvm/trunk/test/FrontendC++/2006-11-06-StackTrace.cpp Thu Jan 22 09:07:15 2009 @@ -11,7 +11,7 @@ // Only works on ppc, x86 and x86_64. Should generalize? // FIXME: Un-XFAIL this test for Linux when debug stuff is working again. -// XFAIL: alpha|ia64|arm|linux +// XFAIL: alpha|ia64|arm #include From baldrick at free.fr Thu Jan 22 09:37:31 2009 From: baldrick at free.fr (Duncan Sands) Date: Thu, 22 Jan 2009 15:37:31 -0000 Subject: [llvm-commits] [llvm] r62765 - /llvm/trunk/test/FrontendC++/2006-11-06-StackTrace.cpp Message-ID: <200901221537.n0MFbVMC014034@zion.cs.uiuc.edu> Author: baldrick Date: Thu Jan 22 09:37:29 2009 New Revision: 62765 URL: http://llvm.org/viewvc/llvm-project?rev=62765&view=rev Log: Remove no-longer relevant comment. Pointed out by Gabor. Modified: llvm/trunk/test/FrontendC++/2006-11-06-StackTrace.cpp Modified: llvm/trunk/test/FrontendC++/2006-11-06-StackTrace.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/FrontendC%2B%2B/2006-11-06-StackTrace.cpp?rev=62765&r1=62764&r2=62765&view=diff ============================================================================== --- llvm/trunk/test/FrontendC++/2006-11-06-StackTrace.cpp (original) +++ llvm/trunk/test/FrontendC++/2006-11-06-StackTrace.cpp Thu Jan 22 09:37:29 2009 @@ -10,7 +10,6 @@ // RUN: grep {#7 0x.* in main.*(argc=\[12\],.*argv=.*)} // Only works on ppc, x86 and x86_64. Should generalize? -// FIXME: Un-XFAIL this test for Linux when debug stuff is working again. // XFAIL: alpha|ia64|arm #include From bob.wilson at apple.com Thu Jan 22 11:39:32 2009 From: bob.wilson at apple.com (Bob Wilson) Date: Thu, 22 Jan 2009 17:39:32 -0000 Subject: [llvm-commits] [llvm] r62768 - in /llvm/trunk: include/llvm/CodeGen/SelectionDAG.h lib/CodeGen/SelectionDAG/DAGCombiner.cpp lib/CodeGen/SelectionDAG/LegalizeDAG.cpp lib/CodeGen/SelectionDAG/SelectionDAG.cpp lib/CodeGen/SelectionDAG/TargetLowering.cpp lib/Target/X86/X86ISelLowering.cpp Message-ID: <200901221739.n0MHdWPP017909@zion.cs.uiuc.edu> Author: bwilson Date: Thu Jan 22 11:39:32 2009 New Revision: 62768 URL: http://llvm.org/viewvc/llvm-project?rev=62768&view=rev Log: Add SelectionDAG::getNOT method to construct bitwise NOT operations, corresponding to the "not" and "vnot" PatFrags. Use the new method in some places where it seems appropriate. Modified: llvm/trunk/include/llvm/CodeGen/SelectionDAG.h llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp llvm/trunk/lib/CodeGen/SelectionDAG/TargetLowering.cpp llvm/trunk/lib/Target/X86/X86ISelLowering.cpp Modified: llvm/trunk/include/llvm/CodeGen/SelectionDAG.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/SelectionDAG.h?rev=62768&r1=62767&r2=62768&view=diff ============================================================================== --- llvm/trunk/include/llvm/CodeGen/SelectionDAG.h (original) +++ llvm/trunk/include/llvm/CodeGen/SelectionDAG.h Thu Jan 22 11:39:32 2009 @@ -366,6 +366,9 @@ /// value assuming it was the smaller SrcTy value. SDValue getZeroExtendInReg(SDValue Op, MVT SrcTy); + /// getNOT - Create a bitwise NOT operation as (XOR Val, -1). + SDValue getNOT(SDValue Val, MVT VT); + /// getCALLSEQ_START - Return a new CALLSEQ_START node, which always must have /// a flag result (to ensure it's not CSE'd). SDValue getCALLSEQ_START(SDValue Chain, SDValue Op) { Modified: llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp?rev=62768&r1=62767&r2=62768&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp Thu Jan 22 11:39:32 2009 @@ -2759,15 +2759,15 @@ } // fold select C, 0, X -> ~C & X if (VT == VT0 && VT == MVT::i1 && N1C && N1C->isNullValue()) { - SDValue XORNode = DAG.getNode(ISD::XOR, VT, N0, DAG.getConstant(1, VT)); - AddToWorkList(XORNode.getNode()); - return DAG.getNode(ISD::AND, VT, XORNode, N2); + SDValue NOTNode = DAG.getNOT(N0, VT); + AddToWorkList(NOTNode.getNode()); + return DAG.getNode(ISD::AND, VT, NOTNode, N2); } // fold select C, X, 1 -> ~C | X if (VT == VT0 && VT == MVT::i1 && N2C && N2C->getAPIntValue() == 1) { - SDValue XORNode = DAG.getNode(ISD::XOR, VT, N0, DAG.getConstant(1, VT)); - AddToWorkList(XORNode.getNode()); - return DAG.getNode(ISD::OR, VT, XORNode, N1); + SDValue NOTNode = DAG.getNOT(N0, VT); + AddToWorkList(NOTNode.getNode()); + return DAG.getNode(ISD::OR, VT, NOTNode, N1); } // fold select C, X, 0 -> C & X // FIXME: this should check for C type == X type, not i1? @@ -5574,8 +5574,7 @@ if (N1C && N1C->isNullValue() && CC == ISD::SETGT) { SDValue NegN0 = DAG.getNode(ISD::SUB, XType, DAG.getConstant(0, XType), N0); - SDValue NotN0 = DAG.getNode(ISD::XOR, XType, N0, - DAG.getConstant(~0ULL, XType)); + SDValue NotN0 = DAG.getNOT(N0, XType); return DAG.getNode(ISD::SRL, XType, DAG.getNode(ISD::AND, XType, NegN0, NotN0), DAG.getConstant(XType.getSizeInBits()-1, Modified: llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp?rev=62768&r1=62767&r2=62768&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp Thu Jan 22 11:39:32 2009 @@ -6318,7 +6318,7 @@ SDValue Tmp3 = DAG.getConstant(1ULL << i, ShVT); Op = DAG.getNode(ISD::OR, VT, Op, DAG.getNode(ISD::SRL, VT, Op, Tmp3)); } - Op = DAG.getNode(ISD::XOR, VT, Op, DAG.getConstant(~0ULL, VT)); + Op = DAG.getNOT(Op, VT); return DAG.getNode(ISD::CTPOP, VT, Op); } case ISD::CTTZ: { @@ -6327,9 +6327,7 @@ // { return 32 - nlz(~x & (x-1)); } // see also http://www.hackersdelight.org/HDcode/ntz.cc MVT VT = Op.getValueType(); - SDValue Tmp2 = DAG.getConstant(~0ULL, VT); - SDValue Tmp3 = DAG.getNode(ISD::AND, VT, - DAG.getNode(ISD::XOR, VT, Op, Tmp2), + SDValue Tmp3 = DAG.getNode(ISD::AND, VT, DAG.getNOT(Op, VT), DAG.getNode(ISD::SUB, VT, Op, DAG.getConstant(1, VT))); // If ISD::CTLZ is legal and CTPOP isn't, then do that instead. if (!TLI.isOperationLegal(ISD::CTPOP, VT) && Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp?rev=62768&r1=62767&r2=62768&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp Thu Jan 22 11:39:32 2009 @@ -816,6 +816,21 @@ getConstant(Imm, Op.getValueType())); } +/// getNOT - Create a bitwise NOT operation as (XOR Val, -1). +/// +SDValue SelectionDAG::getNOT(SDValue Val, MVT VT) { + SDValue NegOne; + if (VT.isVector()) { + MVT EltVT = VT.getVectorElementType(); + SDValue NegOneElt = getConstant(EltVT.getIntegerVTBitMask(), EltVT); + std::vector NegOnes(VT.getVectorNumElements(), NegOneElt); + NegOne = getNode(ISD::BUILD_VECTOR, VT, &NegOnes[0], NegOnes.size()); + } else + NegOne = getConstant(VT.getIntegerVTBitMask(), VT); + + return getNode(ISD::XOR, VT, Val, NegOne); +} + SDValue SelectionDAG::getConstant(uint64_t Val, MVT VT, bool isT) { MVT EltVT = VT.isVector() ? VT.getVectorElementType() : VT; return getConstant(APInt(EltVT.getSizeInBits(), Val), VT, isT); Modified: llvm/trunk/lib/CodeGen/SelectionDAG/TargetLowering.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/TargetLowering.cpp?rev=62768&r1=62767&r2=62768&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/TargetLowering.cpp (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/TargetLowering.cpp Thu Jan 22 11:39:32 2009 @@ -1798,39 +1798,39 @@ if (N0.getValueType() == MVT::i1 && foldBooleans) { switch (Cond) { default: assert(0 && "Unknown integer setcc!"); - case ISD::SETEQ: // X == Y -> (X^Y)^1 + case ISD::SETEQ: // X == Y -> ~(X^Y) Temp = DAG.getNode(ISD::XOR, MVT::i1, N0, N1); - N0 = DAG.getNode(ISD::XOR, MVT::i1, Temp, DAG.getConstant(1, MVT::i1)); + N0 = DAG.getNOT(Temp, MVT::i1); if (!DCI.isCalledByLegalizer()) DCI.AddToWorklist(Temp.getNode()); break; case ISD::SETNE: // X != Y --> (X^Y) N0 = DAG.getNode(ISD::XOR, MVT::i1, N0, N1); break; - case ISD::SETGT: // X >s Y --> X == 0 & Y == 1 --> X^1 & Y - case ISD::SETULT: // X X == 0 & Y == 1 --> X^1 & Y - Temp = DAG.getNode(ISD::XOR, MVT::i1, N0, DAG.getConstant(1, MVT::i1)); + case ISD::SETGT: // X >s Y --> X == 0 & Y == 1 --> ~X & Y + case ISD::SETULT: // X X == 0 & Y == 1 --> ~X & Y + Temp = DAG.getNOT(N0, MVT::i1); N0 = DAG.getNode(ISD::AND, MVT::i1, N1, Temp); if (!DCI.isCalledByLegalizer()) DCI.AddToWorklist(Temp.getNode()); break; - case ISD::SETLT: // X X == 1 & Y == 0 --> Y^1 & X - case ISD::SETUGT: // X >u Y --> X == 1 & Y == 0 --> Y^1 & X - Temp = DAG.getNode(ISD::XOR, MVT::i1, N1, DAG.getConstant(1, MVT::i1)); + case ISD::SETLT: // X X == 1 & Y == 0 --> ~Y & X + case ISD::SETUGT: // X >u Y --> X == 1 & Y == 0 --> ~Y & X + Temp = DAG.getNOT(N1, MVT::i1); N0 = DAG.getNode(ISD::AND, MVT::i1, N0, Temp); if (!DCI.isCalledByLegalizer()) DCI.AddToWorklist(Temp.getNode()); break; - case ISD::SETULE: // X <=u Y --> X == 0 | Y == 1 --> X^1 | Y - case ISD::SETGE: // X >=s Y --> X == 0 | Y == 1 --> X^1 | Y - Temp = DAG.getNode(ISD::XOR, MVT::i1, N0, DAG.getConstant(1, MVT::i1)); + case ISD::SETULE: // X <=u Y --> X == 0 | Y == 1 --> ~X | Y + case ISD::SETGE: // X >=s Y --> X == 0 | Y == 1 --> ~X | Y + Temp = DAG.getNOT(N0, MVT::i1); N0 = DAG.getNode(ISD::OR, MVT::i1, N1, Temp); if (!DCI.isCalledByLegalizer()) DCI.AddToWorklist(Temp.getNode()); break; - case ISD::SETUGE: // X >=u Y --> X == 1 | Y == 0 --> Y^1 | X - case ISD::SETLE: // X <=s Y --> X == 1 | Y == 0 --> Y^1 | X - Temp = DAG.getNode(ISD::XOR, MVT::i1, N1, DAG.getConstant(1, MVT::i1)); + case ISD::SETUGE: // X >=u Y --> X == 1 | Y == 0 --> ~Y | X + case ISD::SETLE: // X <=s Y --> X == 1 | Y == 0 --> ~Y | X + Temp = DAG.getNOT(N1, MVT::i1); N0 = DAG.getNode(ISD::OR, MVT::i1, N0, Temp); break; } Modified: llvm/trunk/lib/Target/X86/X86ISelLowering.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86ISelLowering.cpp?rev=62768&r1=62767&r2=62768&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/X86ISelLowering.cpp (original) +++ llvm/trunk/lib/Target/X86/X86ISelLowering.cpp Thu Jan 22 11:39:32 2009 @@ -5253,14 +5253,9 @@ SDValue Result = DAG.getNode(Opc, VT, Op0, Op1); // If the logical-not of the result is required, perform that now. - if (Invert) { - MVT EltVT = VT.getVectorElementType(); - SDValue NegOne = DAG.getConstant(EltVT.getIntegerVTBitMask(), EltVT); - std::vector NegOnes(VT.getVectorNumElements(), NegOne); - SDValue NegOneV = DAG.getNode(ISD::BUILD_VECTOR, VT, &NegOnes[0], - NegOnes.size()); - Result = DAG.getNode(ISD::XOR, VT, Result, NegOneV); - } + if (Invert) + Result = DAG.getNOT(Result, VT); + return Result; } From dpatel at apple.com Thu Jan 22 12:28:11 2009 From: dpatel at apple.com (Devang Patel) Date: Thu, 22 Jan 2009 18:28:11 -0000 Subject: [llvm-commits] [llvm] r62770 - in /llvm/trunk/test: CodeGen/X86/2006-07-19-ATTAsm.ll DebugInfo/2009-01-15-RecordVariableCrash.ll Message-ID: <200901221828.n0MISBaY019703@zion.cs.uiuc.edu> Author: dpatel Date: Thu Jan 22 12:28:11 2009 New Revision: 62770 URL: http://llvm.org/viewvc/llvm-project?rev=62770&view=rev Log: Do not use buggy llvm-gcc to generate testcases. Modified: llvm/trunk/test/CodeGen/X86/2006-07-19-ATTAsm.ll llvm/trunk/test/DebugInfo/2009-01-15-RecordVariableCrash.ll Modified: llvm/trunk/test/CodeGen/X86/2006-07-19-ATTAsm.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2006-07-19-ATTAsm.ll?rev=62770&r1=62769&r2=62770&view=diff ============================================================================== --- llvm/trunk/test/CodeGen/X86/2006-07-19-ATTAsm.ll (original) +++ llvm/trunk/test/CodeGen/X86/2006-07-19-ATTAsm.ll Thu Jan 22 12:28:11 2009 @@ -10,7 +10,7 @@ %llvm.dbg.global_variable.type = type { i32, { }*, { }*, i8*, i8 *, i8*, { }*, i32, { }*, i1, i1, { }* } @x = global i32 0 ; [#uses=1] @llvm.dbg.global_variable = internal constant %llvm.dbg.global_variable.type { - i32 458804, + i32 327732, { }* bitcast (%llvm.dbg.anchor.type* @llvm.dbg.global_variables to { }*), { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*), i8* getelementptr ([2 x i8]* @str, i64 0, i64 0), Modified: llvm/trunk/test/DebugInfo/2009-01-15-RecordVariableCrash.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/2009-01-15-RecordVariableCrash.ll?rev=62770&r1=62769&r2=62770&view=diff ============================================================================== --- llvm/trunk/test/DebugInfo/2009-01-15-RecordVariableCrash.ll (original) +++ llvm/trunk/test/DebugInfo/2009-01-15-RecordVariableCrash.ll Thu Jan 22 12:28:11 2009 @@ -22,29 +22,27 @@ @.str5 = internal constant [2 x i8] c"i\00", section "llvm.metadata" ; <[2 x i8]*> [#uses=1] @llvm.dbg.variable = internal constant %llvm.dbg.variable.type { i32 459008, { }* bitcast (%llvm.dbg.subprogram.type* @llvm.dbg.subprogram to { }*), i8* getelementptr ([2 x i8]* @.str5, i32 0, i32 0), { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*), i32 22, { }* bitcast (%llvm.dbg.basictype.type* @llvm.dbg.basictype to { }*), i8* getelementptr ([4 x i8]* @.str, i32 0, i32 0), i8* getelementptr ([5 x i8]* @.str1, i32 0, i32 0) }, section "llvm.metadata" ; <%llvm.dbg.variable.type*> [#uses=1] @.str6 = internal constant [8 x i8] c"islower\00", section "llvm.metadata" ; <[8 x i8]*> [#uses=1] - at .str7 = internal constant [8 x i8] c"ctype.h\00", section "llvm.metadata" ; <[8 x i8]*> [#uses=1] - at .str8 = internal constant [13 x i8] c"/usr/include\00", section "llvm.metadata" ; <[13 x i8]*> [#uses=1] - at llvm.dbg.subprogram9 = internal constant %llvm.dbg.subprogram.type { i32 458798, { }* bitcast (%llvm.dbg.anchor.type* @llvm.dbg.subprograms to { }*), { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*), i8* getelementptr ([8 x i8]* @.str6, i32 0, i32 0), i8* getelementptr ([8 x i8]* @.str6, i32 0, i32 0), i8* null, { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*), i32 267, { }* bitcast (%llvm.dbg.basictype.type* @llvm.dbg.basictype to { }*), i1 true, i1 true, i8* getelementptr ([8 x i8]* @.str7, i32 0, i32 0), i8* getelementptr ([13 x i8]* @.str8, i32 0, i32 0) }, section "llvm.metadata" ; <%llvm.dbg.subprogram.type*> [#uses=1] + at llvm.dbg.subprogram9 = internal constant %llvm.dbg.subprogram.type { i32 458798, { }* bitcast (%llvm.dbg.anchor.type* @llvm.dbg.subprograms to { }*), { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*), i8* getelementptr ([8 x i8]* @.str6, i32 0, i32 0), i8* getelementptr ([8 x i8]* @.str6, i32 0, i32 0), i8* null, { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*), i32 267, { }* bitcast (%llvm.dbg.basictype.type* @llvm.dbg.basictype to { }*), i1 true, i1 true, i8* getelementptr ([4 x i8]* @.str, i32 0, i32 0), i8* getelementptr ([5 x i8]* @.str1, i32 0, i32 0) }, section "llvm.metadata" ; <%llvm.dbg.subprogram.type*> [#uses=1] @.str10 = internal constant [3 x i8] c"_c\00", section "llvm.metadata" ; <[3 x i8]*> [#uses=1] - at llvm.dbg.variable11 = internal constant %llvm.dbg.variable.type { i32 459009, { }* bitcast (%llvm.dbg.subprogram.type* @llvm.dbg.subprogram9 to { }*), i8* getelementptr ([3 x i8]* @.str10, i32 0, i32 0), { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*), i32 266, { }* bitcast (%llvm.dbg.basictype.type* @llvm.dbg.basictype to { }*), i8* getelementptr ([8 x i8]* @.str7, i32 0, i32 0), i8* getelementptr ([13 x i8]* @.str8, i32 0, i32 0) }, section "llvm.metadata" ; <%llvm.dbg.variable.type*> [#uses=1] + at llvm.dbg.variable11 = internal constant %llvm.dbg.variable.type { i32 459009, { }* bitcast (%llvm.dbg.subprogram.type* @llvm.dbg.subprogram9 to { }*), i8* getelementptr ([3 x i8]* @.str10, i32 0, i32 0), { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*), i32 266, { }* bitcast (%llvm.dbg.basictype.type* @llvm.dbg.basictype to { }*), i8* getelementptr ([4 x i8]* @.str, i32 0, i32 0), i8* getelementptr ([5 x i8]* @.str1, i32 0, i32 0) }, section "llvm.metadata" ; <%llvm.dbg.variable.type*> [#uses=1] @.str12 = internal constant [9 x i8] c"__istype\00", section "llvm.metadata" ; <[9 x i8]*> [#uses=1] - at llvm.dbg.subprogram13 = internal constant %llvm.dbg.subprogram.type { i32 458798, { }* bitcast (%llvm.dbg.anchor.type* @llvm.dbg.subprograms to { }*), { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*), i8* getelementptr ([9 x i8]* @.str12, i32 0, i32 0), i8* getelementptr ([9 x i8]* @.str12, i32 0, i32 0), i8* null, { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*), i32 171, { }* bitcast (%llvm.dbg.basictype.type* @llvm.dbg.basictype to { }*), i1 true, i1 true, i8* getelementptr ([8 x i8]* @.str7, i32 0, i32 0), i8* getelementptr ([13 x i8]* @.str8, i32 0, i32 0) }, section "llvm.metadata" ; <%llvm.dbg.subprogram.type*> [#uses=1] + at llvm.dbg.subprogram13 = internal constant %llvm.dbg.subprogram.type { i32 458798, { }* bitcast (%llvm.dbg.anchor.type* @llvm.dbg.subprograms to { }*), { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*), i8* getelementptr ([9 x i8]* @.str12, i32 0, i32 0), i8* getelementptr ([9 x i8]* @.str12, i32 0, i32 0), i8* null, { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*), i32 171, { }* bitcast (%llvm.dbg.basictype.type* @llvm.dbg.basictype to { }*), i1 true, i1 true, i8* getelementptr ([4 x i8]* @.str, i32 0, i32 0), i8* getelementptr ([5 x i8]* @.str1, i32 0, i32 0) }, section "llvm.metadata" ; <%llvm.dbg.subprogram.type*> [#uses=1] @.str14 = internal constant [19 x i8] c"__darwin_ct_rune_t\00", section "llvm.metadata" ; <[19 x i8]*> [#uses=1] @.str15 = internal constant [9 x i8] c"_types.h\00", section "llvm.metadata" ; <[9 x i8]*> [#uses=1] @.str16 = internal constant [18 x i8] c"/usr/include/i386\00", section "llvm.metadata" ; <[18 x i8]*> [#uses=1] @llvm.dbg.derivedtype = internal constant %llvm.dbg.derivedtype.type { i32 458774, { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*), i8* getelementptr ([19 x i8]* @.str14, i32 0, i32 0), { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*), i32 70, i64 0, i64 0, i64 0, i32 0, { }* bitcast (%llvm.dbg.basictype.type* @llvm.dbg.basictype to { }*), i8* getelementptr ([9 x i8]* @.str15, i32 0, i32 0), i8* getelementptr ([18 x i8]* @.str16, i32 0, i32 0) }, section "llvm.metadata" ; <%llvm.dbg.derivedtype.type*> [#uses=1] - at llvm.dbg.variable17 = internal constant %llvm.dbg.variable.type { i32 459009, { }* bitcast (%llvm.dbg.subprogram.type* @llvm.dbg.subprogram13 to { }*), i8* getelementptr ([3 x i8]* @.str10, i32 0, i32 0), { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*), i32 170, { }* bitcast (%llvm.dbg.derivedtype.type* @llvm.dbg.derivedtype to { }*), i8* getelementptr ([8 x i8]* @.str7, i32 0, i32 0), i8* getelementptr ([13 x i8]* @.str8, i32 0, i32 0) }, section "llvm.metadata" ; <%llvm.dbg.variable.type*> [#uses=1] + at llvm.dbg.variable17 = internal constant %llvm.dbg.variable.type { i32 459009, { }* bitcast (%llvm.dbg.subprogram.type* @llvm.dbg.subprogram13 to { }*), i8* getelementptr ([3 x i8]* @.str10, i32 0, i32 0), { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*), i32 170, { }* bitcast (%llvm.dbg.derivedtype.type* @llvm.dbg.derivedtype to { }*), i8* getelementptr ([4 x i8]* @.str, i32 0, i32 0), i8* getelementptr ([5 x i8]* @.str1, i32 0, i32 0) }, section "llvm.metadata" ; <%llvm.dbg.variable.type*> [#uses=1] @.str18 = internal constant [18 x i8] c"long unsigned int\00", section "llvm.metadata" ; <[18 x i8]*> [#uses=1] @llvm.dbg.basictype19 = internal constant %llvm.dbg.basictype.type { i32 458788, { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*), i8* getelementptr ([18 x i8]* @.str18, i32 0, i32 0), { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*), i32 0, i64 32, i64 32, i64 0, i32 0, i32 7, i8* null, i8* null }, section "llvm.metadata" ; <%llvm.dbg.basictype.type*> [#uses=1] @.str20 = internal constant [3 x i8] c"_f\00", section "llvm.metadata" ; <[3 x i8]*> [#uses=1] - at llvm.dbg.variable21 = internal constant %llvm.dbg.variable.type { i32 459009, { }* bitcast (%llvm.dbg.subprogram.type* @llvm.dbg.subprogram13 to { }*), i8* getelementptr ([3 x i8]* @.str20, i32 0, i32 0), { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*), i32 170, { }* bitcast (%llvm.dbg.basictype.type* @llvm.dbg.basictype19 to { }*), i8* getelementptr ([8 x i8]* @.str7, i32 0, i32 0), i8* getelementptr ([13 x i8]* @.str8, i32 0, i32 0) }, section "llvm.metadata" ; <%llvm.dbg.variable.type*> [#uses=1] + at llvm.dbg.variable21 = internal constant %llvm.dbg.variable.type { i32 459009, { }* bitcast (%llvm.dbg.subprogram.type* @llvm.dbg.subprogram13 to { }*), i8* getelementptr ([3 x i8]* @.str20, i32 0, i32 0), { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*), i32 170, { }* bitcast (%llvm.dbg.basictype.type* @llvm.dbg.basictype19 to { }*), i8* getelementptr ([4 x i8]* @.str, i32 0, i32 0), i8* getelementptr ([5 x i8]* @.str1, i32 0, i32 0) }, section "llvm.metadata" ; <%llvm.dbg.variable.type*> [#uses=1] @_DefaultRuneLocale = external global %struct._RuneLocale ; <%struct._RuneLocale*> [#uses=1] @.str22 = internal constant [8 x i8] c"isascii\00", section "llvm.metadata" ; <[8 x i8]*> [#uses=1] - at llvm.dbg.subprogram23 = internal constant %llvm.dbg.subprogram.type { i32 458798, { }* bitcast (%llvm.dbg.anchor.type* @llvm.dbg.subprograms to { }*), { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*), i8* getelementptr ([8 x i8]* @.str22, i32 0, i32 0), i8* getelementptr ([8 x i8]* @.str22, i32 0, i32 0), i8* null, { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*), i32 153, { }* bitcast (%llvm.dbg.basictype.type* @llvm.dbg.basictype to { }*), i1 true, i1 true, i8* getelementptr ([8 x i8]* @.str7, i32 0, i32 0), i8* getelementptr ([13 x i8]* @.str8, i32 0, i32 0) }, section "llvm.metadata" ; <%llvm.dbg.subprogram.type*> [#uses=1] - at llvm.dbg.variable24 = internal constant %llvm.dbg.variable.type { i32 459009, { }* bitcast (%llvm.dbg.subprogram.type* @llvm.dbg.subprogram23 to { }*), i8* getelementptr ([3 x i8]* @.str10, i32 0, i32 0), { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*), i32 152, { }* bitcast (%llvm.dbg.basictype.type* @llvm.dbg.basictype to { }*), i8* getelementptr ([8 x i8]* @.str7, i32 0, i32 0), i8* getelementptr ([13 x i8]* @.str8, i32 0, i32 0) }, section "llvm.metadata" ; <%llvm.dbg.variable.type*> [#uses=1] + at llvm.dbg.subprogram23 = internal constant %llvm.dbg.subprogram.type { i32 458798, { }* bitcast (%llvm.dbg.anchor.type* @llvm.dbg.subprograms to { }*), { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*), i8* getelementptr ([8 x i8]* @.str22, i32 0, i32 0), i8* getelementptr ([8 x i8]* @.str22, i32 0, i32 0), i8* null, { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*), i32 153, { }* bitcast (%llvm.dbg.basictype.type* @llvm.dbg.basictype to { }*), i1 true, i1 true, i8* getelementptr ([4 x i8]* @.str, i32 0, i32 0), i8* getelementptr ([5 x i8]* @.str1, i32 0, i32 0) }, section "llvm.metadata" ; <%llvm.dbg.subprogram.type*> [#uses=1] + at llvm.dbg.variable24 = internal constant %llvm.dbg.variable.type { i32 459009, { }* bitcast (%llvm.dbg.subprogram.type* @llvm.dbg.subprogram23 to { }*), i8* getelementptr ([3 x i8]* @.str10, i32 0, i32 0), { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*), i32 152, { }* bitcast (%llvm.dbg.basictype.type* @llvm.dbg.basictype to { }*), i8* getelementptr ([4 x i8]* @.str, i32 0, i32 0), i8* getelementptr ([5 x i8]* @.str1, i32 0, i32 0) }, section "llvm.metadata" ; <%llvm.dbg.variable.type*> [#uses=1] @.str25 = internal constant [8 x i8] c"toupper\00", section "llvm.metadata" ; <[8 x i8]*> [#uses=1] - at llvm.dbg.subprogram26 = internal constant %llvm.dbg.subprogram.type { i32 458798, { }* bitcast (%llvm.dbg.anchor.type* @llvm.dbg.subprograms to { }*), { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*), i8* getelementptr ([8 x i8]* @.str25, i32 0, i32 0), i8* getelementptr ([8 x i8]* @.str25, i32 0, i32 0), i8* null, { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*), i32 316, { }* bitcast (%llvm.dbg.basictype.type* @llvm.dbg.basictype to { }*), i1 true, i1 true, i8* getelementptr ([8 x i8]* @.str7, i32 0, i32 0), i8* getelementptr ([13 x i8]* @.str8, i32 0, i32 0) }, section "llvm.metadata" ; <%llvm.dbg.subprogram.type*> [#uses=1] - at llvm.dbg.variable27 = internal constant %llvm.dbg.variable.type { i32 459009, { }* bitcast (%llvm.dbg.subprogram.type* @llvm.dbg.subprogram26 to { }*), i8* getelementptr ([3 x i8]* @.str10, i32 0, i32 0), { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*), i32 315, { }* bitcast (%llvm.dbg.basictype.type* @llvm.dbg.basictype to { }*), i8* getelementptr ([8 x i8]* @.str7, i32 0, i32 0), i8* getelementptr ([13 x i8]* @.str8, i32 0, i32 0) }, section "llvm.metadata" ; <%llvm.dbg.variable.type*> [#uses=1] + at llvm.dbg.subprogram26 = internal constant %llvm.dbg.subprogram.type { i32 458798, { }* bitcast (%llvm.dbg.anchor.type* @llvm.dbg.subprograms to { }*), { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*), i8* getelementptr ([8 x i8]* @.str25, i32 0, i32 0), i8* getelementptr ([8 x i8]* @.str25, i32 0, i32 0), i8* null, { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*), i32 316, { }* bitcast (%llvm.dbg.basictype.type* @llvm.dbg.basictype to { }*), i1 true, i1 true, i8* getelementptr ([4 x i8]* @.str, i32 0, i32 0), i8* getelementptr ([5 x i8]* @.str1, i32 0, i32 0) }, section "llvm.metadata" ; <%llvm.dbg.subprogram.type*> [#uses=1] + at llvm.dbg.variable27 = internal constant %llvm.dbg.variable.type { i32 459009, { }* bitcast (%llvm.dbg.subprogram.type* @llvm.dbg.subprogram26 to { }*), i8* getelementptr ([3 x i8]* @.str10, i32 0, i32 0), { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*), i32 315, { }* bitcast (%llvm.dbg.basictype.type* @llvm.dbg.basictype to { }*), i8* getelementptr ([4 x i8]* @.str, i32 0, i32 0), i8* getelementptr ([5 x i8]* @.str1, i32 0, i32 0) }, section "llvm.metadata" ; <%llvm.dbg.variable.type*> [#uses=1] define i32 @main() nounwind { entry: From sabre at nondot.org Thu Jan 22 13:10:44 2009 From: sabre at nondot.org (Chris Lattner) Date: Thu, 22 Jan 2009 13:10:44 -0600 Subject: [llvm-commits] CVS: llvm-www/ProjectsWithLLVM/index.html Message-ID: <200901221910.n0MJAi0e021647@zion.cs.uiuc.edu> Changes in directory llvm-www/ProjectsWithLLVM: index.html updated: 1.45 -> 1.46 --- Log message: update pure author line --- Diffs of the changes: (+1 -1) index.html | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) Index: llvm-www/ProjectsWithLLVM/index.html diff -u llvm-www/ProjectsWithLLVM/index.html:1.45 llvm-www/ProjectsWithLLVM/index.html:1.46 --- llvm-www/ProjectsWithLLVM/index.html:1.45 Wed Jan 21 23:42:57 2009 +++ llvm-www/ProjectsWithLLVM/index.html Thu Jan 22 13:08:33 2009 @@ -69,7 +69,7 @@
-Albert Gr??f and his team +By Albert Graef, Johannes Gutenberg University Mainz (Germany)
From isanbard at gmail.com Thu Jan 22 13:35:44 2009 From: isanbard at gmail.com (Bill Wendling) Date: Thu, 22 Jan 2009 11:35:44 -0800 Subject: [llvm-commits] [llvm] r62751 - in /llvm/trunk: autoconf/configure.ac configure include/llvm/Config/config.h.in In-Reply-To: <200901220518.n0M5I0Y7013755@zion.cs.uiuc.edu> References: <200901220518.n0M5I0Y7013755@zion.cs.uiuc.edu> Message-ID: <16e5fdf90901221135t497d71cq8095605269157fc9@mail.gmail.com> Tanya, I think that this is causing a build failure on Darwin: g++ -I/Volumes/Sandbox/Buildbot/llvm/full-llvm/build/llvmCore.roots/llvmCore~obj/obj-llvm/include -I/Volumes/Sandbox/Buildbot/llvm/full-llvm/build/llvmCore.roots/llvmCore~obj/obj-llvm/lib/ExecutionEngine/Interpreter -I/Volumes/Sandbox/Buildbot/llvm/full-llvm/build/llvmCore.roots/llvmCore~obj/src/include -I/Volumes/Sandbox/Buildbot/llvm/full-llvm/build/llvmCore.roots/llvmCore~obj/src/lib/ExecutionEngine/Interpreter -D_DEBUG -D_GNU_SOURCE -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS -O3 -fno-exceptions -DLLVM_VERSION_INFO='" Apple Build #9999-01"' -Woverloaded-virtual -pedantic -Wall -W -Wwrite-strings -Wno-long-long -Wunused -Wno-unused-parameter -fstrict-aliasing -Wstrict-aliasing -arch i386 -c /Volumes/Sandbox/Buildbot/llvm/full-llvm/build/llvmCore.roots/llvmCore~obj/src/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp -o /Volumes/Sandbox/Buildbot/llvm/full-llvm/build/llvmCore.roots/llvmCore~obj/obj-llvm/lib/ExecutionEngine/Interpreter/Release/ExternalFunctions.o /Volumes/Sandbox/Buildbot/llvm/full-llvm/build/llvmCore.roots/llvmCore~obj/src/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp:37:10: error: #include expects "FILENAME" or The problem seems to be here. ExternalFunctions.cpp: #ifdef HAVE_LIBFFI #include FFI_HEADER #endif In the builds, the generated config.h file has this: include/llvm/Config/config.h:/* #undef FFI_HEADER */ while HAVE_LIBFFI is defined as this: include/llvm/Config/config.h:#define HAVE_LIBFFI 1 Could you check on this? It might have been an autoconf versioning thing. -bw On Wed, Jan 21, 2009 at 9:17 PM, Tanya Lattner wrote: > Author: tbrethou > Date: Wed Jan 21 23:17:59 2009 > New Revision: 62751 > > URL: http://llvm.org/viewvc/llvm-project?rev=62751&view=rev > Log: > Bump to 2.6svn. > Regenerate configure (last regen was with the wrong version). > > Modified: > llvm/trunk/autoconf/configure.ac > llvm/trunk/configure > llvm/trunk/include/llvm/Config/config.h.in > > Modified: llvm/trunk/autoconf/configure.ac > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/autoconf/configure.ac?rev=62751&r1=62750&r2=62751&view=diff > > ============================================================================== > --- llvm/trunk/autoconf/configure.ac (original) > +++ llvm/trunk/autoconf/configure.ac Wed Jan 21 23:17:59 2009 > @@ -31,7 +31,7 @@ > dnl===-----------------------------------------------------------------------=== > dnl Initialize autoconf and define the package name, version number and > dnl email address for reporting bugs. > -AC_INIT([[llvm]],[[2.5svn]],[llvmbugs at cs.uiuc.edu]) > +AC_INIT([[llvm]],[[2.6svn]],[llvmbugs at cs.uiuc.edu]) > > dnl Provide a copyright substitution and ensure the copyright notice is included > dnl in the output of --version option of the generated configure script. > > Modified: llvm/trunk/configure > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/configure?rev=62751&r1=62750&r2=62751&view=diff > > ============================================================================== > --- llvm/trunk/configure (original) > +++ llvm/trunk/configure Wed Jan 21 23:17:59 2009 > @@ -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.6svn. > # > # 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'" > @@ -730,44 +715,44 @@ > # Identity of this package. > PACKAGE_NAME='llvm' > PACKAGE_TARNAME='-llvm-' > -PACKAGE_VERSION='2.5svn' > -PACKAGE_STRING='llvm 2.5svn' > +PACKAGE_VERSION='2.6svn' > +PACKAGE_STRING='llvm 2.6svn' > PACKAGE_BUGREPORT='llvmbugs at cs.uiuc.edu' > > ac_unique_file="lib/VMCore/Module.cpp" > # 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) > @@ -1479,7 +1463,7 @@ > # 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 llvm 2.5svn to adapt to many kinds of systems. > +\`configure' configures llvm 2.6svn to adapt to many kinds of systems. > > Usage: $0 [OPTION]... [VAR=VALUE]... > > @@ -1545,7 +1529,7 @@ > > if test -n "$ac_init_help"; then > case $ac_init_help in > - short | recursive ) echo "Configuration of llvm 2.5svn:";; > + short | recursive ) echo "Configuration of llvm 2.6svn:";; > esac > cat <<\_ACEOF > > @@ -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 > @@ -1681,8 +1664,8 @@ > test -n "$ac_init_help" && exit $ac_status > if $ac_init_version; then > cat <<\_ACEOF > -llvm configure 2.5svn > -generated by GNU Autoconf 2.61 > +llvm configure 2.6svn > +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. > @@ -1697,8 +1680,8 @@ > This file contains any messages produced by compilers while > 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 > +It was created by llvm $as_me 2.6svn, which was > +generated by GNU Autoconf 2.60. Invocation command line was > > $ $0 $@ > > @@ -2443,7 +2426,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 > @@ -2483,7 +2466,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 > @@ -2540,7 +2523,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 > @@ -2581,7 +2564,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 > @@ -2639,7 +2622,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 > @@ -2683,7 +2666,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 > @@ -2824,7 +2807,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 > @@ -2852,12 +2835,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 > > @@ -2869,6 +2846,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. > @@ -3046,10 +3025,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 > @@ -3104,10 +3100,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 > @@ -3142,10 +3155,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 > @@ -3181,10 +3211,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 > @@ -3300,10 +3347,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 > @@ -3393,10 +3457,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 > @@ -3430,10 +3501,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 > @@ -3498,10 +3576,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 > @@ -3535,10 +3620,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 > @@ -3593,7 +3685,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 > @@ -3675,7 +3767,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 > @@ -3771,10 +3863,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 > @@ -3950,10 +4059,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 > @@ -3995,8 +4121,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 > > @@ -4017,10 +4142,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. */ > @@ -4055,10 +4197,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 > @@ -4109,10 +4268,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 > @@ -4242,7 +4418,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 > @@ -4280,7 +4456,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 > @@ -4319,7 +4495,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 > @@ -4409,7 +4585,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 > @@ -4447,7 +4623,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 > @@ -4486,7 +4662,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 > @@ -4939,10 +5115,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 > @@ -4976,10 +5159,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 > @@ -5044,10 +5234,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 > @@ -5081,10 +5278,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 > @@ -5141,7 +5345,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 > @@ -5185,7 +5389,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 > @@ -5303,10 +5507,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 > @@ -5361,10 +5582,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 > @@ -5399,10 +5637,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 > @@ -5438,10 +5693,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 > @@ -5557,10 +5829,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 > @@ -5625,7 +5914,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 > @@ -5669,7 +5958,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 > @@ -5782,10 +6071,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 > @@ -5840,10 +6146,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 > @@ -5878,10 +6201,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 > @@ -5917,10 +6257,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 > @@ -5984,7 +6341,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 > @@ -6009,70 +6366,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 > @@ -6086,46 +6410,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" > @@ -6140,22 +6490,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 > @@ -6167,7 +6642,6 @@ > _ACEOF > > fi > -rm -f conftest.l $LEX_OUTPUT_ROOT.c > > fi > > @@ -6206,7 +6680,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 > @@ -6353,7 +6827,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 > @@ -6394,7 +6868,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 > @@ -6435,7 +6909,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 > @@ -6476,7 +6950,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 > @@ -6517,7 +6991,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 > @@ -6558,7 +7032,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 > @@ -6599,7 +7073,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 > @@ -6639,7 +7113,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 > @@ -6679,7 +7153,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 > @@ -6736,7 +7210,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 > @@ -6777,7 +7251,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 > @@ -6818,7 +7292,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 > @@ -6859,7 +7333,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 > @@ -6901,7 +7375,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 > @@ -6957,7 +7431,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 > @@ -7015,7 +7489,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 > @@ -7074,7 +7548,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 > @@ -7132,7 +7606,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 > @@ -7216,7 +7690,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. > @@ -7279,7 +7753,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 > @@ -7319,7 +7793,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 > @@ -7359,7 +7833,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 > @@ -7399,7 +7873,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 > @@ -7439,7 +7913,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 > @@ -7479,7 +7953,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 > @@ -7519,7 +7993,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 > @@ -7592,7 +8066,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 > @@ -7649,7 +8123,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 > @@ -7691,7 +8165,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 > @@ -7736,7 +8210,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 > @@ -7781,7 +8255,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 > @@ -7826,7 +8300,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 > @@ -7871,7 +8345,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 > @@ -7938,11 +8412,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 > @@ -7951,7 +8441,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 > @@ -7994,10 +8484,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}; > @@ -8006,11 +8496,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; > @@ -8037,7 +8527,7 @@ > const int foo = 10; > if (!foo) return 0; > } > - return !cs[0] && !zero.x; > + return !x[0] && !zero.x; > #endif > > ; > @@ -8057,10 +8547,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 > @@ -8125,10 +8632,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 > @@ -8201,11 +8725,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 > @@ -8214,7 +8754,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 > @@ -8285,11 +8825,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 > @@ -8298,7 +8854,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 > @@ -8361,10 +8917,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 > @@ -8400,10 +8973,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 > @@ -9497,11 +10077,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 > -